Changeset 1052 for code/trunk/src/orxonox/Orxonox.h

Timestamp:

Apr 14, 2008, 3:42:49 AM (16 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/orxonox/Orxonox.h (modified) (2 diffs)

code/trunk/src/orxonox/Orxonox.h

@@ -41 +41 @@
       static void destroySingleton();
 
+      static inline void slomo(float factor) { Orxonox::getSingleton()->timefactor_ = factor; }
+      static inline void setTimeFactor(float factor = 1.0) { Orxonox::getSingleton()->timefactor_ = factor; }
+      static inline float getTimeFactor() { return Orxonox::getSingleton()->timefactor_; }
+      static inline void exit() { Orxonox::getSingleton()->abortRequest(); }
+
    private:
       // don't mess with singletons
@@ -75 +80 @@
       HUD*                  orxonoxHUD_;
       bool                  bAbort_;        //!< aborts the render loop if true
+      float                 timefactor_;    //!< A factor to change the gamespeed
 
       // this is used to identify the mode (server/client/...) we're in