Changeset 1642 for code/branches/gui/src/orxonox/Orxonox.cc

Timestamp:

Jul 23, 2008, 3:37:29 PM (16 years ago)

Author:

rgrieder

Message:

• changed the static interface of the InputManager to a member one with getInstance()
• converted InputManager and InGameConsole to Ogre Singletons (c'tor and d'tor public, but assert in c'tor to prevent multiple instances at runtime)
• added toluabind_orxonox files to tolua folder that contains a pimped version of tolua (I'll write a little cmake project soon to automate it; Currently that only works with msvc)
• commented out Loader::unload() from Orxonox destructor because that deleted the ParticleSpawners, which were using a method of a sceneNode that belonged to a already destroyed SpaceShip. —> Results in a memory leak. Previously Loader::unload() was called for all BaseObjects (now calling unload(level_)). And since 'P' from ParticleSpawner comes before 'S' like SpaceShip, the order was correct.
• Added factory feature for InputStates (can now be created by string if there is Factory entry for it)
• Created factory entries for SimpleInputState and ExtendedInputState

File:

• code/branches/gui/src/orxonox/Orxonox.cc (modified) (7 diffs)

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

@@ -104 +104 @@
    */
   Orxonox::Orxonox()
-    : ogre_(0)
-    , startLevel_(0)
+    : startLevel_(0)
     , hud_(0)
-    , radar_(0)
     //, auMan_(0)
     , timer_(0)
@@ -114 +112 @@
     , mode_(GameMode::GM_Unspecified)
     , debugRefreshTime_(0.0f)
+    , ogre_(0)
+    , inputManager_(0)
+    , radar_(0)
   {
     RegisterRootObject(Orxonox);
 
-    assert(singletonRef_s == 0);
+    //assert(singletonRef_s == 0);
+    OrxAssert(singletonRef_s == 0, "asdfasdfasdfasdfblahblah");
     singletonRef_s = this;
   }
@@ -127 +129 @@
   {
     // keep in mind: the order of deletion is very important!
-    Loader::unload();
+    if (this->timer_)
+      delete this->timer_;
+
+    Loader::unload(startLevel_);
     if (this->startLevel_)
       delete this->startLevel_;
@@ -138 +143 @@
       delete this->radar_;
 
-    Loader::close();
     //if (this->auMan_)
     //  delete this->auMan_;
-    InGameConsole::getInstance().destroy();
-    if (this->timer_)
-      delete this->timer_;
-    InputManager::destroy();
+
+    if (this->console_)
+      delete this->console_;
+
+    if (inputManager_)
+      delete inputManager_;
 
     if (this->ogre_)
@@ -153 +159 @@
     if (server_g)
       delete network::Server::getSingleton();
+
+    // this call will delete every BaseObject!
+    // But currently this will call methods of objects that exist no more
+    // The only 'memory leak' is the ParticleSpawer. They would be deleted here
+    // and call a sceneNode method that has already been destroy by the corresponding space ship.
+    //Loader::close();
 
     singletonRef_s = 0;
@@ -247 +259 @@
           // Calls the InputManager which sets up the input devices.
           // The render window width and height are used to set up the mouse movement.
-          InputManager::initialise(ogre_->getWindowHandle(),
+          inputManager_ = new InputManager();
+          inputManager_->initialise(ogre_->getWindowHandle(),
                 ogre_->getWindowWidth(), ogre_->getWindowHeight(), true, true, true);
           KeyBinder* keyBinder = new KeyBinder();
           keyBinder->loadBindings();
-          InputManager::createSimpleInputState("game", 20)->setHandler(keyBinder);
+          inputManager_->createSimpleInputState("game", 20)->setHandler(keyBinder);
 
           // Load the InGameConsole
-          InGameConsole::getInstance().initialise();
+          console_ = new InGameConsole();
+          console_->initialise();
 
           // load the CEGUI interface
@@ -342 +356 @@
       if (success)
       {
-        InputManager::requestEnterState("game");
+        InputManager::getInstance().requestEnterState("game");
         this->mode_ = mode;
       }