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

Timestamp:

Mar 23, 2005, 5:43:07 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: implemented garbage collector, is not yet collecting, i have to update the list.h first.

Location:

orxonox/trunk/src/story_entities

Files:

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

orxonox/trunk/src/story_entities/world.cc

@@ -26 +26 @@
 #include "track_node.h"
 #include "world_entity.h"
-#include "track_manager.h"
 #include "player.h"
 #include "camera.h"
@@ -35 +34 @@
 #include "light.h"
 
+#include "track_manager.h"
+#include "garbage_collector.h"
+
 #include "command_node.h"
 #include "glmenu_imagescreen.h"
@@ -182 +184 @@
   WorldInterface* wi = WorldInterface::getInstance();
   wi->init(this);
+  this->garbageCollector = GarbageCollector::getInstance();
 }
 
@@ -506 +509 @@
 {
   return this->entities;
+}
+
+
+/**
+   \brief this returns the current game time
+   \returns elapsed game time
+*/
+double World::getGameTime()
+{
+  return this->gameTime;
 }
 
@@ -721 +734 @@
       this->dt = currentFrame - this->lastFrame;
       
-      if(dt > 0)
+      if( this->dt > 0)
         {
           float fps = 1000/dt;
@@ -733 +746 @@
           PRINTF(2)("fps = 1000 - frame rate is adjusted\n");
           SDL_Delay(10);
-          dt = 10;
+          this->dt = 10;
         }
       //this->timeSlice (dt);
@@ -739 +752 @@
       /* function to let all entities tick (iterate through list) */
       WorldEntity* entity;
-      float seconds = dt / 1000.0;      
+      float seconds = this->dt / 1000.0;      
+      this->gameTime += seconds;
       entity = entities->enumerate(); 
       while( entity != NULL) 
@@ -749 +763 @@
       
       /* update tick the rest */
-      this->trackManager->tick(dt);
-      this->localCamera->tick(dt);
+      this->trackManager->tick(this->dt);
+      this->localCamera->tick(this->dt);
+      this->garbageCollector->tick(seconds);
     }
   this->lastFrame = currentFrame;
@@ -764 +779 @@
 void World::update()
 {
+  this->garbageCollector->update();
   this->nullParent->update (dt);
 }

orxonox/trunk/src/story_entities/world.h

@@ -23 +23 @@
 class FontSet;
 class Terrain;
+class GarbageCollector;
 
 //! The game world Interface
@@ -57 +58 @@
   virtual ~World ();
 
+  double getGameTime();
 
   /* classes from story-entity */
@@ -88 +90 @@
   Uint32 lastFrame;             //!< last time of frame
   Uint32 dt;                    //!< time needed to calculate this frame
+  double gameTime;              //!< this is where the game time is saved
   bool bQuitOrxonox;            //!< quit this application
   bool bQuitCurrentGame;        //!< quit only the current game and return to menu
@@ -108 +111 @@
   tList<WorldEntity>* entities;//!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
   WorldEntity* localPlayer;     //!< The Player, you fly through the level.
+
+  GarbageCollector* garbageCollector; //!< reference to the garbage  collector
  
   /* function for main-loop */