Changeset 1878 for code/trunk/src/core/input/SimpleInputState.cc

Timestamp:

Oct 3, 2008, 1:26:48 PM (17 years ago)

Author:

rgrieder

Message:

Fixed two issues with input:

• Buffer gets cleared now when the window focus changes
• Added a configValue in the InGameConsole:

Until now the input was always transparent to the level when activating the console (exception keyboard input of course)
bHidesAllInput_ can change that setting (configured in orxonox.ini)

@Oli: Sorry, couldn't apply the patch in the network branch because of conflicts (I have already made some changes to the InputManager in the trunk)

File:

• code/trunk/src/core/input/SimpleInputState.cc (modified) (5 diffs)

code/trunk/src/core/input/SimpleInputState.cc

@@ -184 +184 @@
     }
 
-    void SimpleInputState::removeAndDestroyAllHandlers()
-    {
-        for (std::vector<InputTickable*>::iterator it = allHandlers_.begin();
-            it != allHandlers_.end(); ++it)
-            delete *it;
-
-        allHandlers_.clear();
-        keyHandler_ = 0;
-        mouseHandler_ = 0;
-        joyStickHandlerAll_ = 0;
-        for (unsigned int iJoyStick = 0; iJoyStick < joyStickHandler_.size(); ++iJoyStick)
-            joyStickHandler_[iJoyStick] = 0;
-
-        update();
-    }
+    //void SimpleInputState::removeAndDestroyAllHandlers()
+    //{
+    //    for (std::vector<InputHandler*>::iterator it = allHandlers_.begin();
+    //        it != allHandlers_.end(); ++it)
+    //        delete *it;
+
+    //    allHandlers_.clear();
+    //    keyHandler_ = 0;
+    //    mouseHandler_ = 0;
+    //    joyStickHandlerAll_ = 0;
+    //    for (unsigned int iJoyStick = 0; iJoyStick < joyStickHandler_.size(); ++iJoyStick)
+    //        joyStickHandler_[iJoyStick] = 0;
+
+    //    update();
+    //}
 
     /**
@@ -208 +208 @@
         True if added, false if handler already existed.
     */
-    bool SimpleInputState::setHandler(InputTickable* handler)
+    bool SimpleInputState::setHandler(InputHandler* handler)
     {
         setKeyHandler(dynamic_cast<KeyHandler*>(handler));
@@ -247 +247 @@
     {
         // we can use a set to have a list of unique pointers (an object can implement all 3 handlers)
-        std::set<InputTickable*> tempSet;
+        std::set<InputHandler*> tempSet;
         if (keyHandler_)
             tempSet.insert(keyHandler_);
@@ -258 +258 @@
         // copy the content of the map back to the actual vector
         allHandlers_.clear();
-        for (std::set<InputTickable*>::const_iterator itHandler = tempSet.begin();
+        for (std::set<InputHandler*>::const_iterator itHandler = tempSet.begin();
             itHandler != tempSet.end(); itHandler++)
             allHandlers_.push_back(*itHandler);
@@ -267 +267 @@
         for (unsigned int i = 0; i < joyStickHandler_.size(); ++i)
             setInputDeviceEnabled(2 + i, (joyStickHandler_[i] != 0));
+
+        // inform InputManager that there might be changes in EMPTY_HANDLER situation
+        bHandlersChanged_ = true;
     }
 }