Changeset 9144 for code/branches

Timestamp:

May 4, 2012, 1:12:42 PM (13 years ago)

Author:

mentzerf

Message:

+ Added Tower model, not in game yet

Location:

code/branches/newlevel2012

Files:

• data/levels/towerDefense.oxw (modified) (1 diff)
• src/modules/towerdefense/Turm Blender (added)
• src/modules/towerdefense/Turm Blender/Tower_MAT.material (added)
• src/modules/towerdefense/Turm Blender/Tower_ME.mesh.xml (added)
• src/modules/towerdefense/Turm Blender/Turm.blend (added)
• src/modules/towerdefense/Turm Blender/Turm.scene (added)
• src/modules/towerdefense/Turm Blender/brick01.jpg (added)
• src/orxonox/controllers/WaypointController.cc (modified) (1 diff)

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

@@ -44 +44 @@
   <Tower>
     <attached>
-      <Model position="0,0,0" scale3D="0.5,0.5,2" mesh="cube_green.mesh" />
+      <Model position="0,0,0" scale3D="0.5,0.5,4" mesh="cube_green.mesh" />
     </attached>
   </Tower>

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

@@ -67 +67 @@
                 orxout() << "(" << this->waypoints_.size() << ") entity: " << this->getControllableEntity() << endl;
 
-
         if (this->waypoints_.size() == 0 || !this->getControllableEntity())
             return;