Changeset 9139 for code/branches

Timestamp:

Apr 29, 2012, 12:52:05 PM (13 years ago)

Author:

mentzerf

Message:

• Fixed some formatting, some comments and some logs. Done for today.

Location:

code/branches/newlevel2012

Files:

• data/levels/towerDefense.oxw (modified) (5 diffs)
• src/modules/towerdefense/TowerDefense.cc (modified) (3 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (1 diff)

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

@@ -27 +27 @@
 
 <!-- Specify the position of the camera -->
-<Template name=playfieldcameras defaults=0>
+<Template name=centerpointmarkcamera defaults=0>
   <Pawn>
     <camerapositions>
@@ -35 +35 @@
 </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 -->
@@ -58 +58 @@
     <Template link=lodtemplate_default />
   </templates>
+  
   <?lua include("includes/notifications.oxi") ?>
-
 
   <Scene
@@ -65 +65 @@
     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 />
@@ -109 +106 @@
                         <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>

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

@@ -83 +83 @@
     TowerDefense::~TowerDefense()
     {
+                /* Part of a temporary hack to allow the player to add towers */
         if (this->isInitialized())
         {
@@ -92 +93 @@
         void TowerDefense::setCenterpoint(TowerDefenseCenterpoint *centerpoint)
         {
-                orxout() << "got a centerpoint..." << endl;
-                
+                orxout() << "Centerpoint now set..." << endl;
                 this->center_ = centerpoint;
         }
@@ -101 +101 @@
         Deathmatch::start();
                 
-        orxout()<< "Adding towers for debug..." <<endl;
-                
-                addTower(0,15);
-                addTower(15,0);
-                
+        orxout() << "Adding towers for debug..." << endl;
+                
+                // 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();
-         
-         std::string message("The match has ended.");
-         ChatManager::message(message);
-         }
-         */
+        }
+        
+        void TowerDefense::end()
+        {
+                Deathmatch::end();
+         
+                ChatManager::message("Match is over");
+        }
+        
         
         void TowerDefense::addTower(int x, int y)

code/branches/newlevel2012/src/modules/towerdefense/TowerDefense.h

@@ -50 +50 @@
                 //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_;