Changeset 9161

Timestamp:

May 4, 2012, 4:19:17 PM (12 years ago)

Author:

weigeltm

Message:

updated tower template and more stuff

Location:

code/branches/newlevel2012

Files:

• data/levels/includes/towerWeaponSettings.oxi (added)
• data/levels/templates/tower.oxt (added)
• data/levels/towerDefense.oxw (modified) (4 diffs)
• src/modules/towerdefense/Tower.cc (modified) (2 diffs)
• src/orxonox/controllers/WaypointController.cc (modified) (1 diff)

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

@@ -19 +19 @@
   include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
+  include("templates/tower.oxt")
 ?>
 
@@ -41 +42 @@
 
 <!-- Template for a tower -->
-<Template name=towertemplate>
+<!--Template name=towertemplate>
   <Tower>
     <attached>
-      <Model position="0,0,0" scale=2.5 mesh="Tower_ME.mesh" />
+      <Model position="0,0,0" scale=0.25 mesh="Tower_ME.mesh" />
     </attached>
   </Tower>
-</Template>
+</Template-->
 
 <Level gametype = "TowerDefense">
@@ -87 +88 @@
     </SpaceShip>
     
-
         <!-- PlayField -->
         <TowerDefenseCenterpoint 
@@ -94 +94 @@
         height=16
         tileScale=100
-        towerTemplate=towertemplate 
+        towerTemplate=tower
         position="0,0,0" 
         direction="0,0,0" 

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

@@ -52 +52 @@
     void Tower::moveFrontBack(const Vector2& value)
     {
-        orxout() << "frontBack.x: " << value.x << endl;
+        //orxout() << "frontBack.x: " << value.x << endl;
     }
         
@@ -63 +63 @@
     void Tower::moveRightLeft(const Vector2& value)
     {
-                orxout() << "rightLeft.x: " << value.x << endl;
+                //orxout() << "rightLeft.x: " << value.x << endl;
                 /*
         if(!this->delay_)

code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc

@@ -65 +65 @@
             return;
 
-//              orxout() << "(" << this->waypoints_.size() << ") entity: " << this->getControllableEntity() << endl;
 
         if (this->waypoints_.size() == 0 || !this->getControllableEntity())
             return;
 
-//              printf("3");
 
         if (this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_)
             this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
 
-//              printf("4");
 
         this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());