Changeset 1788 for code/trunk

Timestamp:

Sep 15, 2008, 12:40:40 PM (16 years ago)

Author:

rgrieder

Message:

Added a master InputState that is always active (except of course in game state 'ioConsole' when there is no InputManager in the first place)
This is necessary to call the console whenever you like. The state is of 'extended' nature, so it can hold an arbitrary number of Handlers.
The KeyBinder however is not yet configured to manage multiple keybindings.ini —> next job

Location:

code/trunk/src

Files:

• core/input/InputManager.cc (modified) (14 diffs)
• core/input/InputManager.h (modified) (2 diffs)
• orxonox/gamestates/GSGraphics.cc (modified) (4 diffs)
• orxonox/gamestates/GSGraphics.h (modified) (1 diff)

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

@@ -109 +109 @@
         , stateCalibrator_(0)
         , stateEmpty_(0)
+        , stateMaster_(0)
         , bCalibrating_(false)
         , keyboardModifiers_(0)
@@ -201 +202 @@
             buffer->registerListener(this, &InputManager::_completeCalibration, '\r', true);
             stateCalibrator_->setKeyHandler(buffer);
+
+            stateMaster_ = new ExtendedInputState();
+            stateMaster_->setName("master");
 
             internalState_ |= InternalsReady;
@@ -441 +445 @@
                     _destroyState((*inputStatesByPriority_.rbegin()).second);
 
+                // destroy the master input state. This might trigger a memory leak
+                // because the user has forgotten to destroy the KeyBinder or any Handler!
+                delete stateMaster_;
+
                 // destroy the devices
                 _destroyKeyboard();
@@ -688 +696 @@
             // call all the handlers for the held key events
             for (unsigned int iKey = 0; iKey < keysDown_.size(); iKey++)
-                activeStatesTop_[Keyboard]->keyHeld(KeyEvent(keysDown_[iKey], keyboardModifiers_));
+            {
+                KeyEvent kEvt(keysDown_[iKey], keyboardModifiers_);
+                activeStatesTop_[Keyboard]->keyHeld(kEvt);
+                stateMaster_->keyHeld(kEvt);
+            }
 
             // call all the handlers for the held mouse button events
             for (unsigned int iButton = 0; iButton < mouseButtonsDown_.size(); iButton++)
+            {
                 activeStatesTop_[Mouse]->mouseButtonHeld(mouseButtonsDown_[iButton]);
+                stateMaster_->mouseButtonHeld(mouseButtonsDown_[iButton]);
+            }
 
             // call all the handlers for the held joy stick button events
             for (unsigned int iJoyStick  = 0; iJoyStick < joySticksSize_; iJoyStick++)
                 for (unsigned int iButton   = 0; iButton   < joyStickButtonsDown_[iJoyStick].size(); iButton++)
+                {
                     activeStatesTop_[JoyStick0 + iJoyStick]
                         ->joyStickButtonHeld(iJoyStick, joyStickButtonsDown_[iJoyStick][iButton]);
+                    stateMaster_->joyStickButtonHeld(iJoyStick, joyStickButtonsDown_[iJoyStick][iButton]);
+                }
 
             // tick the handlers for each active handler
             for (unsigned int i = 0; i < devicesNum_; ++i)
+            {
                 activeStatesTop_[i]->tickInput(dt, i);
+                if (stateMaster_->isInputDeviceEnabled(i))
+                    stateMaster_->tickInput(dt, i);
+            }
 
             // tick the handler with a general tick afterwards
             for (unsigned int i = 0; i < activeStatesTicked_.size(); ++i)
                 activeStatesTicked_[i]->tickInput(dt);
+            stateMaster_->tickInput(dt);
         }
 
@@ -828 +851 @@
             keysDown_.push_back(Key(e));
         else
+        {
+            // This happens when XAutoRepeat is set under linux. The KeyPressed event gets then sent
+            // continuously.
             return true;
+        }
 
         // update modifiers
@@ -838 +865 @@
             keyboardModifiers_ |= KeyboardModifier::Shift; // shift key
 
-        activeStatesTop_[Keyboard]->keyPressed(KeyEvent(e, keyboardModifiers_));
+        KeyEvent kEvt(e, keyboardModifiers_);
+        activeStatesTop_[Keyboard]->keyPressed(kEvt);
+        stateMaster_->keyPressed(kEvt);
 
         return true;
@@ -869 +898 @@
             keyboardModifiers_ &= ~KeyboardModifier::Shift; // shift key
 
