Changeset 10123

Timestamp:

Nov 12, 2014, 4:09:35 PM (10 years ago)

Author:

erbj

Message:

Template not working

Location:

code/branches/towerdefenseHS14

Files:

• data/levels/templates/TowerdefenseEnemy.oxt (added)
• src/modules/towerdefense/TowerDefense.cc (modified) (6 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseEnemy.cc (modified) (4 diffs)
• src/modules/towerdefense/TowerDefenseEnemy.h (modified) (1 diff)

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

@@ -129 +129 @@
         orxout() << "test0" << endl;
 
+
         Deathmatch::start();
 
+/*
         const int kInitialTowerCount = 3;
 
@@ -139 +141 @@
             addTower(coordinate->x, coordinate->y);
         }
+*/
 
         orxout() << "test3" << endl;
@@ -145 +148 @@
 
         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)
+        TDCoordinate* coord2 = new TDCoordinate(1,1);
+        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 < 20 ; ++i)
         {
                 addTowerDefenseEnemy(path);
         }
 
+        orxout() << "test7" << endl;
+
         //ChatManager::message("Use the console command addTower x y to add towers");
 
@@ -162 +175 @@
     }
 
-    void TowerDefense::addTowerDefenseEnemy(std::vector<TDCoordinate> path){
+    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);
+        en1->addTemplate("spaceshipassff");
+        /*en1->setInitialHealth(1000);
+        en1->setHealth(1000);
+        en1->setMaxHealth(1000);
+        en1->setInitialShieldHealth(1000);
+        en1->setShieldHealth(1000);
+        en1->setMaxShieldHealth(1000);*/
+        orxout() << "en1 " << en1->getHealth() << endl;
+
+
+        Model* TowerDefenseEnemymodel = new Model(this->center_->getContext());
+
+        TowerDefenseEnemymodel->setMeshSource("cube.mesh");
+
+        TowerDefenseEnemymodel->setPosition(0,0,75);
+        en1->setPosition(0,0,150);
+        TowerDefenseEnemymodel->setScale(10);
+
+
+        en1->attach(TowerDefenseEnemymodel);
+
+        TowerDefenseEnemyvector.push_back(en1);
 
         orxout() << "test2" << endl;
 
-        /*for(unsigned int i = 0; i < path.size(); ++i)
-        {
-            en1->addWaypoint(path.at(i));
+        for(unsigned int i = 0; i < path.size(); ++i)
+        {
+            en1->addWaypoint((path.at(i)));
+        }
+        orxout() << "test6" << endl;
+
+
+       /* for (int i = 0; i < TowerDefenseEnemyvector.size(); ++i )
+               {
+                orxout() <<i << " " << TowerDefenseEnemyvector.at(i)->getHealth() << endl;
+               }
+
+        WaypointController *newController = new WaypointController(en1->getContext());//
+        newController->setAccuracy(3);
+
+        for(int i =0; i < path.size(); ++i)
+        {
+
+            Model *wayPoint = new Model(en1->getContext());
+            wayPoint->setMeshSource("cube.mesh");
+            wayPoint->setPosition(path.at(i)->get3dcoordinate());
+            wayPoint->setScale(0.2);
+            newController->addWaypoint(wayPoint);
         }*/
-
-        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);
-
-        }*/
-
     }
 
 
     void TowerDefense::end()
+
     {
         Deathmatch::end();
@@ -214 +243 @@
 
     void TowerDefense::addTower(int x, int y)
-    {
-        /*const TowerCost towerCost = TDDefaultTowerCost;
+    {/*
+        const TowerCost towerCost = TDDefaultTowerCost;
 
         if (!this->hasEnoughCreditForTower(towerCost))
@@ -284 +313 @@
     void TowerDefense::tick(float dt)
     {
-        //SUPER(TowerDefense, tick, dt);
+        SUPER(TowerDefense, tick, dt);
+
+       /* for (int i = 0; i < TowerDefenseEnemyvector.size(); ++i )
+        {
+                orxout() <<i << " " << TowerDefenseEnemyvector.at(i)->getHealth() << endl;
+        }
+*/
+
     }
 

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

@@ -56 +56 @@
         std::vector<TowerDefenseEnemy*> TowerDefenseEnemyvector;
 
-        void addTowerDefenseEnemy(std::vector<TDCoordinate> path);
+        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/TowerDefenseEnemy.cc

@@ -32 +32 @@
     }
 
-    void TowerDefenseEnemy::addWaypoint(TDCoordinate coord)
+    void TowerDefenseEnemy::addWaypoint(TDCoordinate* coord)
     {
         orxout() << "test4" << endl;
@@ -38 +38 @@
         orxout() << "test5" << endl;
     }
-
+/*
     void TowerDefenseEnemy::popWaypoint()
     {
@@ -48 +48 @@
     {
         if(Waypointsvector_.size()<=0){
-                TDCoordinate coord = TDCoordinate(-1,-1);
+                TDCoordinate* coord = TDCoordinate(-1,-1);
                 return coord;
         }else{
@@ -57 +57 @@
 
     }
-
+*/
 }

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

@@ -38 +38 @@
         //health gibt es unter: health_
 
-        void addWaypoint(TDCoordinate coord);
+        void addWaypoint(TDCoordinate* coord);
         void popWaypoint();
         TDCoordinate peekWaypoint();
         private:
 
-        std::vector<TDCoordinate> Waypointsvector_;
+        std::vector<TDCoordinate*> Waypointsvector_;
 
         };