Changeset 8692

Timestamp:

May 31, 2011, 5:34:18 PM (14 years ago)

Author:

rgrieder

Message:

Added "getTimeFactor" console command.

Location:

code/branches/presentation/src/orxonox/gamestates

Files:

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

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

@@ -45 +45 @@
 
     static const std::string __CC_setTimeFactor_name = "setTimeFactor";
+    static const std::string __CC_getTimeFactor_name = "getTimeFactor";
     static const std::string __CC_setPause_name = "setPause";
     static const std::string __CC_pause_name = "pause";
@@ -52 +53 @@
     SetConsoleCommand("printObjects", &GSRoot::printObjects).hide();
     SetConsoleCommand(__CC_setTimeFactor_name, &GSRoot::setTimeFactor).accessLevel(AccessLevel::Master).defaultValues(1.0);
+    SetConsoleCommand(__CC_getTimeFactor_name, &GSRoot::getTimeFactor).accessLevel(AccessLevel::Master);
     SetConsoleCommand(__CC_setPause_name,      &GSRoot::setPause     ).accessLevel(AccessLevel::Master).hide();
     SetConsoleCommand(__CC_pause_name,         &GSRoot::pause        ).accessLevel(AccessLevel::Master);
@@ -89 +91 @@
 
         ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(this);
+        ModifyConsoleCommand(__CC_getTimeFactor_name).setObject(this);
         ModifyConsoleCommand(__CC_setPause_name).setObject(this);
         ModifyConsoleCommand(__CC_pause_name).setObject(this);
@@ -96 +99 @@
     {
         ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(0);
+        ModifyConsoleCommand(__CC_getTimeFactor_name).setObject(0);
         ModifyConsoleCommand(__CC_setPause_name).setObject(0);
         ModifyConsoleCommand(__CC_pause_name).setObject(0);
@@ -151 +155 @@
                 this->timeFactorPauseBackup_ = factor;
         }
+    }
+
+    float GSRoot::getTimeFactor()
+    {
+        return TimeFactorListener::getTimeFactor();
     }
 

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

@@ -54 +54 @@
         void pause();
 
+        float getTimeFactor();
+
         static void delayedStartMainMenu(void);