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

Timestamp:

Oct 6, 2008, 12:31:32 AM (16 years ago)

Author:

rgrieder

Message:

FIRST THINGS FIRST: Delete or rename your keybindings.ini (def_keybindings.ini already has the most important bindings) or else you won't be able to do anything!

Changes:

• Multiple joy stick support should now fully work with KeyBinder too (only tested with 0/1 joystick)
• Reloading the OIS Devices now works with KeyBinder too
• Modified ConfigValueContainer to accept arbitrary section names
• added tkeybind to temporary bind a command to a key
• Fixed dlleport issue in ArgumentCompletionFunctions.h

Internal changes:

• General cleanup in initialisation of KeyBinder
• All names of keys/buttons/axes are now statically saved in InputInterfaces.h
• Move a magic value in KeyBinder to a configValue (MouseWheelStepSize_)
• Separated ConfigValues from Keybinding ConfigValueContainer in KeyBinder (looks much nicer now )
• Moved some performance critical small function to the inline section
• Removed the ugly keybind function construct from the InputManager
• More 'harmonising' work in KeyBinder

File:

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

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

@@ -35 +35 @@
 #include "SimpleInputState.h"
 
-#include <assert.h>
-#include "util/Debug.h"
-#include "core/Executor.h"
-
 namespace orxonox
 {
-    using namespace InputDevice;
-
     SimpleInputState::SimpleInputState()
         : keyHandler_(0)
@@ -70 +64 @@
         if (keyHandler_)
             keyHandler_->keyPressed(evt);
-    }
-
-    void SimpleInputState::keyReleased(const KeyEvent& evt)
-    {
-        if (keyHandler_)
-            keyHandler_->keyReleased(evt);
-    }
-
-    void SimpleInputState::keyHeld(const KeyEvent& evt)
-    {
-        if (keyHandler_)
-            keyHandler_->keyHeld(evt);
-    }
-
-
-    void SimpleInputState::mouseMoved(IntVector2 abs, IntVector2 rel, IntVector2 clippingSize)
-    {
-        if (mouseHandler_)
-            mouseHandler_->mouseMoved(abs, rel, clippingSize);
-    }
-
-    void SimpleInputState::mouseScrolled(int abs, int rel)
-    {
-        if (mouseHandler_)
-            mouseHandler_->mouseScrolled(abs, rel);
-    }
-
-    void SimpleInputState::mouseButtonPressed(MouseButton::Enum id)
-    {
-        if (mouseHandler_)
-            mouseHandler_->mouseButtonPressed(id);
-    }
-
-    void SimpleInputState::mouseButtonReleased(MouseButton::Enum id)
-    {
-        if (mouseHandler_)
-            mouseHandler_->mouseButtonReleased(id);
-    }
-
-    void SimpleInputState::mouseButtonHeld(MouseButton::Enum id)
-    {
-        if (mouseHandler_)
-            mouseHandler_->mouseButtonHeld(id);
-    }
-
-
-    void SimpleInputState::joyStickAxisMoved(unsigned int joyStickID, unsigned int axis, float value)
-    {
-        assert(joyStickID < joyStickHandler_.size());
-        if (joyStickHandler_[joyStickID])
-            joyStickHandler_[joyStickID]->joyStickAxisMoved(joyStickID, axis, value);
-    }
-
-    void SimpleInputState::joyStickButtonPressed(unsigned int joyStickID, JoyStickButton::Enum id)
-    {
-        assert(joyStickID < joyStickHandler_.size());
-        if (joyStickHandler_[joyStickID])
-            joyStickHandler_[joyStickID]->joyStickButtonPressed(joyStickID, id);
-    }
-
-    void SimpleInputState::joyStickButtonReleased(unsigned int joyStickID, JoyStickButton::Enum id)
-    {
-        assert(joyStickID < joyStickHandler_.size());
-        if (joyStickHandler_[joyStickID])
-            joyStickHandler_[joyStickID]->joyStickButtonReleased(joyStickID, id);
-    }
-
-    void SimpleInputState::joyStickButtonHeld(unsigned int joyStickID, JoyStickButton::Enum id)
-    {
-        assert(joyStickID < joyStickHandler_.size());
-        if (joyStickHandler_[joyStickID])
-            joyStickHandler_[joyStickID]->joyStickButtonHeld(joyStickID, id);
     }
 
@@ -199 +121 @@
     }
 
-    void SimpleInputState::tickInput(float dt)
-    {
-        for (unsigned int i = 0; i < allHandlers_.size(); ++i)
-        {
-            allHandlers_[i]->tickInput(dt);
-        }
-    }
-
-    void SimpleInputState::tickInput(float dt, unsigned int device)
-    {
-        switch (device)
-        {
-        case Keyboard:
-            if (keyHandler_)
-                keyHandler_->tickKey(dt);
-            break;
-
-        case Mouse:
-            if (mouseHandler_)
-                mouseHandler_->tickMouse(dt);
-            break;
-
-        default: // joy sticks
-            if (joyStickHandler_[device - 2])
-                joyStickHandler_[device - 2]->tickJoyStick(dt, device - 2);
-            break;
-        }
-    }
-
     void SimpleInputState::update()
     {
@@ -247 +140 @@
 
         // update the deviceEnabled options
-        setInputDeviceEnabled(Keyboard, (keyHandler_ != 0));
-        setInputDeviceEnabled(Mouse, (mouseHandler_ != 0));
+        setInputDeviceEnabled(InputDevice::Keyboard, (keyHandler_ != 0));
+        setInputDeviceEnabled(InputDevice::Mouse, (mouseHandler_ != 0));
         for (unsigned int i = 0; i < joyStickHandler_.size(); ++i)
             setInputDeviceEnabled(2 + i, (joyStickHandler_[i] != 0));