Changeset 1646 for code/branches/gui/src

Timestamp:

Jul 24, 2008, 10:40:22 PM (17 years ago)

Author:

rgrieder

Message:

• privatised InputState c'tors
• added destruction code for GUIManager
• fixed some issues and bugs
• found 2400 memory leaks
• haven't done anything about it
• converted GUIManager to Ogre Singleton
• added NULL checkers in Loader

Location:

code/branches/gui/src

Files:

• core/Loader.cc (modified) (4 diffs)
• core/input/ExtendedInputState.h (modified) (2 diffs)
• core/input/InputManager.cc (modified) (4 diffs)
• core/input/InputState.h (modified) (2 diffs)
• core/input/SimpleInputState.h (modified) (2 diffs)
• orxonox/Orxonox.cc (modified) (3 diffs)
• orxonox/Orxonox.h (modified) (1 diff)
• orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• orxonox/gui/GUIManager.cc (modified) (4 diffs)
• orxonox/gui/GUIManager.h (modified) (5 diffs)

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

@@ -64 +64 @@
     void Loader::add(const Level* level, const ClassTreeMask& mask)
     {
+        if (!level)
+            return;
         Loader::levels_s.insert(Loader::levels_s.end(), std::pair<const Level*, ClassTreeMask>(level, mask));
     }
