Changeset 2908 for code/branches/questsystem5/src/core/input

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/core/input/CalibratorCallback.h (modified) (1 diff)
• src/core/input/ExtendedInputState.cc (modified) (2 diffs)
• src/core/input/ExtendedInputState.h (modified) (1 diff)
• src/core/input/InputBuffer.cc (modified) (1 diff)
• src/core/input/InputBuffer.h (modified) (2 diffs)
• src/core/input/InputInterfaces.h (modified) (5 diffs)
• src/core/input/InputManager.cc (modified) (33 diffs)
• src/core/input/InputManager.h (modified) (7 diffs)
• src/core/input/InputState.h (modified) (3 diffs)
• src/core/input/KeyBinder.cc (modified) (4 diffs)
• src/core/input/KeyBinder.h (modified) (3 diffs)
• src/core/input/SimpleInputState.h (modified) (3 diffs)

code/branches/questsystem5/src/core/input/CalibratorCallback.h

@@ -52 +52 @@
         void keyHeld    (const KeyEvent& evt) { }
 
-        void updateInput(float dt) { }
+        void tickInput(float dt) { }
     };
 }

code/branches/questsystem5/src/core/input/ExtendedInputState.cc

@@ -402 +402 @@
     }
 
-    void ExtendedInputState::updateInput(float dt)
+    void ExtendedInputState::tickInput(float dt)
     {
         for (unsigned int i = 0; i < allHandlers_.size(); ++i)
         {
-            allHandlers_[i]->updateInput(dt);
-        }
-    }
-
-    void ExtendedInputState::updateInput(float dt, unsigned int device)
+            allHandlers_[i]->tickInput(dt);
+        }
+    }
+
+    void ExtendedInputState::tickInput(float dt, unsigned int device)
     {
         switch (device)
@@ -416 +416 @@
         case Keyboard:
             for (unsigned int i = 0; i < keyHandlers_.size(); ++i)
-                keyHandlers_[i]->updateKey(dt);
+                keyHandlers_[i]->tickKey(dt);
             break;
 
         case Mouse:
             for (unsigned int i = 0; i < mouseHandlers_.size(); ++i)
-                mouseHandlers_[i]->updateMouse(dt);
+                mouseHandlers_[i]->tickMouse(dt);
             break;
 
         default: // joy sticks
             for (unsigned int i = 0; i < joyStickHandlers_[device - 2].size(); ++i)
-                joyStickHandlers_[device - 2][i]->updateJoyStick(dt, device - 2);
+                joyStickHandlers_[device - 2][i]->tickJoyStick(dt, device - 2);
             break;
         }

code/branches/questsystem5/src/core/input/ExtendedInputState.h

@@ -68 +68 @@
         ~ExtendedInputState() { }
 
-        void updateInput(float dt);
-        void updateInput(float dt, unsigned int device);
+        void tickInput(float dt);
+        void tickInput(float dt, unsigned int device);
 
         void keyPressed (const KeyEvent& evt);

code/branches/questsystem5/src/core/input/InputBuffer.cc

@@ -224 +224 @@
 
     /**
-        @brief This update() function is called by the InputManager if the InputBuffer is active.
+        @brief This tick() function is called by the InputManager if the InputBuffer is active.
         @param dt Delta time
     */
-    void InputBuffer::updateInput(float dt)
+    void InputBuffer::tickInput(float dt)
     {
         timeSinceKeyPressed_ += dt;

code/branches/questsystem5/src/core/input/InputBuffer.h

@@ -127 +127 @@
                 for (std::list<BaseInputBufferListenerTuple*>::iterator it = this->listeners_.begin(); it != this->listeners_.end(); )
                 {
-                    InputBufferListenerTuple<T>* refListener = static_cast<InputBufferListenerTuple<T>*>(*it);
+                    InputBufferListenerTuple<T>* refListener = dynamic_cast<InputBufferListenerTuple<T>*>(*it);
                     if (refListener && refListener->listener_ == listener)
                         this->listeners_.erase(it++);
@@ -171 +171 @@
             void processKey (const KeyEvent &e);
 
-            void updateInput(float dt);
-            void updateKey(float dt) { }
+            void tickInput(float dt);
+            void tickKey(float dt) { }
 
             std::string buffer_;

code/branches/questsystem5/src/core/input/InputInterfaces.h

@@ -474 +474 @@
     public:
         virtual ~InputHandler() { }
-        virtual void updateInput(float dt) = 0;
+        virtual void tickInput(float dt) = 0;
     };
 
@@ -488 +488 @@
         virtual void keyReleased(const KeyEvent& evt) = 0;
         virtual void keyHeld    (const KeyEvent& evt) = 0;
-        virtual void updateKey    (float dt) = 0;
+        virtual void tickKey    (float dt) = 0;
     };
 
