Changeset 1826 for code/trunk

Timestamp:

Sep 22, 2008, 10:11:45 PM (16 years ago)

Author:

rgrieder

Message:

TimerBase are now ticked in GSRoot to be able to use them anywhere.

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (2 diffs)
• GSRoot.cc (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/GSLevel.cc

@@ -39 +39 @@
 #include "objects/Tickable.h"
 #include "objects/Radar.h"
-#include "tools/Timer.h"
 #include "tools/ParticleInterface.h"
 #include "Settings.h"
@@ -116 +115 @@
         for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
             it->tick(time.getDeltaTime() * this->timeFactor_);
-
-        for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
-            it->tick(time);
     }
 

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -44 +44 @@
 #include "core/TclBind.h"
 #include "core/TclThreadManager.h"
+#include "tools/Timer.h"
 #include "GraphicsEngine.h"
 #include "Settings.h"
@@ -179 +180 @@
     {
         TclThreadManager::getInstance().tick(time.getDeltaTime());
+
+        for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
+            it->tick(time);
 
         this->tickChild(time);