Changeset 10109

Timestamp:

Nov 5, 2014, 3:59:18 PM (9 years ago)

Author:

erbj

Message:

EnemyAdd implementierung

Location:

code/branches/towerdefenseHS14/src/modules/towerdefense

Files:

• CMakeLists.txt (modified) (1 diff)
• Enemy.cc (deleted)
• Enemy.h (deleted)
• TowerDefense.cc (modified) (7 diffs)
• TowerDefense.h (modified) (2 diffs)
• TowerDefenseEnemy.cc (added)
• TowerDefenseEnemy.h (added)
• TowerDefensePrereqs.h (modified) (1 diff)

code/branches/towerdefenseHS14/src/modules/towerdefense/CMakeLists.txt

@@ -7 +7 @@
   TowerDefensePlayerStats.cc
   TDCoordinate.cc
-  Enemy.cc
+  TowerDefenseEnemy.cc
 
 )

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.cc

@@ -86 +86 @@
 #include "graphics/Model.h"
 #include "infos/PlayerInfo.h"
-
 #include "chat/ChatManager.h"
 #include "core/CoreIncludes.h"
@@ -128 +127 @@
     void TowerDefense::start()
     {
+        orxout() << "test0" << endl;
+
         Deathmatch::start();
 
@@ -139 +140 @@
         }
 
-        ChatManager::message("Use the console command addTower x y to add towers");
+        orxout() << "test3" << endl;
+
+        //add some TowerDefenseEnemys
+
+        TDCoordinate* coord1 = new TDCoordinate(1,1);
+        /*TDCoordinate* coord2 = new TDCoordinate(10,10);
+        TDCoordinate* coord3 = new TDCoordinate(1,2);*/
+        std::vector<TDCoordinate> path;
+        path.push_back(*coord1);
+        /*path.push_back(*coord2);
+        path.push_back(*coord3);*/
+
+        for(int i = 0 ; i <4 ; ++i)
+        {
+                addTowerDefenseEnemy(path);
+        }
+
+        //ChatManager::message("Use the console command addTower x y to add towers");
 
         //TODO: let the player control his controllable entity && TODO: create a new ControllableEntity for the player
     }
 
-    void TowerDefense::addEnemy(){}
+    void TowerDefense::addTowerDefenseEnemy(std::vector<TDCoordinate> path){
+
+        orxout() << "test1" << endl;
+
+        TowerDefenseEnemy* en1 = new TowerDefenseEnemy(this->center_->getContext());
+        // Model* TowerDefenseEnemymodel = new Model(this->center_->getContext());
+        //TowerDefenseEnemymodel->setMeshSource("crate.mesh");
+        //TowerDefenseEnemymodel->setPosition(0,0,0);
+        en1->setPosition(path.at(0).get3dcoordinate());
+        //TowerDefenseEnemymodel->setScale(0.2);
+
+        //en1->attach(TowerDefenseEnemymodel);
+
+        //TowerDefenseEnemyvector.push_back(en1);
+
+        orxout() << "test2" << endl;
+
+        /*for(unsigned int i = 0; i < path.size(); ++i)
+        {
+            en1->addWaypoint(path.at(i));
+        }*/
+
+        orxout() << "test6" << endl;
+
+        /*WaypointController *newController = new WaypointController(en1);
+        newController->setAccuracy(3);
+
+        for(int i =0; i < path.size(); ++i)
+        {
+
+            Model *wayPoint = new Model(newController);
+            wayPoint->setMeshSource("crate.mesh");
+            wayPoint->setPosition(path.at(i).get3dcoordinate());
+            wayPoint->setScale(0.2);
+
+            newController->addWaypoint(wayPoint);
+
+        }*/
+
+    }
 
 
@@ -158 +215 @@
     void TowerDefense::addTower(int x, int y)
     {
-        const TowerCost towerCost = TDDefaultTowerCost;
+        /*const TowerCost towerCost = TDDefaultTowerCost;
 
         if (!this->hasEnoughCreditForTower(towerCost))
@@ -172 +229 @@
         }
 
-        /*
+
         unsigned int width = this->center_->getWidth();
         unsigned int height = this->center_->getHeight();
-        */
+
 
         int tileScale = (int) this->center_->getTileScale();
@@ -204 +261 @@
 
         newTower->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 75);
-        newTower->setGame(this);
+        newTower->setGame(this);*/
     }
 
@@ -227 +284 @@
     void TowerDefense::tick(float dt)
     {
-        SUPER(TowerDefense, tick, dt);
+        //SUPER(TowerDefense, tick, dt);
     }
 

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefense.h

@@ -40 +40 @@
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "gametypes/Deathmatch.h"
+#include "TowerDefenseEnemy.h"
+#include "util/Output.h"
+
 
  #include "TowerDefensePlayerStats.h"
@@ -51 +54 @@
         virtual ~TowerDefense();
 
-        void addEnemy();
+        std::vector<TowerDefenseEnemy*> TowerDefenseEnemyvector;
+
+        void addTowerDefenseEnemy(std::vector<TDCoordinate> path);
         virtual void start(); //<! The function is called when the gametype starts
         virtual void end();

code/branches/towerdefenseHS14/src/modules/towerdefense/TowerDefensePrereqs.h

@@ -70 +70 @@
     class TowerDefenseHUDController;
     class TowerDefensePlayerStats;
+    class TowerDefenseEnemy;
+    class TDCoordinate;
     class TowerTurret;
 }