added enemy factory

Author: grantaddis

Splatter.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		2F63C02F1BC8366800533977 /* Player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F63C02D1BC8366800533977 /* Player.cpp */; settings = {ASSET_TAGS = (); }; };
+		2F63C0321BC9ACDD00533977 /* EnemyFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2F63C0301BC9ACDD00533977 /* EnemyFactory.cpp */; settings = {ASSET_TAGS = (); }; };
 		AE9BA0E51BC82B8A00A91BF6 /* SDL2_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE9BA0E11BC82B8A00A91BF6 /* SDL2_image.framework */; };
 		AE9BA0E61BC82B8A00A91BF6 /* SDL2_mixer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE9BA0E21BC82B8A00A91BF6 /* SDL2_mixer.framework */; };
 		AE9BA0E71BC82B8A00A91BF6 /* SDL2_ttf.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE9BA0E31BC82B8A00A91BF6 /* SDL2_ttf.framework */; };
@@ -50,6 +51,8 @@
 /* Begin PBXFileReference section */
 		2F63C02D1BC8366800533977 /* Player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Player.cpp; sourceTree = "<group>"; };
 		2F63C02E1BC8366800533977 /* Player.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Player.hpp; sourceTree = "<group>"; };
+		2F63C0301BC9ACDD00533977 /* EnemyFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EnemyFactory.cpp; sourceTree = "<group>"; };
+		2F63C0311BC9ACDD00533977 /* EnemyFactory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = EnemyFactory.hpp; sourceTree = "<group>"; };
 		AE9BA0CE1BC827FD00A91BF6 /* Splatter */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Splatter; sourceTree = BUILT_PRODUCTS_DIR; };
 		AE9BA0E11BC82B8A00A91BF6 /* SDL2_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_image.framework; path = ../../../Library/Frameworks/SDL2_image.framework; sourceTree = "<group>"; };
 		AE9BA0E21BC82B8A00A91BF6 /* SDL2_mixer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL2_mixer.framework; path = ../../../Library/Frameworks/SDL2_mixer.framework; sourceTree = "<group>"; };
@@ -154,6 +157,8 @@
 				AE9BA1061BC8351D00A91BF6 /* mainmenu_state.cpp */,
 				AE9BA1071BC8351D00A91BF6 /* mainmenu_state.h */,
 				AE9BA1081BC8351D00A91BF6 /* RunState.cpp */,
+				2F63C0301BC9ACDD00533977 /* EnemyFactory.cpp */,
+				2F63C0311BC9ACDD00533977 /* EnemyFactory.hpp */,
 				AE9BA1091BC8351D00A91BF6 /* RunState.hpp */,
 				AE9BA11E1BC9509000A91BF6 /* GameOverState.cpp */,
 				AE9BA11F1BC9509000A91BF6 /* GameOverState.hpp */,
@@ -258,6 +263,7 @@
 				AE9BA11D1BC848CB00A91BF6 /* Enemy.cpp in Sources */,
 				BC08342A1BC8662400C4F054 /* Bullet.cpp in Sources */,
 				AE9BA1121BC8351D00A91BF6 /* Timer.cpp in Sources */,
+				2F63C0321BC9ACDD00533977 /* EnemyFactory.cpp in Sources */,
 				2F63C02F1BC8366800533977 /* Player.cpp in Sources */,
 				AE9BA10C1BC8351D00A91BF6 /* Engine.cpp in Sources */,
 				AE9BA1111BC8351D00A91BF6 /* RunState.cpp in Sources */,

Splatter/EnemyFactory.cpp

