Changeset 2807 for code/branches/gui/src/core

Timestamp:

Mar 19, 2009, 6:11:00 PM (15 years ago)

Author:

rgrieder

Message:

Moved global game clock to Core. Use getGameClock() for a const reference to an object that can tell you the time since the game was started or since the last capture() (which is usually once a frame).

Location:

code/branches/gui/src/core

Files:

• Core.cc (modified) (4 diffs)
• Core.h (modified) (3 diffs)

code/branches/gui/src/core/Core.cc

@@ -94 +94 @@
     SetCommandLineArgument(limitToCPU, 0).information("0: off | #cpu");
 
-    /**
-        @brief Constructor: Registers the object and sets the config-values.
-        @param A reference to a global variable, used to avoid an infinite recursion in getSoftDebugLevel()
-    */
-    Core::Core(int argc, char** argv)
+    Core::Core()
     {
         RegisterRootObject(Core);
@@ -104 +100 @@
         assert(Core::singletonRef_s == 0);
         Core::singletonRef_s = this;
+    }
+
+    Clock* Core::initialise(int argc, char** argv)
+    {
+        // Set up a basic clock to keep time
+        this->gameClock_ = new Clock();
 
         // Parse command line arguments fist
@@ -173 +175 @@
         
         this->loaded_ = true;
+
+        // Return non const pointer to the game's clock for the main loop
+        return this->gameClock_;
     }
 
@@ -194 +199 @@
         // Also delete external console command that don't belong to an Identifier
         CommandExecutor::destroyExternalCommands();
+
+        delete this->gameClock_;
 
         assert(Core::singletonRef_s);

code/branches/gui/src/core/Core.h

@@ -61 +61 @@
     {
         public:
-            Core(int argc, char** argv);
+            Core();
             ~Core();
+
+            Clock* initialise(int argc, char** argv);
             void setConfigValues();
 
-            bool isLoaded() { return this->loaded_; }
             void update(const Clock& time);
 
@@ -74 +75 @@
             static const std::string& getLanguage();
             static void  resetLanguage();
+
+            static const Clock& getGameClock() { return *getInstance().gameClock_; }
 
             static void tsetMediaPath(const std::string& path)
@@ -120 +123 @@
             TclThreadManager*     tclThreadManager_;
 
+            Clock*                gameClock_;
+
             int softDebugLevel_;                            //!< The debug level
             int softDebugLevelConsole_;                     //!< The debug level for the console