Changeset 1674 for code/branches/gui/src/orxonox/gamestates/GSLevel.cc

Timestamp:

Aug 28, 2008, 8:30:25 PM (16 years ago)

Author:

rgrieder

Message:

• Wrote Clock() class: It starts an internal clock when GSRoot starts and gets handed to all GameState ticks as reference. You can then either query the ticked time or the real time (for instance for statistical measurements)
• general clean up in all the game states

File:

• code/branches/gui/src/orxonox/gamestates/GSLevel.cc (modified) (4 diffs)

code/branches/gui/src/orxonox/gamestates/GSLevel.cc

@@ -44 +44 @@
     GSLevel::GSLevel(const std::string& name)
         : GameState(name)
-        , timefactor_(1.0f)
+        , timeFactor_(1.0f)
         , keyBinder_(0)
         , inputState_(0)
@@ -74 +74 @@
         hud_ = new Level(Settings::getDataPath() + "overlay/hud.oxo");
         Loader::load(hud_);
+
+        // reset game speed to normal
+        timeFactor_ = 1.0f;
     }
 
@@ -96 +99 @@
     }
 
-    void GSLevel::ticked(float dt, uint64_t time)
+    void GSLevel::ticked(const Clock& time)
     {
         // Call those objects that need the real time
         for (Iterator<TickableReal> it = ObjectList<TickableReal>::start(); it; ++it)
-            it->tick(dt);
+            it->tick(time.getDeltaTime());
         // Call the scene objects
         for (Iterator<Tickable> it = ObjectList<Tickable>::start(); it; ++it)
-            it->tick(dt * this->timefactor_);
+            it->tick(time.getDeltaTime() * this->timeFactor_);
     }
 
@@ -112 +115 @@
     void GSLevel::setTimeFactor(float factor)
     {
-        float change = factor / this->timefactor_;
-        this->timefactor_ = factor;
+        float change = factor / this->timeFactor_;
+        this->timeFactor_ = factor;
         for (Iterator<ParticleInterface> it = ObjectList<ParticleInterface>::begin(); it; ++it)
             it->setSpeedFactor(it->getSpeedFactor() * change);
 
         for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
-            it->setTimeFactor(timefactor_);
+            it->setTimeFactor(timeFactor_);
     }