Changeset 3215 in orxonox.OLD for orxonox/trunk

Timestamp:

Dec 18, 2004, 4:10:05 AM (20 years ago)

Author:

patrick

Message:

/orxonox/trunk: discovered a minor bug and fixed some code style issues…

Location:

orxonox/trunk/src

Files:

• camera.cc (modified) (3 diffs)
• command_node.cc (modified) (1 diff)
• game_loader.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• world.cc (modified) (5 diffs)

orxonox/trunk/src/camera.cc

@@ -30 +30 @@
 {
   this->world = world;
-  bound = NULL;
+  this->bound = NULL;
   /* give it some physical live */
-  m = 10;
-  a = new Vector(0.0, 0.0, 0.0);
-  v = new Vector(0.0, 0.0, 0.0);
-  fs = new Vector(0.0, 0.0, 0.0);
-  cameraMode = NORMAL;
-  deltaTime = 3000.0;
-  cameraOffset = 1.0;
-  cameraOffsetZ = 10.0;
-  t = 0.0;
-
-  actual_place.r.x = 0.0;
-  actual_place.r.y = 10.0;
-  actual_place.r.z = -5.0;
+  this->m = 10;
+  this->a = new Vector(0.0, 0.0, 0.0);
+  this->v = new Vector(0.0, 0.0, 0.0);
+  this->fs = new Vector(0.0, 0.0, 0.0);
+  this->cameraMode = NORMAL;
+  this->deltaTime = 3000.0;
+  this->cameraOffset = 1.0;
+  this->cameraOffsetZ = 10.0;
+  this->t = 0.0;
+
+  this->actual_place.r.x = 0.0;
+  this->actual_place.r.y = 10.0;
+  this->actual_place.r.z = -5.0;
 }
 
@@ -63 +63 @@
 void Camera::time_slice (Uint32 deltaT)
 {
-  if(t <= deltaTime)
-    {t += deltaT;}
+  if( this->t <= deltaTime)
+    {this->t += deltaT;}
   //printf("time is: t=%f\n", t );
-  update_desired_place ();
-  jump (NULL);
+  update_desired_place();
+  jump(NULL);
 }
 
@@ -242 +242 @@
   /*  translation */
   glTranslatef (-actual_place.r.x, -actual_place.r.y,- actual_place.r.z);
-  //Placement *plBound = bound->get_placement();
+//Placement *plBound = bound->get_placement();
 
   // ===== second camera control calculation option
   /*
-    gluLookAt(actual_place.r.x, actual_place.r.y, actual_place.r.z, 
+   gluLookAt(actual_place.r.x, actual_place.r.y, actual_place.r.z, 
               plBound->r.x, plBound->r.y, plBound->r.z,
               0.0, 0.0, 1.0);

orxonox/trunk/src/command_node.cc

@@ -248 +248 @@
 void CommandNode::relay (Command* cmd)
 {
-  
+
   Orxonox *orx = Orxonox::getInstance();
   if( orx->system_command (cmd)) return;

orxonox/trunk/src/game_loader.cc

@@ -119 +119 @@
 
 
-
-
-
 Campaign* GameLoader::fileToCampaign(char *name)
 {

orxonox/trunk/src/orxonox.cc

@@ -321 +321 @@
     }
   
-  //(*orx).mainLoop();
-
   orx->start();
   

orxonox/trunk/src/world.cc

@@ -75 +75 @@
 {
   this->bQuitCurrentGame = true;
-  this->localCamera->setWorld(NULL);
+  //this->localCamera->setWorld(NULL);
+  this->localPlayer->destroy();
   this->localCamera->destroy();
 
@@ -569 +570 @@
   this->bQuitCurrentGame = false;
   printf("World|Entering main loop\n");
-  while(!this->bQuitOrxonox && !this->bQuitCurrentGame) /* pause pause pause ?!?!?*/
+  while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
       //debug routine
@@ -577 +578 @@
       // Process input
       handle_input();
+      if( this->bQuitCurrentGame || this->bQuitOrxonox)
+        {
+          printf("World::mainLoop() - leaving loop earlier...\n");
+          break;
+        }
       // Process time
       time_slice();
@@ -586 +592 @@
       for(int i = 0; i < 10000000; i++) {}
     }
-  printf("World|Exiting the main loop\n");
+  printf("World::mainLoop() - Exiting the main loop\n");
 }
 
@@ -655 +661 @@
     {
       if( !cmd->bUp) this->bQuitOrxonox = true;
-      return true;
+      {
+        printf("World::system_command() - rescv quit command\n");
+        return true;
+      }
     }
   return false;