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

Timestamp:

Jun 8, 2005, 9:02:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: PhysicsEngine looks better (it speeds up things… but i do not exactly know if it works

Location:

orxonox/trunk/src/story_entities

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -214 +214 @@
   this->debugWorldNr = worldID;
   this->entities = new tList<WorldEntity>();
+  this->cycle = 0;
 }
 
@@ -498 +499 @@
   Field* gravity = new Gravity();
   gravity->setMagnitude(10.0);
-  //  gravity->setParent(this->localCamera->getTarget());
+  gravity->setParent(this->localCamera->getTarget());
 
   // Add the Flow from the Emitter into the System
@@ -958 +959 @@
   while( !this->bQuitOrxonox && !this->bQuitCurrentGame) /* \todo implement pause */
     {
+      ++this->cycle;
       PRINTF(3)("World::mainloop() - number of entities: %i\n", this->entities->getSize());
       // Network
@@ -1058 +1060 @@
       this->trackManager->tick(this->dt);
       this->localCamera->tick(this->dt);
+      // tick the engines
       AnimationPlayer::getInstance()->tick(this->dtS);
-      PhysicsEngine::getInstance()->tick(this->dtS);
-
-
-      particleEngine->tick(this->dtS);
-      this->garbageCollector->tick(this->dtS);
-
-      /* actualy the Graphics Engine should tick the world not the other way around...
+      if (this->cycle > 5)
+        PhysicsEngine::getInstance()->tick(this->dtS);
+
+      ParticleEngine::getInstance()->tick(this->dtS);
+      GarbageCollector::getInstance()->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.

orxonox/trunk/src/story_entities/world.h

@@ -1 @@
-/*! 
+/*!
     \file world.h
     \brief Holds and manages all game data
-*/ 
+*/
 
 #ifndef _WORLD_H
@@ -81 +81 @@
   virtual void displayLoadScreen();
   virtual void releaseLoadScreen();
-  
+
   /* command node functions */
   bool command (Command* cmd);
@@ -90 +90 @@
   void spawn (WorldEntity* entity);
   void spawn (WorldEntity* entity, Vector* absCoor, Quaternion* absDir);
-  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir, 
-             int parentingMode);
+  void spawn(WorldEntity* entity, PNode* parentNode, Vector* relCoor, Quaternion* relDir,
+             int parentingMode);
 
   const char* getPath();
@@ -102 +102 @@
 
   Uint32 lastFrame;                   //!< last time of frame
+  Uint32 cycle;                       //!< The cycle we are in (starts with 0 and rises with every frame)
   Uint32 dt;                          //!< time needed to calculate this frame
   float dtS;                          //!< The time needed for caluculations in seconds