[Orxonox-commit 4462] r9133 - in code/branches/newlevel2012: data/levels src/modules/towerdefense

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-04-29 10:06:09 +0200 (Sun, 29 Apr 2012)
New Revision: 9133

Modified:
   code/branches/newlevel2012/data/levels/towerDefense.oxw
   code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
Log:
Fixed oxw file:
* Camera is now focus on 0,0,0 and locked on a crate.mesh, not on the playfield.mesh. This allows us to insert the playfield.mesh after the player has pressed the mouse button. Later the crate can me made invisible
+ Playfield.mesh is inserted as StaticEntity
- Commented out the waypoints for now
- TowerDefense is not using SpawnPoint any more, as it is not needed


Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-29 08:04:00 UTC (rev 9132)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-29 08:06:09 UTC (rev 9133)
@@ -29,7 +29,7 @@
 <Template name=playfieldcameras defaults=0>
   <Pawn>
     <camerapositions>
-      <CameraPosition position="200,0,350" absolute=true />
+      <CameraPosition position="0,0,20" absolute=true />
     </camerapositions>
   </Pawn>
 </Template>
@@ -40,7 +40,7 @@
 <Template name=playfield>
   <Pawn camerapositiontemplate=playfieldcameras>
     <attached>
-      <Model position="0,0,0" orientation="1,1,1,1" mesh="Playfield_ME.mesh" scale3D="10,10,10" /> <!-- crate.mesh -->
+      <Model position="0,0,0" orientation="1,1,1,1" mesh="crate.mesh" scale3D="1,1,1" /> <!-- the camera is attached to this -->
     </attached>
   </Pawn>
 </Template>
@@ -64,13 +64,14 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <!--SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
     
-    <SpawnPoint team=0 position="200,0,0" lookat="0,0,0" spawnclass=Pawn pawndesign=playfield />
+	<!-- Spawns the camera, attached to a crate -->
+    <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=Pawn pawndesign=playfield />
     
  	<!--SpawnPoint team=1 position="0,0,30" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff  /-->
  	
  	
  	
- 	 <SpaceShip position="-10,0,20" lookat="0,0,0">
+ 	 <!--SpaceShip position="-10,0,20" lookat="0,0,0">
       <templates>
         <Template link=spaceshipassff />
       </templates>
@@ -84,14 +85,14 @@
           </waypoints>
         </WaypointController>
       </controller>
-    </SpaceShip>
+    </SpaceShip-->
     
 
-    <!--StaticEntity position="0,0,0" direction="0,0,0" collistionType=static mass=100000>
+    <StaticEntity position="0,0,0" direction="1,0,0" collistionType=static mass=100000>
         <attached>
-            <Model position="0,0,0" mesh="Playfield_ME.mesh" scale3D="10,10,10" />
+            <Model position="0,0,0" orientation="1,1,1,1" mesh="Playfield_ME.mesh" scale3D="1,1,1" />
         </attached>
-    </StaticEntity-->
+    </StaticEntity>
 
   </Scene>
 </Level>

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-29 08:04:00 UTC (rev 9132)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-29 08:06:09 UTC (rev 9133)
@@ -102,9 +102,9 @@
 
 	void TowerDefense::spawnEnemy()
 	{
-		SpawnPoint *sp = *this->spawnpoints_.begin();
+		//SpawnPoint *sp = *this->spawnpoints_.begin();
 
-		Pawn* p = sp->spawn();
+		//Pawn* p = sp->spawn();
 	}
 
 /*