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

Timestamp:

Oct 3, 2008, 1:26:48 PM (16 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/ExtendedInputState.cc (modified) (6 diffs)

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

@@ -366 +366 @@
     void ExtendedInputState::removeAndDestroyAllHandlers()
     {
-        for (std::vector<InputTickable*>::iterator it = allHandlers_.begin();
+        for (std::vector<InputHandler*>::iterator it = allHandlers_.begin();
             it != allHandlers_.end(); ++it)
             delete *it;
@@ -387 +387 @@
         True if added, false if handler already existed.
     */
-    bool ExtendedInputState::addHandler(InputTickable* handler)
+    bool ExtendedInputState::addHandler(InputHandler* handler)
     {
         bool success = false;
@@ -406 +406 @@
         True if removal was successful, false if handler was not found.
     */
-    bool ExtendedInputState::removeHandler(InputTickable* handler)
+    bool ExtendedInputState::removeHandler(InputHandler* handler)
     {
         bool success = false;
@@ -449 +449 @@
     {
         // 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;
         for (unsigned int iHandler = 0; iHandler < keyHandlers_.size(); iHandler++)
             tempSet.insert(keyHandlers_[iHandler]);
@@ -460 +460 @@
         // 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);
@@ -469 +469 @@
         for (unsigned int i = 0; i < joyStickHandlers_.size(); ++i)
             setInputDeviceEnabled(2 + i, (joyStickHandlers_[i].size() != 0));
+
+        this->bHandlersChanged_ = true;
     }
 }