Changeset 1887 for code/trunk/src/core/input/InputState.h

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/InputState.h (modified) (1 diff)

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

@@ -78 +78 @@
         virtual void keyHeld    (const KeyEvent& evt) = 0;
 
-        virtual void mouseButtonPressed (MouseButton::Enum id) = 0;
-        virtual void mouseButtonReleased(MouseButton::Enum id) = 0;
-        virtual void mouseButtonHeld    (MouseButton::Enum id) = 0;
+        virtual void mouseButtonPressed (MouseButtonCode::ByEnum id) = 0;
+        virtual void mouseButtonReleased(MouseButtonCode::ByEnum id) = 0;
+        virtual void mouseButtonHeld    (MouseButtonCode::ByEnum id) = 0;
         virtual void mouseMoved         (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) = 0;
         virtual void mouseScrolled      (int abs, int rel) = 0;
 
-        virtual void joyStickButtonPressed (unsigned int joyStickID, JoyStickButton::Enum id) = 0;
-        virtual void joyStickButtonReleased(unsigned int joyStickID, JoyStickButton::Enum id) = 0;
-        virtual void joyStickButtonHeld    (unsigned int joyStickID, JoyStickButton::Enum id) = 0;
+        virtual void joyStickButtonPressed (unsigned int joyStickID, JoyStickButtonCode::ByEnum id) = 0;
+        virtual void joyStickButtonReleased(unsigned int joyStickID, JoyStickButtonCode::ByEnum id) = 0;
+        virtual void joyStickButtonHeld    (unsigned int joyStickID, JoyStickButtonCode::ByEnum id) = 0;
         virtual void joyStickAxisMoved     (unsigned int joyStickID, unsigned int axis, float value) = 0;