Changeset 2927 for code/trunk/src

Timestamp:

Apr 19, 2009, 10:59:59 PM (16 years ago)

Author:

rgrieder

Message:

Fixed three memory leaks and a bug.
@beni: Is deleting the "startGame" console command a problem or did we just forget to remove the comment characters?

Location:

code/trunk/src

Files:

• core/Game.cc (modified) (4 diffs)
• core/Game.h (modified) (2 diffs)
• orxonox/Main.cc (modified) (1 diff)
• orxonox/gamestates/GSMainMenu.cc (modified) (2 diffs)
• orxonox/gui/GUIManager.cc (modified) (1 diff)

code/trunk/src/core/Game.cc

@@ -106 +106 @@
         delete this->core_;
 
-        // Delete all GameStates created by the macros
-        for (std::map<std::string, GameState*>::const_iterator it = allStates_s.begin(); it != allStates_s.end(); ++it)
-            delete it->second;
+        // Delete all the created nodes
+        for (std::vector<GameStateTreeNode*>::const_iterator it = this->allStateNodes_.begin(); it != this->allStateNodes_.end(); ++it)
+            delete *it;
 
         delete this->gameClock_;
@@ -320 +320 @@
                     ThrowException(GameState, "No two root GameStates are allowed!");
                 GameStateTreeNode* newNode = new GameStateTreeNode;
+                this->allStateNodes_.push_back(newNode);
                 newNode->state_ = newState;
                 newNode->parent_ = 0;
@@ -328 +329 @@
             {
                 GameStateTreeNode* newNode = new GameStateTreeNode;
+                this->allStateNodes_.push_back(newNode);
                 newNode->state_ = newState;
                 if (newLevel < currentLevel)
@@ -391 +393 @@
         return true;
     }
+
+    /*static*/ void Game::destroyStates()
+    {
+        // Delete all GameStates created by the macros
+        for (std::map<std::string, GameState*>::const_iterator it = allStates_s.begin(); it != allStates_s.end(); ++it)
+            delete it->second;
+        allStates_s.clear();
+    }
 }

code/trunk/src/core/Game.h

@@ -77 +77 @@
 
         static bool addGameState(GameState* state);
+        static void destroyStates();
         static Game& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
@@ -95 +96 @@
         GameStateTreeNode*              activeStateNode_;
         std::vector<GameStateTreeNode*> requestedStateNodes_;
+        std::vector<GameStateTreeNode*> allStateNodes_;
 
         Core*                           core_;

code/trunk/src/orxonox/Main.cc

@@ -69 +69 @@
 
         orxonox.run();
+
+        // destroy the GameStates created pre-mainly
+        orxonox::Game::destroyStates();
     } // orxonox gets destroyed right here!
 

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -86 +86 @@
         InputManager::getInstance().requestDestroyState("mainMenu");
 
-/*
+        GUIManager::getInstance().setCamera(0);
+        GraphicsManager::getInstance().setCamera(0);
+        this->scene_->getSceneManager()->destroyCamera(this->camera_);
+        delete this->scene_;
+
         if (this->ccStartGame_)
         {
@@ -92 +96 @@
             this->ccStartGame_ = 0;
         }
-*/
     }
 

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -252 +252 @@
     void GUIManager::setCamera(Ogre::Camera* camera)
     {
-        this->guiRenderer_->setTargetSceneManager(camera->getSceneManager());
+        if (camera == NULL)
+            this->guiRenderer_->setTargetSceneManager(0);
+        else
+            this->guiRenderer_->setTargetSceneManager(camera->getSceneManager());
     }