Changeset 3247 for code/branches/core4/src/core/Game.cc

Timestamp:

Jun 29, 2009, 2:01:51 PM (16 years ago)

Author:

rgrieder

Message:

Removed OrxonoxClass inheritance from Game and Core: this allows the Core class to deal with everything core-related, including identifier destruction.
Instead I moved the config-values to CoreConfiguration and GameConfiguration which in turn are member variables (as pointers).
Also handled exceptions better: Game or Core must not fail to initialise, otherwise orxonox will not start. This now gets displayed properly.

File:

• code/branches/core4/src/core/Game.cc (modified) (8 diffs)

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

@@ -58 +58 @@
     SetConsoleCommandShortcutExternAlias(stop_game, "exit");
 
-    struct _CoreExport GameStateTreeNode
+    std::map<std::string, Game::GameStateInfo> Game::gameStateDeclarations_s;
+    Game* Game::singletonRef_s = 0;
+
+
+    /**
+    @brief
+        Represents one node of the game state tree.
+    */
+    struct GameStateTreeNode
     {
         GameState* state_;
@@ -65 +73 @@
     };
 
-    std::map<std::string, Game::GameStateInfo> Game::gameStateDeclarations_s;
-    Game* Game::singletonRef_s = 0;
+
+    /**
+    @brief
+        Another helper class for the Game singleton: we cannot derive
+        Game from OrxonoxClass because we need to handle the Identifier
+        destruction in the Core destructor.
+    */
+    class GameConfiguration : public OrxonoxClass
+    {
+    public:
+        GameConfiguration()
+        {
+            RegisterRootObject(GameConfiguration);
+            this->setConfigValues();
+        }
+
+        void setConfigValues()
+        {
+            SetConfigValue(statisticsRefreshCycle_, 250000)
+                .description("Sets the time in microseconds interval at which average fps, etc. get updated.");
+            SetConfigValue(statisticsAvgLength_, 1000000)
+                .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
+        }
+
+        unsigned int statisticsRefreshCycle_;
+        unsigned int statisticsAvgLength_;
+    };
+
 
     /**
@@ -99 +133 @@
 
         // Create the Core
-        this->core_ = new orxonox::Core();
-        this->core_->initialise(argc, argv);
+        this->core_ = new Core(argc, argv);
 
         // After the core has been created, we can safely instantiate the GameStates
@@ -118 +151 @@
         this->activeStates_.push_back(this->rootStateNode_->state_);
 
-        // Do this after Core creation!
-        RegisterRootObject(Game);
-        this->setConfigValues();
+        // Do this after the Core creation!
+        this->configuration_ = new GameConfiguration();
     }
 
@@ -128 +160 @@
     Game::~Game()
     {
+        // Destroy the configuration helper class instance
+        delete this->configuration_;
+
         // Destroy the GameStates (note that the nodes still point to them, but doesn't matter)
         for (std::map<std::string, GameState*>::const_iterator it = gameStates_.begin();
@@ -137 +172 @@
         delete this->gameClock_;
 
-        // Also, take care of the GameStateFactories
+        // Take care of the GameStateFactories
         GameStateFactory::destroyFactories();
 
         // Don't assign singletonRef_s with NULL! Recreation is not supported
-    }
-
-    void Game::setConfigValues()
-    {
-        SetConfigValue(statisticsRefreshCycle_, 250000)
-            .description("Sets the time in microseconds interval at which average fps, etc. get updated.");
-        SetConfigValue(statisticsAvgLength_, 1000000)
-            .description("Sets the time in microseconds interval at which average fps, etc. gets calculated.");
     }
 
@@ -245 +272 @@
 
             // STATISTICS
-            if (this->periodTime_ > statisticsRefreshCycle_)
+            if (this->periodTime_ > this->configuration_->statisticsRefreshCycle_)
             {
                 std::list<StatisticsTickInfo>::iterator it = this->statisticsTickTimes_.begin();
                 assert(it != this->statisticsTickTimes_.end());
-                int64_t lastTime = currentTime - this->statisticsAvgLength_;
+                int64_t lastTime = currentTime - this->configuration_->statisticsAvgLength_;
                 if ((int64_t)it->tickTime < lastTime)
                 {
@@ -266 +293 @@
                 this->avgTickTime_ = static_cast<float>(this->periodTickTime_) / framesPerPeriod / 1000.0f;
 
-                this->periodTime_ -= this->statisticsRefreshCycle_;
+                this->periodTime_ -= this->configuration_->statisticsRefreshCycle_;
             }
         }