@@ -504 +504 @@
         virtual void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) = 0;
         virtual void mouseScrolled      (int abs, int rel)     = 0;
-        virtual void updateMouse          (float dt) = 0;
+        virtual void tickMouse          (float dt) = 0;
     };
 
@@ -520 +520 @@
         virtual void joyStickButtonHeld    (unsigned int joyStickID, JoyStickButtonCode::ByEnum id) = 0;
         virtual void joyStickAxisMoved     (unsigned int joyStickID, unsigned int axis, float value) = 0;
-        virtual void updateJoyStick          (float dt, unsigned int joyStick) = 0;
+        virtual void tickJoyStick          (float dt, unsigned int joyStick) = 0;
     };
 
@@ -531 +531 @@
         virtual ~EmptyHandler() { }
 
-        void updateInput(float dt) { }
-        void updateJoyStick(float dt, unsigned int joyStick) { }
-        void updateMouse(float dt) { }
-        void updateKey(float dt) { }
+        void tickInput(float dt) { }
+        void tickJoyStick(float dt, unsigned int joyStick) { }
+        void tickMouse(float dt) { }
+        void tickKey(float dt) { }
 
         void keyPressed (const KeyEvent& evt) { }

code/branches/questsystem5/src/core/input/InputManager.cc

@@ -43 +43 @@
 
 #include "util/Exception.h"
-#include "core/Clock.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -109 +108 @@
         , internalState_(Uninitialised)
         , stateEmpty_(0)
+        , stateMaster_(0)
         , keyDetector_(0)
         , calibratorCallbackBuffer_(0)
@@ -173 +173 @@
             //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_NONEXCLUSIVE")));
             //paramList.insert(std::make_pair(std::string("w32_mouse"), std::string("DISCL_FOREGROUND")));
-#if defined ORXONOX_PLATFORM_LINUX
+#if defined OIS_LINUX_PLATFORM
             paramList.insert(std::make_pair(std::string("XAutoRepeatOn"), std::string("true")));
             paramList.insert(std::make_pair(std::string("x11_mouse_grab"), "true"));
@@ -218 +218 @@
 
             // Lowest priority empty InputState
-            stateEmpty_ = createInputState<SimpleInputState>("empty", false, false, InputStatePriority::Empty);
+            stateEmpty_ = createInputState<SimpleInputState>("empty", -1);
             stateEmpty_->setHandler(&EMPTY_HANDLER);
             activeStates_[stateEmpty_->getPriority()] = stateEmpty_;
 
+            // Always active master InputState
+            stateMaster_ = new ExtendedInputState();
+            stateMaster_->setName("master");
+            stateMaster_->setNumOfJoySticks(joySticksSize_);
+
             // KeyDetector to evaluate a pressed key's name
-            SimpleInputState* detector = createInputState<SimpleInputState>("detector", false, false, InputStatePriority::Detector);
+            SimpleInputState* detector = createInputState<SimpleInputState>("detector", 101);
             keyDetector_ = new KeyDetector();
             detector->setHandler(keyDetector_);
 
             // Joy stick calibration helper callback
-            SimpleInputState* calibrator = createInputState<SimpleInputState>("calibrator", false, false, InputStatePriority::Calibrator);
+            SimpleInputState* calibrator = createInputState<SimpleInputState>("calibrator", 100);
             calibrator->setHandler(&EMPTY_HANDLER);
             calibratorCallbackBuffer_ = new InputBuffer();
@@ -419 +424 @@
 
         // state management
-        activeStatesTriggered_.resize(devicesNum_);
+        activeStatesTop_.resize(devicesNum_);
 
         // inform all states
-        for (std::map<std::string, InputState*>::const_iterator it = inputStatesByName_.begin();
-            it != inputStatesByName_.end(); ++it)
+        for (std::map<int, InputState*>::const_iterator it = inputStatesByPriority_.begin();
+            it != inputStatesByPriority_.end(); ++it)
         {
             it->second->setNumOfJoySticks(joySticksSize_);
         }
