Changeset 10335 for code/branches/towerdefenseFS15/src

Timestamp:

Mar 26, 2015, 3:26:26 PM (10 years ago)

Author:

erbj

Message:

tower don't shoot at the centerpoint anymore(because we shifted it by 2000,hack) and the tower and model are two different things now

Location:

code/branches/towerdefenseFS15/src

Files:

• modules/towerdefense/TowerDefense.cc (modified) (3 diffs)
• modules/towerdefense/TowerDefenseTower.cc (modified) (2 diffs)
• modules/towerdefense/TowerDefenseTower.h (modified) (1 diff)
• orxonox/controllers/FormationController.cc (modified) (1 diff)

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

@@ -154 +154 @@
         //set initial credits, lifes and WaveNumber
         this->setCredit(1000);
-        this->setLifes(25);
+        this->setLifes(100);
         this->setWaveNumber(0);
         time=0.0;
@@ -194 +194 @@
         }
 
+        en1->setTeam(2);
         en1->getController();
         en1->setPosition(path.at(0)->get3dcoordinate());
@@ -276 +277 @@
         towermatrix [x][y]=true;
 
+        //Create Model
+        Model* newtowermodel = new Model(this->center_->getContext());
+        newtowermodel->setMeshSource("Tower.mesh");
+        newtowermodel->setScale(45);
+        newtowermodel->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 50);
+
+
+
         //Creates tower
         TowerDefenseTower* towernew = new TowerDefenseTower(this->center_->getContext());
-        towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 75);
+        towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 275);
         towernew->setGame(this);
+        towernew->setTeam(1);
     }
 

code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc

@@ -41 +41 @@
     }
 
+    /*
     void TowerDefenseTower::setOrientation(const Quaternion& orientation)
     {
@@ -56 +57 @@
     {
     }
+    */
 
     bool TowerDefenseTower::upgradeTower()

code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h

@@ -38 +38 @@
 
         // Overriding these to stop TowerDefenseTowers from spasing out
+        /*
         void setOrientation(const Quaternion& orientation);
         virtual void rotateYaw(const Vector2& value);
         virtual void rotatePitch(const Vector2& value);
         virtual void rotateRoll(const Vector2& value);
+        */
         virtual bool upgradeTower();
 

code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc

@@ -956 +956 @@
     bool FormationController::sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype)
     {
+
+
         if (entity1 == entity2)
             return true;