Changeset 3551 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Mar 14, 2005, 11:46:50 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: renamed all timing functions to tick() - cleanede up world

Location:

orxonox/trunk/src/story_entities

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -285 +285 @@
 
             break;
-
-
           }
         default:
@@ -632 +630 @@
   p4->debug ();
   
-  p1->update (1);
+  p1->update ();
 
   printf ("World::debug() - update\n");
@@ -641 +639 @@
 
   p2->shiftCoor (new Vector(-1, -1, -1));
-  p1->update (2);
+  p1->update ();
 
   p1->debug ();
@@ -651 +649 @@
 
 
- p1->update (2);
+ p1->update ();
 
   p1->debug ();
@@ -696 +694 @@
           break;
       // Process time
-      this->timeSlice ();
+      this->tick ();
+      // Update the state
+      this->update ();      
       // Process collision
       this->collide ();
@@ -743 +743 @@
    a heart-beat.
 */
-void World::timeSlice ()
+void World::tick ()
 {
   Uint32 currentFrame = SDL_GetTicks();
@@ -778 +778 @@
       
       /* update tick the rest */
-      this->localCamera->timeSlice(dt);
+      this->localCamera->tick(dt);
       this->trackManager->tick(dt);
-      this->nullParent->update (seconds);
     }
   this->lastFrame = currentFrame;
+}
+
+
+/**
+   \brief this function gives the world a consistant state
+
+   after ticking (updating the world state) this will give a constistant
+   state to the whole system.
+*/
+void World::update()
+{
+  this->nullParent->update ();
 }
 
@@ -814 +825 @@
 void World::spawn(WorldEntity* entity)
 {
-  this->nullParent->addChild (entity);
   this->entities->add (entity);
   entity->postSpawn ();
@@ -828 +838 @@
 void World::spawn(WorldEntity* entity, Vector* absCoor, Quaternion* absDir)
 {
-  this->nullParent->addChild (entity);
   this->entities->add (entity);
 
@@ -849 +858 @@
                   parentingMode mode)
 {
-
+  this->nullParent = NullParent::getInstance();
   if( parentNode != NULL)
     {

orxonox/trunk/src/story_entities/world.h

@@ -84 +84 @@
   void synchronize ();
   void handleInput ();
-  void timeSlice ();
+  void tick ();
+  void update ();
   void collide ();
   void draw ();