Changeset 2406 for code/branches/objecthierarchy2/src/orxonox/gamestates

Timestamp:

Dec 11, 2008, 3:06:33 AM (16 years ago)

Author:

landauf

Message:

Added TimeFactorListener to properly handle changes of the global time factor (makes the game faster or slower). Currently supported in Backlight, ParticleInterface and Timer, which were all critical classes I could think of (all other classes are already covered by the adjustment of dt in tick(dt)). It seems to work well, both with small values (0.1, 0.01) and great values (10, 100). Even pausing the game (0) works fine.

Location:

code/branches/objecthierarchy2/src/orxonox/gamestates

Files:

• GSRoot.cc (modified) (2 diffs)
• GSRoot.h (modified) (1 diff)

code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.cc

@@ -44 +44 @@
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
-#include "objects/worldentities/Backlight.h"
-#include "tools/ParticleInterface.h"
 #include "Settings.h"
 
-#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32 
+#if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
@@ -231 +229 @@
         if (Core::isMaster())
         {
-            float change = factor / this->timeFactor_;
+            TimeFactorListener::timefactor_s = factor;
+
+            for (ObjectList<TimeFactorListener>::iterator it = ObjectList<TimeFactorListener>::begin(); it != ObjectList<TimeFactorListener>::end(); ++it)
+                it->changedTimeFactor(factor, this->timeFactor_);
 
             this->timeFactor_ = factor;
-/*
-            for (ObjectList<ParticleInterface>::iterator it = ObjectList<ParticleInterface>::begin(); it != ObjectList<ParticleInterface>::end(); ++it)
-                it->setSpeedFactor(it->getSpeedFactor() * change);
-
-            for (ObjectList<Backlight>::iterator it = ObjectList<Backlight>::begin(); it != ObjectList<Backlight>::end(); ++it)
-                it->setTimeFactor(timeFactor_);
-*/
         }
     }
+
+    ////////////////////////
+    // TimeFactorListener //
+    ////////////////////////
+    float TimeFactorListener::timefactor_s = 1.0f;
+
+    TimeFactorListener::TimeFactorListener()
+    {
+        RegisterRootObject(TimeFactorListener);
+    }
 }

code/branches/objecthierarchy2/src/orxonox/gamestates/GSRoot.h

@@ -72 +72 @@
         ConsoleCommand*       ccSetTimeFactor_;
     };
+
+    class _OrxonoxExport TimeFactorListener : virtual public OrxonoxClass
+    {
+        friend class GSRoot;
+
+        public:
+            TimeFactorListener();
+            virtual ~TimeFactorListener() {}
+
+        protected:
+            virtual void changedTimeFactor(float factor_new, float factor_old) {}
+            inline float getTimeFactor() const
+                { return TimeFactorListener::timefactor_s; }
+
+        private:
+            static float timefactor_s;
+    };
 }