Changeset 10132

Timestamp:

Nov 19, 2014, 4:20:18 PM (9 years ago)

Author:

maxima

Message:

 

Location:

code/branches/towerdefenseHS14

Files:

• data/levels/templates/enemyTowerdefense.oxt (modified) (1 diff)
• data/levels/towerDefense.oxw (modified) (1 diff)
• src/modules/towerdefense/Tower.cc (modified) (2 diffs)
• src/modules/towerdefense/TowerDefense.cc (modified) (6 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseController.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseEnemy.cc (modified) (1 diff)
• src/modules/towerdefense/TowerDefenseEnemy.h (modified) (2 diffs)

code/branches/towerdefenseHS14/data/levels/templates/enemyTowerdefense.oxt

@@ -62 +62 @@
           <waypoints>
             <!-- 1,3 10,3 10,11, 13,11 -->
-            <Model mesh="cube.mesh" scale=10 position="-700,-500, 150" />
-            <Model mesh="cube.mesh" scale=10 position=" -400,-500, 150" />
-            <Model  position=" -400, 600, 150" />
-            <Model mesh="cube.mesh" scale=10 position=" 500, 600, 150" />
-            <Model mesh="cube.mesh" scale=10 position=" 500, 700, 150" />
+            
+            <Model  position="-700,-500, 150" />
+            <Model  position=" 200,-500, 150" />
+           
+            <Model  position=" 200, 300, 150" />
+            <Model  position=" 500, 300, 150" />
+          <!--  <Model mesh="cube.mesh" scale=10 position=" 500, 700, 150" /> -->
+            <Model  position=" 500, 700, 150" /> 
+            
           </waypoints>
         </WaypointController>

code/branches/towerdefenseHS14/data/levels/towerDefense.oxw

@@ -77 +77 @@
     <!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
 
-    <TowerDefenseEnemy position="-700,-500, 100" lookat="0,0,0" scale=3 team=1 >
-      <templates>
-        <Template link=enemytowerdefense />
-      </templates>
-      <controller>
-        <WaypointController accuracy=60>
-          <waypoints>
-            <!-- 1,3 10,3 10,11, 13,11 -->
-            <Model mesh="cube.mesh" scale=10 position="-700,-500, 150" />
-            <Model mesh="cube.mesh" scale=10 position=" 200,-500, 150" />
-            <Model mesh="cube.mesh" scale=10 position=" 200, 300, 150" />
-            <Model mesh="cube.mesh" scale=10 position=" 500, 300, 150" />
-            <Model mesh="cube.mesh" scale=10 position=" 500, 700, 150" />
-          </waypoints>
-        </WaypointController>
-      </controller>
-    </TowerDefenseEnemy>
+
 
 

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

@@ -40 +40 @@
     {
         static int ori;
-        orxout() << "orientation " << ++ori << endl;
+        //orxout() << "orientation " << ++ori << endl;
     }
 
@@ -58 +58 @@
     {
         static int roll;
-        orxout() << "rotateRoll" << ++roll << endl;
+        //orxout() << "rotateRoll" << ++roll << endl;
     }
 

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

@@ -129 +129 @@
         orxout() << "test0" << endl;
 
-
         Deathmatch::start();
+
+        time=0.0;
 
 /*
@@ -143 +144 @@
 */
 
-        orxout() << "test3" << endl;
 
         //add some TowerDefenseEnemys
 
-        TDCoordinate* coord1 = new TDCoordinate(1,1);
-        TDCoordinate* coord2 = new TDCoordinate(1,3);
-        TDCoordinate* coord3 = new TDCoordinate(10,3);
-
-
-        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");
@@ -178 +159 @@
 
     void TowerDefense::addTowerDefenseEnemy(std::vector<TDCoordinate*> path){
-
-        orxout() << "test1" << endl;
 
         TowerDefenseEnemy* en1 = new TowerDefenseEnemy(this->center_->getContext());
@@ -186 +165 @@
         en1->getController();
 
-
-        /*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(path.at(0)->get3dcoordinate());
 
-        //TowerDefenseEnemymodel->setScale(10);
-
-
-        //en1->attach(TowerDefenseEnemymodel);
 
         TowerDefenseEnemyvector.push_back(en1);
 
-        orxout() << "test2" << endl;
 
         for(unsigned int i = 0; i < path.size(); ++i)
@@ -216 +175 @@
             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);
@@ -321 +275 @@
     {
         SUPER(TowerDefense, tick, dt);
-
-       /* for (int i = 0; i < TowerDefenseEnemyvector.size(); ++i )
-        {
-                orxout() <<i << " " << TowerDefenseEnemyvector.at(i)->getHealth() << endl;
-        }
-*/
+        time +=dt;
+
+        TDCoordinate* coord1 = new TDCoordinate(1,1);
+        std::vector<TDCoordinate*> path;
+        path.push_back(coord1);
+
+            if(time>1 && TowerDefenseEnemyvector.size() < 30)
+            {
+                addTowerDefenseEnemy(path);
+                time = time-1;
+            }
+
 
     }

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

@@ -85 +85 @@
     private:
         TowerDefenseCenterpoint *center_;
+        float time;
 
         /* handles stats */

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

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "worldentities/pawns/Pawn.h"
+#include "controllers/WaypointController.h"
 
 namespace orxonox

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

@@ -34 +34 @@
     void TowerDefenseEnemy::addWaypoint(TDCoordinate* coord)
     {
-        orxout() << "test4" << endl;
         this->Waypointsvector_.push_back(coord);
-        orxout() << "test5" << endl;
     }
+
+
+    void TowerDefenseEnemy::tick(float dt)
+    {
+        SUPER(TowerDefenseEnemy, tick, dt);
+
+        //ArtificialController* controller = (ArtificialController*)this->getController();
+        Vector3 ship = this->getRVWorldPosition();
+        Vector3* endpoint = new Vector3(500, 700, 150);
+
+        float distance = ship.distance(*endpoint);
+
+        orxout() << "distance" << distance << endl;
+        if(distance <50){
+                orxout() << "ENEMY KILLED!!!!" << endl;
+                this->destroy(); }
+    }
+
 /*
     void TowerDefenseEnemy::popWaypoint()

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

@@ -22 +22 @@
 #include "worldentities/pawns/SpaceShip.h"
 #include "util/Output.h"
+#include "controllers/ArtificialController.h"
 
 namespace orxonox
@@ -38 +39 @@
         //health gibt es unter: health_
 
+        virtual void tick(float dt);
         void addWaypoint(TDCoordinate* coord);
         void popWaypoint();