Changeset 1878 for code/trunk/src/core/input/InputManager.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/InputManager.cc (modified) (6 diffs)

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

@@ -65 +65 @@
 
     std::string InputManager::bindingCommmandString_s = "";
+    EmptyHandler InputManager::EMPTY_HANDLER;
     InputManager* InputManager::singletonRef_s = 0;
 
@@ -189 +190 @@
 
             stateEmpty_ = createInputState<SimpleInputState>("empty", -1);
-            stateEmpty_->setHandler(new EmptyHandler());
+            stateEmpty_->setHandler(&EMPTY_HANDLER);
             activeStates_[stateEmpty_->getPriority()] = stateEmpty_;
 
@@ -198 +199 @@
 
             stateCalibrator_ = createInputState<SimpleInputState>("calibrator", 100);
-            stateCalibrator_->setHandler(new EmptyHandler());
+            stateCalibrator_->setHandler(&EMPTY_HANDLER);
             InputBuffer* buffer = new InputBuffer();
             buffer->registerListener(this, &InputManager::_completeCalibration, '\r', true);
@@ -430 +431 @@
 
                 // clear our own states
-                stateEmpty_->removeAndDestroyAllHandlers();
-                stateCalibrator_->removeAndDestroyAllHandlers();
-                stateDetector_->removeAndDestroyAllHandlers();
+                //stateEmpty_->removeAndDestroyAllHandlers();
+                //stateCalibrator_->removeAndDestroyAllHandlers();
+                //stateDetector_->removeAndDestroyAllHandlers();
+                // TODO: Memory Leak when not deleting the handlers!!!
 
                 // kick all active states 'nicely'
@@ -680 +682 @@
         }
         stateDestroyRequests_.clear();
+
+        // check whether a state has changed its EMPTY_HANDLER situation
+        bool bUpdateRequired = false;
+        for (std::map<int, InputState*>::iterator it = activeStates_.begin(); it != activeStates_.end(); ++it)
+        {
+            if (it->second->handlersChanged())
+            {
+                it->second->resetHandlersChanged();
+                bUpdateRequired = true;
+            }
+        }
+        if (bUpdateRequired)
+            _updateActiveStates();
 
         // mark that we capture and distribute input
@@ -826 +841 @@
         requestLeaveState("calibrator");
         bCalibrating_ = false;
+    }
+
+    void InputManager::clearBuffers()
+    {
+        this->keysDown_.clear();
+        this->mouseButtonsDown_.clear();
+        for (unsigned int i = 0; i < this->joySticksSize_; ++i)
+            this->joyStickButtonsDown_[i].clear();
     }