Changeset 1646 for code/branches/gui/src/core/input/InputManager.cc

Timestamp:

Jul 24, 2008, 10:40:22 PM (16 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

File:

• code/branches/gui/src/core/input/InputManager.cc (modified) (4 diffs)

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());