-        activeStatesTop_[Keyboard]->keyReleased(KeyEvent(e, keyboardModifiers_));
+        KeyEvent kEvt(e, keyboardModifiers_);
+        activeStatesTop_[Keyboard]->keyReleased(kEvt);
+        stateMaster_->keyReleased(kEvt);
 
         return true;
@@ -888 +919 @@
         if (e.state.X.rel != 0 || e.state.Y.rel != 0)
         {
-            activeStatesTop_[Mouse]->mouseMoved(IntVector2(e.state.X.abs, e.state.Y.abs),
-                    IntVector2(e.state.X.rel, e.state.Y.rel), IntVector2(e.state.width, e.state.height));
+            IntVector2 abs(e.state.X.abs, e.state.Y.abs);
+            IntVector2 rel(e.state.X.rel, e.state.Y.rel);
+            IntVector2 clippingSize(e.state.width, e.state.height);
+            activeStatesTop_[Mouse]->mouseMoved(abs, rel, clippingSize);
+            stateMaster_->mouseMoved(abs, rel, clippingSize);
         }
 
@@ -896 +930 @@
         {
             activeStatesTop_[Mouse]->mouseScrolled(e.state.Z.abs, e.state.Z.rel);
+            stateMaster_->mouseScrolled(e.state.Z.abs, e.state.Z.rel);
         }
 
@@ -919 +954 @@
 
         activeStatesTop_[Mouse]->mouseButtonPressed((MouseButton::Enum)id);
+        stateMaster_->mouseButtonPressed((MouseButton::Enum)id);
 
         return true;
@@ -944 +980 @@
 
         activeStatesTop_[Mouse]->mouseButtonReleased((MouseButton::Enum)id);
+        stateMaster_->mouseButtonReleased((MouseButton::Enum)id);
 
         return true;
@@ -980 +1017 @@
 
         activeStatesTop_[2 + iJoyStick]->joyStickButtonPressed(iJoyStick, (JoyStickButton::Enum)button);
+        stateMaster_->joyStickButtonPressed(iJoyStick, (JoyStickButton::Enum)button);
 
         return true;
@@ -1000 +1038 @@
 
         activeStatesTop_[2 + iJoyStick]->joyStickButtonReleased(iJoyStick, (JoyStickButton::Enum)button);
+        stateMaster_->joyStickButtonReleased(iJoyStick, (JoyStickButton::Enum)button);
 
         return true;
@@ -1027 +1066 @@
 
             activeStatesTop_[2 + iJoyStick]->joyStickAxisMoved(iJoyStick, axis, fValue);
+            stateMaster_->joyStickAxisMoved(iJoyStick, axis, fValue);
         }
     }

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

@@ -129 +129 @@
         InputState* getState       (const std::string& name);
         InputState* getCurrentState();
+        ExtendedInputState* getMasterInputState() { return this->stateMaster_; }
         bool requestDestroyState   (const std::string& name);
         bool requestEnterState     (const std::string& name);
@@ -200 +201 @@
         SimpleInputState*                   stateCalibrator_;
         SimpleInputState*                   stateEmpty_;
+        ExtendedInputState*                 stateMaster_;          //!< Always active master input state
 
         std::map<std::string, InputState*>  inputStatesByName_;

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -46 +46 @@
 #include "core/CoreIncludes.h"
 #include "core/input/InputManager.h"
+#include "core/input/KeyBinder.h"
+#include "core/input/ExtendedInputState.h"
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
@@ -62 +64 @@
         , console_(0)
         , guiManager_(0)
+        , masterKeyBinder_(0)
         , frameCount_(0)
         , statisticsRefreshCycle_(0)
@@ -108 +111 @@
         this->renderWindow_->getCustomAttribute("WINDOW", &windowHnd);
         inputManager_->initialise(windowHnd, renderWindow_->getWidth(), renderWindow_->getHeight(), true);
+        // Configure master input state with a KeyBinder
+        //masterKeyBinder_ = new KeyBinder();
+        //inputManager_->getMasterInputState()->addKeyHandler(masterKeyBinder_);
 
         // Load the InGameConsole
@@ -135 +141 @@
         delete this->console_;
 
+        //inputManager_->getMasterInputState()->removeKeyHandler(this->masterKeyBinder_);
+        //delete this->masterKeyBinder_;
         delete this->inputManager_;
 

code/trunk/src/orxonox/gamestates/GSGraphics.h

@@ -77 +77 @@
         GUIManager*           guiManager_;
 
+        KeyBinder*            masterKeyBinder_;
+
         // variables for time statistics
         unsigned long         frameCount_;