Changeset 2807 for code/branches

Timestamp:

Mar 19, 2009, 6:11:00 PM (16 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

Files:

• core/Core.cc (modified) (4 diffs)
• core/Core.h (modified) (3 diffs)
• orxonox/Game.cc (modified) (3 diffs)
• orxonox/Game.h (modified) (1 diff)
• orxonox/gamestates/GSClient.cc (modified) (1 diff)

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

code/branches/gui/src/orxonox/Game.cc

@@ -89 +89 @@
         this->abort_ = false;
 
-        this->core_ = new orxonox::Core(argc, argv);
-        if (!this->core_->isLoaded())
-        {
-            COUT(0) << "Core was not fully loaded, probably an exception occurred during consruction. Aborting" << std::endl;
-            abort();
-        }
+        this->core_ = new orxonox::Core();
+        this->gameClock_ = this->core_->initialise(argc, argv);
     }
 
@@ -142 +138 @@
         root.addChild(&dedicated);
 
-
-        // start global orxonox time
-        Clock clock;
-
         root.activate();
 
@@ -153 +145 @@
         while (!this->abort_)
         {
-            clock.capture();
+            this->gameClock_->capture();
 
-            root.tick(clock);
+            root.tick(*this->gameClock_);
 
             if (root.stateRequest_ != "")

code/branches/gui/src/orxonox/Game.h

@@ -61 +61 @@
 
         Core* core_;
+        Clock* gameClock_;
 
         bool abort_;

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

@@ -61 +61 @@
         GSLevel::enter();
 
-        // TODO: Get Clock from Game or GameStateManager, but with 0 delta time
-        client_->update(Clock());
+        client_->update(Core::getGameClock());
     }