Changeset 2843 for code/branches/gui

Timestamp:

Mar 25, 2009, 4:34:40 PM (16 years ago)

Author:

rgrieder

Message:

Exported TimeFactorListener to separate file in the tools folder.

Location:

code/branches/gui/src/orxonox

Files:

• gamestates/GSRoot.cc (modified) (2 diffs)
• gamestates/GSRoot.h (modified) (1 diff)
• objects/worldentities/Backlight.h (modified) (1 diff)
• tools/CMakeLists.txt (modified) (1 diff)
• tools/ParticleInterface.h (modified) (1 diff)
• tools/TimeFactorListener.cc (added)
• tools/TimeFactorListener.h (added)
• tools/Timer.h (modified) (1 diff)

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

@@ -35 +35 @@
 #include "core/CoreIncludes.h"
 #include "core/ConsoleCommand.h"
+#include "tools/TimeFactorListener.h"
 #include "tools/Timer.h"
 #include "objects/Tickable.h"
@@ -171 +172 @@
         }
     }
-
-    ////////////////////////
-    // TimeFactorListener //
-    ////////////////////////
-    float TimeFactorListener::timefactor_s = 1.0f;
-
-    TimeFactorListener::TimeFactorListener()
-    {
-        RegisterRootObject(TimeFactorListener);
-    }
 }

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

@@ -68 +68 @@
         ConsoleCommand*       ccPause_;
     };
-
-    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;
-    };
 }
 

code/branches/gui/src/orxonox/objects/worldentities/Backlight.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "FadingBillboard.h"
-#include "gamestates/GSRoot.h"
+#include "tools/TimeFactorListener.h"
 
 namespace orxonox

code/branches/gui/src/orxonox/tools/CMakeLists.txt

@@ -5 +5 @@
   Shader.cc
   TextureGenerator.cc
+  TimeFactorListener.cc
   Timer.cc
   WindowEventListener.cc

code/branches/gui/src/orxonox/tools/ParticleInterface.h

@@ -37 +37 @@
 #include "core/OrxonoxClass.h"
 #include "util/Math.h"
-#include "gamestates/GSRoot.h"
+#include "tools/TimeFactorListener.h"
 
 #define getAllEmitters() \

code/branches/gui/src/orxonox/tools/Timer.h

@@ -64 +64 @@
 #include "core/Executor.h"
 #include "core/OrxonoxClass.h"
-#include "gamestates/GSRoot.h"
+#include "tools/TimeFactorListener.h"
 
 namespace orxonox