Changeset 1344 for code/branches/input/src/core/InputHandler.h

Timestamp:

May 21, 2008, 6:26:15 PM (17 years ago)

Author:

rgrieder

Message:

• added scroll wheel support
• improved mouse input handling
• added support for mouse input derivation (allows to use the track stick like a joy stick)

About the new key binder in general:
You can assign any button/key/axis any combination of command strings the way you want.
When using simple commands (shortcuts) without parameters depending on the input, there are 3 keybind modes: OnPress, OnRelease and OnHold. For the case you assign such a command to a mouse/joystick axis, the input is translated to switch-like behavior (can be configured by feeding ButtonThreshold argument as ONE key binding).
With parameter controlled commands, keys are simply 1 or 0, axis are of course continuous. There are two ways a command can expect a value: relative or absolute input. For instance the joystick axis state (-1 to 1) is an absolute value, mouse movement is relative. Once again, everything is translated in the right way.
There's a lot more to explain, but I guess I'm gonna write a wiki page for that…

one last note: I haven't yet changed the way input is handled in the space ship. I shall do that after the merge tomorrow.

File:

• code/branches/input/src/core/InputHandler.h (modified) (6 diffs)

code/branches/input/src/core/InputHandler.h

@@ -60 +60 @@
     BufferedParamCommand() : value_(0.0f), nValuesAdded_(0), paramIndex_(-1) { }
     bool execute();
+
     float value_;
     unsigned int nValuesAdded_;
@@ -93 +94 @@
     virtual bool addParamCommand(ParamCommand* command) { return false; }
     void parse(std::vector<BufferedParamCommand*>& paramCommandBuffer);
-    bool execute(KeybindMode::Enum mode);
+    bool execute(KeybindMode::Enum mode, float abs = 1.0f, float rel = 1.0f);
 
     //! The configured string value
@@ -114 +115 @@
     HalfAxis() : relVal_(0.0f), absVal_(0.0f), paramCommands_(0), nParamCommands_(0),
                  wasDown_(false), hasChanged_(false) { }
+    using Button::execute;
     bool execute();
-    bool execute(KeybindMode::Enum mode) { return Button::execute(mode); }
+    //bool execute(KeybindMode::Enum mode) { return Button::execute(mode); }
     bool addParamCommand(ParamCommand* command);
     void clear();
@@ -176 +178 @@
 
     //! denotes the number of different mouse buttons there are in OIS.
-    static const unsigned int nMouseButtons_s = 8;
+    static const unsigned int nMouseButtons_s = 8 + 2*2; // 8 buttons and 2 scroll wheels
     //! Actual key bindings as bundle for Press, Hold and Release
     Button mouseButtons_ [nMouseButtons_s];
@@ -193 +195 @@
     * Sequence is as follows:
     *  0 -  3: Mouse x and y
-    *  4 -  7: Mouse scroll wheels 1 and 2 (2 not yet supported)
+    *  4 -  7: empty
     *  8 - 23: joy stick (slider) axes 1 to 8
     * 24 - 55: joy stick axes 1 - 16
@@ -205 +207 @@
     std::vector<BufferedParamCommand*> paramCommandBuffer_;
 
+    //! Keeps track of the absolute mouse value (incl. scroll wheel)
+    int mousePosition_[3];
+    //! Used to derive mouse input if requested
+    int mouseRelative_[2];
+    float deriveTime_;
+
+    //**** ConfigValues *****\\
     //! Threshold for analog triggers until which the state is 0.
     float analogThreshold_;
     //! Threshold for analog triggers until which the button is not pressed.
     float buttonThreshold_;
+    //! Derive mouse input for absolute values?
+    bool bDeriveMouseInput_;
+    //! Accuracy of the mouse input deriver. The higher the more precise, but laggier.
+    float derivePeriod_;
+    //! mouse sensitivity
+    float mouseSensitivity_;
   };