Changeset 2001 for code/branches/objecthierarchy/src/core/input/KeyBinder.h

Timestamp:

Oct 23, 2008, 12:15:09 AM (17 years ago)

Author:

rgrieder

Message:

• Fixed issue with relative mouse movements.
• Fixed bug when parsing commands in keybindings.ini
• Fixed potential framerate dependency with relative movements
• Simplified the use of a configured input command
• Changed how parametrised input is handled (superposition and [-1,1]-clamp instead of average).

File:

• code/branches/objecthierarchy/src/core/input/KeyBinder.h (modified) (4 diffs)

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

@@ -71 +71 @@
         void tickJoyStick(float dt, unsigned int joyStick);
         // internal
-        void tickDevices(HalfAxis* begin, HalfAxis* end);
+        void tickHalfAxis(HalfAxis& halfAxis);
 
         void buttonThresholdChanged();
@@ -149 +149 @@
         //! Filename of default keybindings.
         std::string defaultKeybindings_;
+        //! Whether to filter small value analog input
+        bool bFilterAnalogNoise_;
         //! Threshold for analog triggers until which the state is 0.
         float analogThreshold_;
@@ -162 +164 @@
         float mouseSensitivityDerived_;
         //! Equals one step of the mousewheel
-        float mouseWheelStepSize_;
+        int mouseWheelStepSize_;
 
         //##### Constant config variables #####
@@ -198 +200 @@
     { joyStickButtons_[joyStickID][id].execute(KeybindMode::OnHold); }
 
-    inline void KeyBinder::tickJoyStick(float dt, unsigned int joyStick)
-    {
-        tickDevices(&joyStickAxes_[joyStick][0], &joyStickAxes_[joyStick][JoyStickAxisCode::numberOfAxes * 2]);
-    }
-
     inline void KeyBinder::tickInput(float dt)
     {
         // execute all buffered bindings (additional parameter)
         for (unsigned int i = 0; i < paramCommandBuffer_.size(); i++)
+        {
+            paramCommandBuffer_[i]->rel_ *= dt;
             paramCommandBuffer_[i]->execute();
+        }
 
         // always reset the relative movement of the mouse