Changeset 10091

Timestamp:

Oct 15, 2014, 3:40:32 PM (10 years ago)

Author:

erbj

Message:

Testing: first commit

Location:

code/branches/towerdefenseHS14/src/modules/towerdefense

Files:

• CMakeLists.txt (modified) (1 diff)
• Tower.cc (modified) (2 diffs)
• TowerDefense.cc (modified) (2 diffs)
• TowerDefense.h (modified) (1 diff)
• TowerDefenseController.cc (modified) (1 diff)
• TowerDefensePrereqs.h (modified) (1 diff)
• TowerTurret.cc (added)
• TowerTurret.h (added)

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

@@ -5 +5 @@
   TowerDefenseHUDController.cc
   TowerDefensePlayerStats.cc
-
+  TowerTurret.cc
 )
 

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

@@ -46 +46 @@
     {
         static int yaw;
-        orxout() << "rotateYaw " << ++yaw << endl;
+        //orxout() << "rotateYaw " << ++yaw << endl;
     }
 
@@ -52 +52 @@
     {
         static int pitch;
-        orxout() << "rotatePitch " << ++pitch << endl;
+        //orxout() << "rotatePitch " << ++pitch << endl;
     }
 

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

@@ -75 +75 @@
 
 #include "TowerDefense.h"
-#include "Tower.h"
+//#include "Tower.h"
+#include "TowerTurret.h"
 #include "TowerDefenseCenterpoint.h"
 
@@ -190 +191 @@
 
         // Create tower
-        Tower* newTower = new Tower(this->center_->getContext());
+        TowerTurret* newTower = new TowerTurret(this->center_->getContext());
         newTower->addTemplate(this->center_->getTowerTemplate());
 

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

@@ -92 +92 @@
 
         std::vector<Coordinate> addedTowersCoordinates_;
-        std::vector<Tower*> towers_;
+        std::vector<TowerTurret*> towers_;
     };
 }

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

@@ -53 +53 @@
         XMLPortParam(TowerDefenseController, "alertnessradius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues(500.0f);
     }
+
 
     void TowerDefenseController::tick(float dt)

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

@@ -66 +66 @@
 {
     class TowerDefense;
-    class Tower;
+    //class Tower;
     class TowerDefenseCenterpoint;
     class TowerDefenseHUDController;
     class TowerDefensePlayerStats;
+    class TowerTurret;
 }