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

Timestamp:

Mar 25, 2009, 6:24:15 PM (16 years ago)

Author:

rgrieder

Message:

Moving game clock from Core to Game.
Other small fixes.

Location:

code/branches/gui/src/core

Files:

• Core.cc (modified) (3 diffs)
• Core.h (modified) (4 diffs)
• Game.cc (modified) (3 diffs)
• Game.h (modified) (1 diff)
• input/KeyBinder.cc (modified) (1 diff)

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

@@ -102 +102 @@
     }
 
-    Clock* Core::initialise(int argc, char** argv)
-    {
-        // Set up a basic clock to keep time
-        this->gameClock_ = new Clock();
-
+    void Core::initialise(int argc, char** argv)
+    {
         // Parse command line arguments fist
         try
@@ -175 +172 @@
         
         this->loaded_ = true;
-
-        // Return non const pointer to the game's clock for the main loop
-        return this->gameClock_;
     }
 
@@ -199 +193 @@
         // 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

@@ -45 +45 @@
 #include "util/OutputHandler.h"
 
-// Only allow main to access postMainInitialisation, so we need a forward declaration
-int main(int, char**);
 // boost::filesystem header has quite a large tail, use forward declaration
 namespace boost { namespace filesystem
@@ -64 +62 @@
             ~Core();
 
-            Clock* initialise(int argc, char** argv);
+            void initialise(int argc, char** argv);
             void setConfigValues();
 
@@ -75 +73 @@
             static const std::string& getLanguage();
             static void  resetLanguage();
-
-            static const Clock& getGameClock() { return *getInstance().gameClock_; }
 
             static void tsetMediaPath(const std::string& path)
@@ -123 +119 @@
             TclThreadManager*     tclThreadManager_;
 
-            Clock*                gameClock_;
-
             int softDebugLevel_;                            //!< The debug level
             int softDebugLevelConsole_;                     //!< The debug level for the console

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

@@ -86 +86 @@
         this->avgTickTime_ = 0.0f;
 
+
+        // Set up a basic clock to keep time
+        this->gameClock_ = new Clock();
+
         this->core_ = new orxonox::Core();
-        this->gameClock_ = this->core_->initialise(argc, argv);
+        this->core_->initialise(argc, argv);
 
         RegisterRootObject(Game);
@@ -104 +108 @@
         for (std::map<std::string, GameState*>::const_iterator it = allStates_s.begin(); it != allStates_s.end(); ++it)
             delete it->second;
+
+        delete this->gameClock_;
 
         assert(singletonRef_s);
@@ -158 +164 @@
 
             // UPDATE, bottom to top in the stack
+            this->core_->update(*this->gameClock_);
             for (std::vector<GameState*>::const_iterator it = this->activeStates_.begin();
                 it != this->activeStates_.end(); ++it)

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

@@ -68 +68 @@
         void popState();
 
+        const Clock& getGameClock() { return *this->gameClock_; }
+
         float getAvgTickTime() { return this->avgTickTime_; }
         float getAvgFPS()      { return this->avgFPS_; }

code/branches/gui/src/core/input/KeyBinder.cc

@@ -42 +42 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigFileManager.h"
-#include "core/Core.h"
 #include "InputCommands.h"
 #include "InputManager.h"