+        // inform master state
+        if (stateMaster_)
+            this->stateMaster_->setNumOfJoySticks(joySticksSize_);
 
         // inform all JoyStick Device Number Listeners
@@ -446 +454 @@
         }
     }
-
+    
     void InputManager::_startCalibration()
     {
@@ -541 +549 @@
                 // destroy the empty InputState
                 _destroyState(this->stateEmpty_);
+                // 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 all user InputStates
-                while (inputStatesByName_.size() > 0)
-                    _destroyState((*inputStatesByName_.rbegin()).second);
+                while (inputStatesByPriority_.size() > 0)
+                    _destroyState((*inputStatesByPriority_.rbegin()).second);
 
                 // destroy the devices
@@ -628 +639 @@
             _updateActiveStates();
         }
+        inputStatesByPriority_.erase(state->getPriority());
         inputStatesByName_.erase(state->getName());
         delete state;
@@ -658 +670 @@
     @brief
         Public interface. Only reloads immediately if the call stack doesn't
-        include the update() method.
+        include the tick() method.
     @param joyStickSupport
         Whether or not to initialise joy sticks as well.
@@ -730 +742 @@
     @brief
         Updates the states and the InputState situation.
-    @param time
-        Clock holding the current time.
-    */
-    void InputManager::update(const Clock& time)
+    @param dt
+        Delta time
+    */
+    void InputManager::tick(float dt)
     {
         if (internalState_ == Uninitialised)
@@ -747 +759 @@
         if (!stateLeaveRequests_.empty())
         {
-            for (std::set<InputState*>::iterator it = stateLeaveRequests_.begin();
-                it != stateLeaveRequests_.end(); ++it)
-            {
-                (*it)->onLeave();
+            for (std::set<InputState*>::reverse_iterator rit = stateLeaveRequests_.rbegin();
+                rit != stateLeaveRequests_.rend(); ++rit)
+            {
+                (*rit)->onLeave();
                 // just to be sure that the state actually is registered
-                assert(inputStatesByName_.find((*it)->getName()) != inputStatesByName_.end());
-
-                activeStates_.erase((*it)->getPriority());
-                if ((*it)->getPriority() < InputStatePriority::HighPriority)
-                    (*it)->setPriority(0);
+                assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
+
+                activeStates_.erase((*rit)->getPriority());
                 _updateActiveStates();
             }
@@ -765 +775 @@
         if (!stateEnterRequests_.empty())
         {
-            for (std::set<InputState*>::const_iterator it = stateEnterRequests_.begin();
-                it != stateEnterRequests_.end(); ++it)
+            for (std::set<InputState*>::reverse_iterator rit = stateEnterRequests_.rbegin();
+                rit != stateEnterRequests_.rend(); ++rit)
             {
                 // just to be sure that the state actually is registered
-                assert(inputStatesByName_.find((*it)->getName()) != inputStatesByName_.end());
-
-                if ((*it)->getPriority() == 0)
-                {
-                    // Get smallest possible priority between 1 and maxStateStackSize_s
-#if defined( __MINGW32__ ) // Avoid the strange mingw-stl bug with const_reverse_iterator
-                    for(std::map<int, InputState*>::reverse_iterator rit = activeStates_.rbegin();
-                        rit != activeStates_.rend(); ++rit)
-#else
-                    for(std::map<int, InputState*>::const_reverse_iterator rit = activeStates_.rbegin();
-                        rit != activeStates_.rend(); ++rit)
-#endif
-                    {
-                        if (rit->first < InputStatePriority::HighPriority)
-                        {
-                            (*it)->setPriority(rit->first + 1);
-                            break;
-                        }
-                    }
-                    // In case no normal handler was on the stack
-                    if ((*it)->getPriority() == 0)
-                        (*it)->setPriority(1);
-                }
-                activeStates_[(*it)->getPriority()] = (*it);
+                assert(inputStatesByName_.find((*rit)->getName()) != inputStatesByName_.end());
+
+                activeStates_[(*rit)->getPriority()] = (*rit);
                 _updateActiveStates();
-                (*it)->onEnter();
+                (*rit)->onEnter();
             }
             stateEnterRequests_.clear();
@@ -802 +791 @@
         if (!stateDestroyRequests_.empty())
         {
-            for (std::set<InputState*>::iterator it = stateDestroyRequests_.begin();
-                it != stateDestroyRequests_.end(); ++it)
-            {
-                _destroyState((*it));
+            for (std::set<InputState*>::reverse_iterator rit = stateDestroyRequests_.rbegin();
+                rit != stateDestroyRequests_.rend(); ++rit)
+            {
+                _destroyState((*rit));
             }
             stateDestroyRequests_.clear();
@@ -823 +812 @@
             _updateActiveStates();
 
-        // mark that we now start capturing and distributing input
+        // mark that we capture and distribute input
         internalState_ |= Ticking;
 
@@ -840 +829 @@
             {
                 KeyEvent kEvt(keysDown_[iKey], keyboardModifiers_);
-
-                for (unsigned int iState = 0; iState < activeStatesTriggered_[Keyboard].size(); ++iState)
-                    activeStatesTriggered_[Keyboard][iState]->keyHeld(kEvt);
+                activeStatesTop_[Keyboard]->keyHeld(kEvt);
+                stateMaster_->keyHeld(kEvt);
             }
 
@@ -848 +836 @@
             for (unsigned int iButton = 0; iButton < mouseButtonsDown_.size(); iButton++)
             {
-                for (unsigned int iState = 0; iState < activeStatesTriggered_[Mouse].size(); ++iState)
-                    activeStatesTriggered_[Mouse][iState]->mouseButtonHeld(mouseButtonsDown_[iButton]);
+                activeStatesTop_[Mouse]->mouseButtonHeld(mouseButtonsDown_[iButton]);
+                stateMaster_->mouseButtonHeld(mouseButtonsDown_[iButton]);
             }
 
@@ -856 +844 @@
                 for (unsigned int iButton   = 0; iButton   < joyStickButtonsDown_[iJoyStick].size(); iButton++)
                 {
-                    for (unsigned int iState = 0; iState < activeStatesTriggered_[JoyStick0 + iJoyStick].size(); ++iState)
-                        activeStatesTriggered_[JoyStick0 + iJoyStick][iState]->joyStickButtonHeld(iJoyStick, joyStickButtonsDown_[iJoyStick][iButton]);
+                    activeStatesTop_[JoyStick0 + iJoyStick]
+                        ->joyStickButtonHeld(iJoyStick, joyStickButtonsDown_[iJoyStick][iButton]);
+                    stateMaster_->joyStickButtonHeld(iJoyStick, joyStickButtonsDown_[iJoyStick][iButton]);
                 }
 
-            // update the handlers for each active handler
+            // tick the handlers for each active handler
             for (unsigned int i = 0; i < devicesNum_; ++i)
             {
-                for (unsigned int iState = 0; iState < activeStatesTriggered_[i].size(); ++iState)
-                    activeStatesTriggered_[i][iState]->updateInput(time.getDeltaTime(), i);
-            }
-
-            // update the handler with a general tick afterwards
+                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]->updateInput(time.getDeltaTime());
+                activeStatesTicked_[i]->tickInput(dt);
+            stateMaster_->tickInput(dt);
         }
 
@@ -878 +869 @@
     @brief
         Updates the currently active states (according to activeStates_) for each device.
-        Also, a list of all active states (no duplicates!) is compiled for the general update().
+        Also, a list of all active states (no duplicates!) is compiled for the general tick.
     */
     void InputManager::_updateActiveStates()
     {
-        for (unsigned int i = 0; i < devicesNum_; ++i)
-        {
-            bool occupied = false;
-            activeStatesTriggered_[i].clear();
-#if defined( __MINGW32__ ) // Avoid the strange mingw-stl bug with const_reverse_iterator
-            for (std::map<int, InputState*>::reverse_iterator rit = activeStates_.rbegin(); rit != activeStates_.rend(); ++rit)
-            {
-#else
-            for (std::map<int, InputState*>::const_reverse_iterator rit = activeStates_.rbegin(); rit != activeStates_.rend(); ++rit)
-            {
-#endif
-                if (rit->second->isInputDeviceEnabled(i) && (!occupied || rit->second->bAlwaysGetsInput_))
-                {
-                    activeStatesTriggered_[i].push_back(rit->second);
-                    if (!rit->second->bTransparent_)
-                        occupied = true;
-                }
-            }
-        }
+        for (std::map<int, InputState*>::const_iterator it = activeStates_.begin(); it != activeStates_.end(); ++it)
+            for (unsigned int i = 0; i < devicesNum_; ++i)
+                if (it->second->isInputDeviceEnabled(i))
+                    activeStatesTop_[i] = it->second;
 
         // update tickables (every state will only appear once)
@@ -906 +882 @@
         std::set<InputState*> tempSet;
         for (unsigned int i = 0; i < devicesNum_; ++i)
-            for (unsigned int iState = 0; iState < activeStatesTriggered_[i].size(); ++iState)
-                tempSet.insert(activeStatesTriggered_[i][iState]);
-
-        // copy the content of the std::set back to the actual vector
+            tempSet.insert(activeStatesTop_[i]);
+
+        // copy the content of the set back to the actual vector
         activeStatesTicked_.clear();
         for (std::set<InputState*>::const_iterator it = tempSet.begin();it != tempSet.end(); ++it)
@@ -967 +942 @@
 
         KeyEvent kEvt(e, keyboardModifiers_);
-        for (unsigned int iState = 0; iState < activeStatesTriggered_[Keyboard].size(); ++iState)
-            activeStatesTriggered_[Keyboard][iState]->keyPressed(kEvt);
+        activeStatesTop_[Keyboard]->keyPressed(kEvt);
+        stateMaster_->keyPressed(kEvt);
 
         return true;
@@ -1000 +975 @@
 
         KeyEvent kEvt(e, keyboardModifiers_);
-        for (unsigned int iState = 0; iState < activeStatesTriggered_[Keyboard].size(); ++iState)
-            activeStatesTriggered_[Keyboard][iState]->keyReleased(kEvt);
+        activeStatesTop_[Keyboard]->keyReleased(kEvt);
+        stateMaster_->keyReleased(kEvt);
 
         return true;
@@ -1023 +998 @@
             IntVector2 rel(e.state.X.rel, e.state.Y.rel);
             IntVector2 clippingSize(e.state.width, e.state.height);
-            for (unsigned int iState = 0; iState < activeStatesTriggered_[Mouse].size(); ++iState)
-                activeStatesTriggered_[Mouse][iState]->mouseMoved(abs, rel, clippingSize);
+            activeStatesTop_[Mouse]->mouseMoved(abs, rel, clippingSize);
+            stateMaster_->mouseMoved(abs, rel, clippingSize);
         }
 
@@ -1030 +1005 @@
         if (e.state.Z.rel != 0)
         {
-            for (unsigned int iState = 0; iState < activeStatesTriggered_[Mouse].size(); ++iState)
-                activeStatesTriggered_[Mouse][iState]->mouseScrolled(e.state.Z.abs, e.state.Z.rel);
+            activeStatesTop_[Mouse]->mouseScrolled(e.state.Z.abs, e.state.Z.rel);
+            stateMaster_->mouseScrolled(e.state.Z.abs, e.state.Z.rel);
         }
 
@@ -1054 +1029 @@
             mouseButtonsDown_.push_back((MouseButtonCode::ByEnum)id);
 
-        for (unsigned int iState = 0; iState < activeStatesTriggered_[Mouse].size(); ++iState)
-            activeStatesTriggered_[Mouse][iState]->mouseButtonPressed((MouseButtonCode::ByEnum)id);
+        activeStatesTop_[Mouse]->mouseButtonPressed((MouseButtonCode::ByEnum)id);
+        stateMaster_->mouseButtonPressed((MouseButtonCode::ByEnum)id);
 
         return true;
@@ -1080 +1055 @@
         }
 
-        for (unsigned int iState = 0; iState < activeStatesTriggered_[Mouse].size(); ++iState)
-            activeStatesTriggered_[Mouse][iState]->mouseButtonReleased((MouseButtonCode::ByEnum)id);
+        activeStatesTop_[Mouse]->mouseButtonReleased((MouseButtonCode::ByEnum)id);
+        stateMaster_->mouseButtonReleased((MouseButtonCode::ByEnum)id);
 
         return true;
@@ -1117 +1092 @@
             buttonsDown.push_back((JoyStickButtonCode::ByEnum)button);
 
-        for (unsigned int iState = 0; iState < activeStatesTriggered_[2 + iJoyStick].size(); ++iState)
-            activeStatesTriggered_[2 + iJoyStick][iState]->joyStickButtonPressed(iJoyStick, (JoyStickButtonCode::ByEnum)button);
+        activeStatesTop_[2 + iJoyStick]->joyStickButtonPressed(iJoyStick, (JoyStickButtonCode::ByEnum)button);
+        stateMaster_->joyStickButtonPressed(iJoyStick, (JoyStickButtonCode::ByEnum)button);
 
         return true;
@@ -1138 +1113 @@
         }
 
-        for (unsigned int iState = 0; iState < activeStatesTriggered_[2 + iJoyStick].size(); ++iState)
-            activeStatesTriggered_[2 + iJoyStick][iState]->joyStickButtonReleased(iJoyStick, (JoyStickButtonCode::ByEnum)button);
+        activeStatesTop_[2 + iJoyStick]->joyStickButtonReleased(iJoyStick, (JoyStickButtonCode::ByEnum)button);
+        stateMaster_->joyStickButtonReleased(iJoyStick, (JoyStickButtonCode::ByEnum)button);
 
         return true;
@@ -1166 +1141 @@
                 fValue *= joyStickCalibrations_[iJoyStick].negativeCoeff[axis];
 
-            for (unsigned int iState = 0; iState < activeStatesTriggered_[2 + iJoyStick].size(); ++iState)
-                activeStatesTriggered_[2 + iJoyStick][iState]->joyStickAxisMoved(iJoyStick, axis, fValue);
+            activeStatesTop_[2 + iJoyStick]->joyStickAxisMoved(iJoyStick, axis, fValue);
+            stateMaster_->joyStickAxisMoved(iJoyStick, axis, fValue);
         }
     }
@@ -1270 +1245 @@
         Unique name of the handler.
     @param priority
-        Determines which InputState gets the input. Higher is better.
-        Use 0 to handle it implicitely by the order of activation.
-        Otherwise numbers larger than maxStateStackSize_s have to be used!
+        Unique integer number. Higher means more prioritised.
     @return
         True if added, false if name or priority already existed.
     */
-    bool InputManager::_configureInputState(InputState* state, const std::string& name, bool bAlwaysGetsInput, bool bTransparent, int priority)
+    bool InputManager::_configureInputState(InputState* state, const std::string& name, int priority)
     {
         if (name == "")
@@ -1284 +1257 @@
         if (inputStatesByName_.find(name) == inputStatesByName_.end())
         {
-            if (priority >= InputStatePriority::HighPriority || priority == InputStatePriority::Empty)
-            {
-                // Make sure we don't add two high priority states with the same priority
-                for (std::map<std::string, InputState*>::const_iterator it = this->inputStatesByName_.begin();
-                    it != this->inputStatesByName_.end(); ++it)
-                {
-                    if (it->second->getPriority() == priority)
-                    {
-                        COUT(2) << "Warning: Could not add an InputState with the same priority '"
-                            << priority << "' != 0." << std::endl;
-                        return false;
-                    }
-                }
-            }
-            inputStatesByName_[name] = state;
-            state->setNumOfJoySticks(numberOfJoySticks());
-            state->setName(name);
-            state->bAlwaysGetsInput_ = bAlwaysGetsInput;
-            state->bTransparent_ = bTransparent;
-            if (priority >= InputStatePriority::HighPriority || priority == InputStatePriority::Empty)
+            if (inputStatesByPriority_.find(priority)
+                == inputStatesByPriority_.end())
+            {
+                inputStatesByName_[name] = state;
+                inputStatesByPriority_[priority] = state;
+                state->setNumOfJoySticks(numberOfJoySticks());
+                state->setName(name);
                 state->setPriority(priority);
-            return true;
+                return true;
+            }
+            else
+            {
+                COUT(2) << "Warning: Could not add an InputState with the same priority '"
+                    << priority << "'." << std::endl;
+                return false;
+            }
         }
         else
@@ -1323 +1290 @@
     @remarks
         You can't remove the internal states "empty", "calibrator" and "detector".
-        The removal process is being postponed if InputManager::update() is currently running.
+        The removal process is being postponed if InputManager::tick() is currently running.
     */
     bool InputManager::requestDestroyState(const std::string& name)
@@ -1404 +1371 @@
                 {
                     // not scheduled for destruction
-                    // prevents a state being added multiple times
+                    // set prevents a state being added multiple times
                     stateEnterRequests_.insert(it->second);
                     return true;
@@ -1423 +1390 @@
     bool InputManager::requestLeaveState(const std::string& name)
     {
-        if (name == "empty")
-        {
-            COUT(2) << "InputManager: Leaving the empty state is not allowed!" << std::endl;
-            return false;
-        }
         // get pointer from the map with all stored handlers
         std::map<std::string, InputState*>::const_iterator it = inputStatesByName_.find(name);

code/branches/questsystem5/src/core/input/InputManager.h

@@ -43 +43 @@
 #include <stack>
 #include "util/Math.h"
-#include "util/OrxEnum.h"
 #include "core/OrxonoxClass.h"
 #include "InputInterfaces.h"
@@ -75 +74 @@
         float positiveCoeff[24];
         float negativeCoeff[24];
-    };
-
-    struct InputStatePriority : OrxEnum<InputStatePriority>
-    {
-        OrxEnumConstructors(InputStatePriority);
-
-        static const int Empty        = -1;
-        static const int Dynamic      = 0;
-
-        static const int HighPriority = 1000;
-        static const int Console      = HighPriority + 0;
-        static const int Calibrator   = HighPriority + 1;
-        static const int Detector     = HighPriority + 2;
     };
 
@@ -130 +116 @@
 
         template <class T>
-        T* createInputState(const std::string& name, bool bAlwaysGetsInput = false, bool bTransparent = false, InputStatePriority priority = InputStatePriority::Dynamic);
+        T* createInputState(const std::string& name, int priority);
 
         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);
         bool requestLeaveState     (const std::string& name);
 
-        void update(const Clock& time);
+        void tick(float dt);
 
         static InputManager& getInstance()    { assert(singletonRef_s); return *singletonRef_s; }
@@ -178 +165 @@
 
         void _updateActiveStates();
-        bool _configureInputState(InputState* state, const std::string& name, bool bAlwaysGetsInput, bool bTransparent, int priority);
+        bool _configureInputState(InputState* state, const std::string& name, int priority);
 
         // input events
@@ -210 +197 @@
         // some internally handled states and handlers
         SimpleInputState*                   stateEmpty_;
+        ExtendedInputState*                 stateMaster_;          //!< Always active master input state
         KeyDetector*                        keyDetector_;          //!< KeyDetector instance
         InputBuffer*                        calibratorCallbackBuffer_;
 
         std::map<std::string, InputState*>  inputStatesByName_;
+        std::map<int, InputState*>          inputStatesByPriority_;
 
         std::set<InputState*>               stateEnterRequests_;   //!< Request to enter a new state
@@ -220 +209 @@
 
         std::map<int, InputState*>          activeStates_;
-        std::vector<std::vector<InputState*> > activeStatesTriggered_;
-        std::vector<InputState*>            activeStatesTicked_;
+        std::vector<InputState*>            activeStatesTop_;      //!< Current input states for joy stick events.
+        std::vector<InputState*>            activeStatesTicked_;   //!< Current input states for joy stick events.
 
         // joystick calibration
@@ -260 +249 @@
     */
     template <class T>
-    T* InputManager::createInputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority)
+    T* InputManager::createInputState(const std::string& name, int priority)
     {
         T* state = new T;
-        if (_configureInputState(state, name, bAlwaysGetsInput, bTransparent, priority))
+        if (_configureInputState(state, name, priority))
             return state;
         else

code/branches/questsystem5/src/core/input/InputState.h

@@ -71 +71 @@
         virtual void unRegisterOnLeave()                      { executorOnLeave_ = 0; }
 
-        virtual void updateInput(float dt, unsigned int device) = 0;
-        virtual void updateInput(float dt) = 0;
+        virtual void tickInput(float dt, unsigned int device) = 0;
+        virtual void tickInput(float dt) = 0;
 
         virtual void keyPressed (const KeyEvent& evt) = 0;
@@ -90 +90 @@
 
     protected:
-        InputState()
-            : bHandlersChanged_(false)
-            , priority_(0)
-            , bAlwaysGetsInput_(false)
-            , bTransparent_(false)
-            , executorOnEnter_(0)
-            , executorOnLeave_(0)
-        { }
+        InputState() : bHandlersChanged_(false), priority_(0), executorOnEnter_(0), executorOnLeave_(0) { }
         virtual ~InputState() { }
 
@@ -121 +114 @@
         int                                         priority_;
         std::vector<bool>                           bInputDeviceEnabled_;
-        bool                                        bAlwaysGetsInput_;
-        bool                                        bTransparent_;
 
         Executor*                                   executorOnEnter_;

code/branches/questsystem5/src/core/input/KeyBinder.cc

@@ -42 +42 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigFileManager.h"
+#include "core/Core.h"
 #include "InputCommands.h"
 #include "InputManager.h"
@@ -308 +309 @@
     }
 
-    void KeyBinder::updateMouse(float dt)
+    void KeyBinder::tickMouse(float dt)
     {
         if (bDeriveMouseInput_)
@@ -348 +349 @@
             // Why dividing relative value by dt? The reason lies in the simple fact, that when you
             // press a button that has relative movement, that value has to be multiplied by dt to be
-            // frame rate independent. This can easily (and only) be done in updateInput(float).
+            // frame rate independent. This can easily (and only) be done in tickInput(float).
             // Hence we need to divide by dt here for the mouse to compensate, because the relative
             // move movements have nothing to do with dt.
@@ -361 +362 @@
     }
 
-    void KeyBinder::updateJoyStick(float dt, unsigned int joyStick)
+    void KeyBinder::tickJoyStick(float dt, unsigned int joyStick)
     {
         for (unsigned int i = 0; i < JoyStickAxisCode::numberOfAxes * 2; i++)

code/branches/questsystem5/src/core/input/KeyBinder.h

@@ -68 +68 @@
 
     protected: // functions
-        void updateInput(float dt);
-        void updateKey(float dt) { }
-        void updateMouse(float dt);
-        void updateJoyStick(float dt, unsigned int joyStick);
+        void tickInput(float dt);
+        void tickKey(float dt) { }
+        void tickMouse(float dt);
+        void tickJoyStick(float dt, unsigned int joyStick);
         // internal
         void tickHalfAxis(HalfAxis& halfAxis);
@@ -134 +134 @@
         @brief
             Commands that have additional parameters (axes) are executed at the end of
-            update() so that all values can be buffered for single execution.
+            the tick() so that all values can be buffered for single execution.
         */
         std::vector<BufferedParamCommand*> paramCommandBuffer_;
@@ -200 +200 @@
     { joyStickButtons_[joyStickID][id].execute(KeybindMode::OnHold); }
 
-    inline void KeyBinder::updateInput(float dt)
+    inline void KeyBinder::tickInput(float dt)
     {
         // execute all buffered bindings (additional parameter)

code/branches/questsystem5/src/core/input/SimpleInputState.h

@@ -59 +59 @@
         ~SimpleInputState() { }
 
-        void updateInput(float dt);
-        void updateInput(float dt, unsigned int device);
+        void tickInput(float dt);
+        void tickInput(float dt, unsigned int device);
 
         void keyPressed (const KeyEvent& evt);
@@ -87 +87 @@
     };
 
-    inline void SimpleInputState::updateInput(float dt)
+    inline void SimpleInputState::tickInput(float dt)
     {
         for (unsigned int i = 0; i < allHandlers_.size(); ++i)
         {
-            allHandlers_[i]->updateInput(dt);
+            allHandlers_[i]->tickInput(dt);
         }
     }
 
-    inline void SimpleInputState::updateInput(float dt, unsigned int device)
+    inline void SimpleInputState::tickInput(float dt, unsigned int device)
     {
         switch (device)
@@ -101 +101 @@
         case InputDevice::Keyboard:
             if (keyHandler_)
-                keyHandler_->updateKey(dt);
+                keyHandler_->tickKey(dt);
             break;
 
         case InputDevice::Mouse:
             if (mouseHandler_)
-                mouseHandler_->updateMouse(dt);
+                mouseHandler_->tickMouse(dt);
             break;
 
         default: // joy sticks
             if (joyStickHandler_[device - 2])
-                joyStickHandler_[device - 2]->updateJoyStick(dt, device - 2);
+                joyStickHandler_[device - 2]->tickJoyStick(dt, device - 2);
             break;
         }