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

[mentzerf at orxonox.net]

Author: mentzerf
Date: 2012-04-29 12:52:05 +0200 (Sun, 29 Apr 2012)
New Revision: 9139

Modified:
   code/branches/newlevel2012/data/levels/towerDefense.oxw
   code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
   code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
Log:
* Fixed some formatting, some comments and some logs. Done for today.

Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-29 10:40:11 UTC (rev 9138)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw	2012-04-29 10:52:05 UTC (rev 9139)
@@ -26,7 +26,7 @@
 -->
 
 <!-- Specify the position of the camera -->
-<Template name=playfieldcameras defaults=0>
+<Template name=centerpointmarkcamera defaults=0>
   <Pawn>
     <camerapositions>
       <CameraPosition position="0,0,20"/>
@@ -34,9 +34,9 @@
   </Pawn>
 </Template>
 
-<!-- Loads the playfield mesh -->
-<Template name=playfield>
-  <Pawn camerapositiontemplate=playfieldcameras>
+<!-- Loads a mesh to mark the center-->
+<Template name=centerpointmark>
+  <Pawn camerapositiontemplate=centerpointmarkcamera>
     <attached>
       <Model position="0,0,0" mesh="cylinder.mesh" scale3D="1,1,1" /> <!-- the camera is attached to this -->
     </attached>
@@ -57,26 +57,23 @@
   <templates>
     <Template link=lodtemplate_default />
   </templates>
+  
   <?lua include("includes/notifications.oxi") ?>
 
-
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
     skybox       = "Orxonox/Starbox"
   >
-
-    <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"/>
+  
+  	<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"/>
     
-    
 	<!-- Spawns the camera, attached to a crate -->
-	<SpawnPoint team=0 position="0,0,0" spawnclass=Pawn pawndesign=playfield />
-
+	<SpawnPoint team=0 position="0,0,0" spawnclass=Pawn pawndesign=centerpointmark />
 	
  	<!--SpawnPoint team=1 position="0,0,10" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff  /-->
  	<!--SpawnPoint team=0 position="0,0,0" 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>
@@ -108,13 +105,12 @@
 		
 			<Model position="-0.5,-0.5,0" mesh="Playfield_ME.mesh" scale=0.8 />
 			
+			<!-- This was used to mark the playfield, let's let it be here for now -->
 			<!--Model position="-8,8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
 			<!--Model position="-8,-8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
 			<!--Model position="8,-8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
 			<!--Model position="8,8,0" mesh="crate.mesh" scale3D="0.3,0.3,0.3" /-->
 			
-			<!--Model position="0,0,50" direction="0,0,0"  mesh="rocket.mesh"  scale3D="0.3,0.3,0.3" /-->
-			
         </attached>
     </TowerDefenseCenterpoint>
 

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-29 10:40:11 UTC (rev 9138)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.cc	2012-04-29 10:52:05 UTC (rev 9139)
@@ -82,6 +82,7 @@
 	
     TowerDefense::~TowerDefense()
     {
+		/* Part of a temporary hack to allow the player to add towers */
         if (this->isInitialized())
         {
             if( this->dedicatedAddTower_ )
@@ -91,8 +92,7 @@
 	
 	void TowerDefense::setCenterpoint(TowerDefenseCenterpoint *centerpoint)
 	{
-		orxout() << "got a centerpoint..." << endl;
-		
+		orxout() << "Centerpoint now set..." << endl;
 		this->center_ = centerpoint;
 	}
 	
@@ -100,31 +100,28 @@
     {
         Deathmatch::start();
 		
-        orxout()<< "Adding towers for debug..." <<endl;
+        orxout() << "Adding towers for debug..." << endl;
 		
-		addTower(0,15);
-		addTower(15,0);
+		// Mark corners
+		addTower(0,15); addTower(15,0);
 		
+		// Mark diagonal line
 		for (int i = 0 ; i <= 15; i++)
-		{
 			addTower(i,i);
-		}
 		
-		orxout()<< "Done" <<endl;
+		orxout() << "Done" << endl;
 		
 		ChatManager::message("Use the console command addTower x y to add towers");
-    }
+	}
 	
-	/*
-	 void TowerDefense::end()
-	 {
-	 Deathmatch::end();
+	void TowerDefense::end()
+	{
+		Deathmatch::end();
 	 
-	 std::string message("The match has ended.");
-	 ChatManager::message(message);
-	 }
-	 */
+		ChatManager::message("Match is over");
+	}
 	
+	
 	void TowerDefense::addTower(int x, int y)
 	{
 		if (x > 15 || y > 15 || x < 0 || y < 0)

Modified: code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-29 10:40:11 UTC (rev 9138)
+++ code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h	2012-04-29 10:52:05 UTC (rev 9139)
@@ -49,10 +49,15 @@
 		//virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
 		//virtual void playerScored(PlayerInfo* player);
 		
+		/*	Called by TowerDefenseCenterpoint upon game start 
+			The centerpoint is used to create towers
+		*/
 		void setCenterpoint(TowerDefenseCenterpoint *centerpoint);
 		
+		/* Adds a tower at x, y in the playfield */
+		void addTower(int x, int y);
+		
 		/* Part of a temporary hack to allow the player to add towers */
-		void addTower(int x, int y);
 		ConsoleCommand* dedicatedAddTower_;
 		
 	private: