Changeset 4160 in orxonox.OLD for orxonox/branches/md2_loader/src/story_entities

Timestamp:

May 11, 2005, 12:49:49 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: merged trunk into md2_loader branche using command: svn merge ../trunk md2_loader -r 4139:HEAD

Location:

orxonox/branches/md2_loader/src/story_entities

Files:

• world.cc (modified) (4 diffs)
• world.h (modified) (1 diff)

orxonox/branches/md2_loader/src/story_entities/world.cc

@@ -1121 +1121 @@
       
       /* function to let all entities tick (iterate through list) */
-      float seconds = this->dt / 1000.0;      
-      this->gameTime += seconds;
+      this->dtS = (float)this->dt / 1000.0;      
+      this->gameTime += this->dtS;
       //entity = entities->enumerate(); 
       tIterator<WorldEntity>* iterator = this->entities->getIterator();
@@ -1128 +1128 @@
       while( entity != NULL) 
         { 
-          entity->tick (seconds);
+          entity->tick (this->dtS);
           entity = iterator->nextElement();
         }
@@ -1136 +1136 @@
       this->trackManager->tick(this->dt);
       this->localCamera->tick(this->dt);
-      this->garbageCollector->tick(seconds);
+      this->garbageCollector->tick(this->dtS);
           
-          /* actualy the Graphics Engine should tick the world not the other way around...
-                 but since we like the things not too complicated we got it this way around
-                 until there is need or time to do it the other way around.
-                 \todo: GraphicsEngine ticks world: separation of processes and data...
-          */
-      GraphicsEngine::getInstance()->tick(seconds);
-          AnimationPlayer::getInstance()->tick(seconds);
+      /* actualy the Graphics Engine should tick the world not the other way around...
+         but since we like the things not too complicated we got it this way around
+         until there is need or time to do it the other way around.
+         \todo: GraphicsEngine ticks world: separation of processes and data...
+      */
+      GraphicsEngine::getInstance()->tick(this->dtS);
+      AnimationPlayer::getInstance()->tick(this->dtS);
     }
   this->lastFrame = currentFrame;
@@ -1159 +1159 @@
 {
   this->garbageCollector->update();
-  this->nullParent->update (dt);
+  this->nullParent->update (this->dtS);
 }
 

orxonox/branches/md2_loader/src/story_entities/world.h

@@ -95 +95 @@
   Uint32 lastFrame;                   //!< last time of frame
   Uint32 dt;                          //!< time needed to calculate this frame
+  float dtS;                          //!< The time needed for caluculations in seconds
   double gameTime;                    //!< this is where the game time is saved
   bool bQuitOrxonox;                  //!< quit this application