@@ -0,0 +1,43 @@
+//
+//  EnemyFactory.cpp
+//  Splatter
+//
+//  Created by Grant Addis on 10/10/15.
+//  Copyright © 2015 WesHack. All rights reserved.
+//
+
+#include "EnemyFactory.hpp"
+
+void EnemyFactory::addEnemy(Engine* game, double x, double y, Player *player) {
+    Enemy newEnemy;
+    newEnemy.Init(game, x, y, player);
+    enemies.push_back(newEnemy);
+}
+
+void EnemyFactory::updateEnemies(Engine *game) {
+    for (int i = 0; i < enemies.size(); i++){
+        enemies[i].Update(game);
+    }
+}
+
+void EnemyFactory::drawEnemies(Engine *game) {
+    for (int i = 0; i < enemies.size(); i++){
+        enemies[i].Draw(game);
+    }
+}
+
+bool EnemyFactory::bulletDidHidEnemy(Bullet *bullet) {
+    for (int i = 0; i < enemies.size(); i++) {
+        if (bullet->HasCollided(&enemies[i])) {
+            enemies[i].Destroy();
+            enemies.erase(enemies.begin() + i);
+            i--;
+            return true;
+        }
+    }
+    return false;
+}
+
+void EnemyFactory::despawnAll() {
+    enemies.clear();
+}

Splatter/EnemyFactory.hpp

@@ -0,0 +1,30 @@
+//
+//  EnemyFactory.hpp
+//  Splatter
+//
+//  Created by Grant Addis on 10/10/15.
+//  Copyright © 2015 WesHack. All rights reserved.
+//
+
+#ifndef EnemyFactory_hpp
+#define EnemyFactory_hpp
+
+#include <stdio.h>
+#include "Engine.h"
+#include "Enemy.hpp"
+#include "Player.hpp"
+#include "Bullet.hpp"
+
+class EnemyFactory {
+public:
+    void addEnemy(Engine* game, double x, double y, Player* player);
+    void updateEnemies(Engine* game);
+    void drawEnemies(Engine* game);
+    bool bulletDidHidEnemy(Bullet* bullet);
+    void despawnAll();
+
+private:
+    vector<Enemy> enemies;
+};
+
+#endif /* EnemyFactory_hpp */

Splatter/RunState.cpp

@@ -28,19 +28,13 @@ void RunState::Init(Engine *game){
     p.map = map;
 
     vector <Bullet> bullets (50);
-
-    enemies.push_back(Enemy());
-    
-    for (int i = 0; i < enemies.size(); i ++){
-        enemies[i].Init(game, 800, 100, &p);
-    }
 
+    enemyFactory.addEnemy(game, 800, 100, &p);
 
-
 }
 
 void RunState::Reset(){
-    enemies.clear();
+    enemyFactory.despawnAll();
     bullets.clear();
 }
 
@@ -75,27 +69,15 @@ void RunState::HandleEvents(Engine *game, SDL_Event event){
 void RunState::Update(Engine *game){
     p.Update(game);
 
-    for (int i = 0; i < enemies.size(); i++){
-        enemies[i].Update(game);
-
-    }
+    enemyFactory.updateEnemies(game);
 
     for (int i = 0; i < bullets.size(); i++){
         bullets[i].Update(game);
 
-
-        
-        for (int j = 0; j < enemies.size(); j++){
-
-            if (bullets[i].HasCollided(&enemies[j])){
-                enemies[j].Destroy();
-                enemies.erase(enemies.begin() + j);
-                j--;
-                
+            if (enemyFactory.bulletDidHidEnemy(&bullets[i])) {
                 bullets.erase(bullets.begin() + i);
                 i--;
             }
-        }
 //
         if (p.HasCollided(&bullets[i])){
             p.Destroy();
@@ -122,9 +104,7 @@ void RunState::Draw(Engine *game){
 
     p.Draw(game);
 
-    for (int i = 0; i < enemies.size(); i++){
-        enemies[i].Draw(game);
-    }
+    enemyFactory.drawEnemies(game);
 
     for (int i = 0; i < bullets.size(); i++) {
         bullets[i].Draw(game);

Splatter/RunState.hpp

@@ -16,6 +16,7 @@
 #include "Player.hpp"
 #include "Enemy.hpp"
 #include "Bullet.hpp"
+#include "EnemyFactory.hpp"
 
 using namespace std;
 
@@ -49,8 +50,7 @@ class RunState : public GameState
     SDL_Rect map;
     Player p;
     vector<Bullet> bullets;
-    vector<Enemy> enemies;
-    
+    EnemyFactory enemyFactory;
 };