Changeset 3546 in orxonox.OLD for orxonox/trunk

Timestamp:

Mar 14, 2005, 6:21:37 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: fixed a bug in the update phase, added real debug output bensch style

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (4 diffs)
• orxonox.cc (modified) (1 diff)
• story_entities/world.cc (modified) (15 diffs)
• track_manager.cc (modified) (1 diff)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -327 +327 @@
   if( pNode->parent != NULL )
     {
-      printf("PNode::addChild() - removing child from old parent \n");
       PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
       pNode->parent->removeChild(pNode);
@@ -334 +333 @@
   pNode->parent = this;
   this->children->add(pNode);
-  printf("PNode::addChild() - Parent added\n");
 }
 
@@ -441 +439 @@
 void PNode::update (float timeStamp)
 {
-  printf ("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
   // printf("%s", this->objectName);
 
@@ -541 +539 @@
 void PNode::debug()
 {
-  printf("PNode::debug() - absCoord: (%f, %f, %f)\n", 
+  PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n", 
          this->absCoordinate.x, 
          this->absCoordinate.y,

orxonox/trunk/src/orxonox.cc

@@ -31 +31 @@
 #include "game_loader.h"
 #include <string.h>
-int verbose;
+int verbose = 2;
 
 using namespace std;

orxonox/trunk/src/story_entities/world.cc

@@ -43 +43 @@
 {
   this->init(name, -1);
-  printf("World::World - generating Nullparent\n");
   NullParent* np = NullParent::getInstance();
 }
@@ -64 +63 @@
 World::~World ()
 {
-  printf("World::~World() - deleting current world\n");
+  PRINTF(3)("World::~World() - deleting current world\n");
   CommandNode* cn = Orxonox::getInstance()->getLocalInput();
   cn->unbind(this->localPlayer);
@@ -469 +468 @@
 ErrorMessage World::start()
 {
-  printf("World::start() - starting current World: nr %i\n", this->debugWorldNr);
+  PRINTF(3)("World::start() - starting current World: nr %i\n", this->debugWorldNr);
   this->bQuitOrxonox = false;
   this->bQuitCurrentGame = false;
@@ -482 +481 @@
 ErrorMessage World::stop()
 {
-  printf("World::stop() - got stop signal\n");
+  PRINTF(3)("World::stop() - got stop signal\n");
   this->bQuitCurrentGame = true;
 }
@@ -515 +514 @@
 void World::displayLoadScreen ()
 {
-  printf ("World::displayLoadScreen - start\n"); 
+  PRINTF(3)("World::displayLoadScreen - start\n"); 
   
   //GLMenuImageScreen* 
@@ -523 +522 @@
   this->glmis->draw();
  
-  printf ("World::displayLoadScreen - end\n"); 
+  PRINTF(3)("World::displayLoadScreen - end\n"); 
 }
 
@@ -533 +532 @@
 void World::releaseLoadScreen ()
 {
-  printf ("World::releaseLoadScreen - start\n"); 
+  PRINTF(3)("World::releaseLoadScreen - start\n"); 
   this->glmis->setValue(this->glmis->getMaximum());
   SDL_Delay(500);
-  printf ("World::releaseLoadScreen - end\n"); 
+  PRINTF(3)("World::releaseLoadScreen - end\n"); 
 }
 
@@ -614 +613 @@
 void World::debug()
 {
-  printf ("World::debug() - starting debug\n");
+  PRINTF(2)("debug() - starting debug\n");
   PNode* p1 = NullParent::getInstance ();
   PNode* p2 = new PNode (new Vector(2, 2, 2), p1);
@@ -686 +685 @@
 {
   this->lastFrame = SDL_GetTicks ();
-  printf("World::mainLoop() - Entering main loop\n");
+  PRINTF(3)("World::mainLoop() - Entering main loop\n");
   while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
-      printf("World::mainloop() - number of entities: %i\n", this->entities->getSize());
+      PRINTF(3)("World::mainloop() - number of entities: %i\n", this->entities->getSize());
       // Network
       this->synchronize ();
@@ -695 +694 @@
       this->handleInput ();
       if( this->bQuitCurrentGame || this->bQuitOrxonox)
-        {
-          printf("World::mainLoop() - leaving loop earlier...\n");
           break;
-        }
       // Process time
       this->timeSlice ();
@@ -709 +705 @@
       /* \todo this is to slow down the program for openGl Software emulator computers, reimplement*/
     }
-  printf("World::mainLoop() - Exiting the main loop\n");
+  PRINTF(3)("World::mainLoop() - Exiting the main loop\n");
 }
 
@@ -755 +751 @@
         {
           float fps = 1000/dt;
-          printf("fps = %f\n", fps);
+          PRINTF(3)("fps = %f\n", fps);
         }
       else
@@ -762 +758 @@
              nothing.
           */
-          printf("fps = 1000 - frame rate is adjusted\n");
+          PRINTF(2)("fps = 1000 - frame rate is adjusted\n");
           SDL_Delay(10);
           dt = 10;
@@ -771 +767 @@
       WorldEntity* entity;
       float seconds = dt / 1000.0;      
-      this->nullParent->update (seconds);
       entity = entities->enumerate(); 
       while( entity != NULL) 
@@ -783 +778 @@
       this->localCamera->timeSlice(dt);
       this->trackManager->tick(dt);
+      this->nullParent->update (seconds);
     }
   this->lastFrame = currentFrame;

orxonox/trunk/src/track_manager.cc

@@ -664 +664 @@
       Vector v(0.0, 1.0, 0.0);
       Quaternion q(-PI/2, v);
-      //this->relDirection = this->relDirection * q;
       quat = quat * q;