@@ -69 +71 @@
     void Loader::remove(const Level* level)
     {
+        if (!level)
+            return;
         for (std::vector<std::pair<const Level*, ClassTreeMask> >::iterator it = Loader::levels_s.begin(); it != Loader::levels_s.end(); ++it)
         {
@@ -108 +112 @@
     bool Loader::load(const Level* level, const ClassTreeMask& mask)
     {
+        if (!level)
+            return false;
+
         Loader::currentMask_s = level->getMask() * mask;
 
@@ -165 +172 @@
     void Loader::unload(const Level* level, const ClassTreeMask& mask)
     {
+        if (!level)
+            return;
         for (Iterator<BaseObject> it = ObjectList<BaseObject>::begin(); it; )
         {

code/branches/gui/src/core/input/ExtendedInputState.h

@@ -47 +47 @@
     class _CoreExport ExtendedInputState : public InputState
     {
+        friend class InputManager;
+        friend class ClassFactory<ExtendedInputState>;
+
     public:
-        ExtendedInputState();
-        ~ExtendedInputState() { }
-
         bool addKeyHandler        (KeyHandler* handler);
         bool removeKeyHandler     (KeyHandler* handler);
@@ -68 +68 @@
 
     private:
+        ExtendedInputState();
+        ~ExtendedInputState() { }
+
         void tickInput(float dt);
         void tickInput(float dt, unsigned int device);

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

@@ -429 +429 @@
                     (*rit).second->onLeave();
                 }
-                activeStates_.clear();
-                _updateActiveStates();
+                //activeStates_.clear();
+                //_updateActiveStates();
 
                 // destroy all input states
@@ -438 +438 @@
                 }
 
-                stateEmpty_ = 0;
-                stateCalibrator_ = 0;
-                stateDetector_ = 0;
+                //stateEmpty_ = 0;
+                //stateCalibrator_ = 0;
+                //stateDetector_ = 0;
 
                 // destroy the devices
@@ -448 +448 @@
 
                 // 0 joy sticks now
-                _redimensionLists();
+                //_redimensionLists();
 
                 OIS::InputManager::destroyInputSystem(inputSystem_);
-                inputSystem_ = 0;
+                //inputSystem_ = 0;
 
                 CCOUT(3) << "Destroying done." << std::endl;
@@ -509 +509 @@
     {
         assert(state);
+        std::map<int, InputState*>::iterator it = this->activeStates_.find(state->getPriority());
+        if (it != this->activeStates_.end())
+        {
+            this->activeStates_.erase(it);
+            _updateActiveStates();
+        }
         inputStatesByPriority_.erase(state->getPriority());
         inputStatesByName_.erase(state->getName());

code/branches/gui/src/core/input/InputState.h

@@ -51 +51 @@
 
     public:
-        InputState() : priority_(0), executorOnEnter_(0), executorOnLeave_(0)
-        { RegisterObject(InputState); }
-        virtual ~InputState() { }
-
         const std::string& getName() const { return name_; }
         int getPriority()            const { return priority_; }
@@ -93 +89 @@
 
     protected:
+        InputState() : priority_(0), executorOnEnter_(0), executorOnLeave_(0)
+        { RegisterObject(InputState); }
+        virtual ~InputState() { }
+
         virtual void numberOfJoySticksChanged(unsigned int n) = 0;
         void setInputDeviceEnabled(unsigned int device, bool bEnabled)

code/branches/gui/src/core/input/SimpleInputState.h

@@ -45 +45 @@
     class _CoreExport SimpleInputState : public InputState
     {
+        friend class InputManager;
+        friend class ClassFactory<SimpleInputState>;
+
     public:
-        SimpleInputState();
-        ~SimpleInputState() { }
-
         void setKeyHandler        (KeyHandler* handler) { keyHandler_ = handler; update(); }
         void setMouseHandler      (MouseHandler* handler) { mouseHandler_ = handler; update(); }
@@ -57 +57 @@
 
     private:
+        SimpleInputState();
+        ~SimpleInputState() { }
+
         void tickInput(float dt);
         void tickInput(float dt, unsigned int device);

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

@@ -115 +115 @@
     , inputManager_(0)
     , radar_(0)
+    , console_(0)
+    , guiManager_(0)
   {
     RegisterRootObject(Orxonox);
@@ -142 +144 @@
     if (this->radar_)
       delete this->radar_;
+
+    if (this->guiManager_)
+      delete guiManager_;
 
     //if (this->auMan_)
@@ -271 +276 @@
 
           // load the CEGUI interface
-          GUIManager::getInstance().initialise();
+          guiManager_ = new GUIManager();
+          guiManager_->initialise();
         }
 

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

@@ -103 +103 @@
       Radar*                radar_;         //!< represents the Radar (not the HUD part)
       InGameConsole*        console_;
+      GUIManager*           guiManager_;
 
       static Orxonox *singletonRef_s;

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

@@ -118 +118 @@
     class OverlayGroup;
     class OverlayText;
+
+    //gui
+    class GUIManager;
 }
 

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

@@ -58 +58 @@
     SetConsoleCommandShortcut(GUIManager, showGUI_s).setKeybindMode(KeybindMode::OnPress);
 
+    GUIManager* GUIManager::singletonRef_s = 0;
+
     GUIManager::GUIManager()
         //: emptySceneManager_(0)
@@ -71 +73 @@
         , state_(Uninitialised)
     {
+        assert(singletonRef_s == 0);
+        singletonRef_s = this;
     }
 
     GUIManager::~GUIManager()
     {
-        // TODO: destruct at least something
+        if (backgroundCamera_)
+            backgroundSceneManager_->destroyCamera(backgroundCamera_);
+
+        if (backgroundSceneManager_)
+            Ogre::Root::getSingleton().destroySceneManager(backgroundSceneManager_);
+
+        InputManager::getInstance().destroyState("gui");
+
+        if (guiSystem_)
+            delete guiSystem_;
+
+        if (scriptModule_)
+        {
+            // destroy our own tolua interfaces
+                //lua_pushnil(luaState_);
+                //lua_setglobal(luaState_, "Orxonox");
+                //lua_pushnil(luaState_);
+                //lua_setglobal(luaState_, "Core");
+            // TODO: deleting the script module fails an assertation.
+            // However there is not much we can do about it since it occurs too when
+            // we don't open Core or Orxonox. Might be a CEGUI issue.
+            // The memory leak is not a problem anyway..
+            //delete scriptModule_;
+        }
+
+        if (guiRenderer_)
+            delete guiRenderer_;
+
+        singletonRef_s = 0;
     }
 
@@ -104 +136 @@
                 // setup scripting
                 this->scriptModule_ = new LuaScriptModule();
+                this->luaState_ = this->scriptModule_->getLuaState();
 
                 // create the CEGUI system singleton
@@ -267 +300 @@
 
 
-    /**
-    @brief
-        Returns a unique instance of GUIManager.
-    @return
-        The instance
-    */
-    GUIManager& GUIManager::getInstance()
-    {
-        static GUIManager instance;
-        return instance;
-    }
-
     inline CEGUI::MouseButton GUIManager::convertButton(MouseButton::Enum button)
     {

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

@@ -48 +48 @@
     class LuaScriptModule;
 }
+struct lua_State;
 
 namespace orxonox // tolua_export
@@ -68 +69 @@
         };
 
+        GUIManager();
+        ~GUIManager();
+
         bool initialise();
         void tick(float dt);
@@ -75 +79 @@
         Ogre::Camera* getCamera() { return this->backgroundCamera_; }
 
-        static GUIManager& getInstance(); // tolua_export
         static void showGUI_s(const std::string& name, Ogre::SceneManager* sceneManager)//bool showBackground)
         {
@@ -81 +84 @@
         }
 
+        static GUIManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; } // tolua_export
+        static GUIManager* getInstancePtr() { return singletonRef_s; }
+
     private:
-        GUIManager();
         GUIManager(const GUIManager& instance);
-        ~GUIManager();
 
         void keyPressed (const KeyEvent& evt)
@@ -119 +123 @@
         CEGUI::System*            guiSystem_;
         CEGUI::Imageset*          backgroundImage_;
+        lua_State*                luaState_;
 
         State state_;
 
+        static CEGUI::MouseButton convertButton(MouseButton::Enum button);
 
-        static CEGUI::MouseButton convertButton(MouseButton::Enum button);
+        static GUIManager*        singletonRef_s;
     }; // tolua_export