Changeset 1887 for code/trunk/src/core/input/ExtendedInputState.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/ExtendedInputState.cc (modified) (6 diffs)

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

@@ -92 +92 @@
     }
 
-    void ExtendedInputState::mouseButtonPressed(MouseButton::Enum id)
+    void ExtendedInputState::mouseButtonPressed(MouseButtonCode::ByEnum id)
     {
         for (unsigned int i = 0; i < mouseHandlers_.size(); i++)
@@ -98 +98 @@
     }
 
-    void ExtendedInputState::mouseButtonReleased(MouseButton::Enum id)
+    void ExtendedInputState::mouseButtonReleased(MouseButtonCode::ByEnum id)
     {
         for (unsigned int i = 0; i < mouseHandlers_.size(); i++)
@@ -104 +104 @@
     }
 
-    void ExtendedInputState::mouseButtonHeld(MouseButton::Enum id)
+    void ExtendedInputState::mouseButtonHeld(MouseButtonCode::ByEnum id)
     {
         for (unsigned int i = 0; i < mouseHandlers_.size(); i++)
@@ -118 +118 @@
     }
 
-    void ExtendedInputState::joyStickButtonPressed(unsigned int joyStickID, JoyStickButton::Enum id)
+    void ExtendedInputState::joyStickButtonPressed(unsigned int joyStickID, JoyStickButtonCode::ByEnum id)
     {
         assert(joyStickID < joyStickHandlers_.size());
@@ -125 +125 @@
     }
 
-    void ExtendedInputState::joyStickButtonReleased(unsigned int joyStickID, JoyStickButton::Enum id)
+    void ExtendedInputState::joyStickButtonReleased(unsigned int joyStickID, JoyStickButtonCode::ByEnum id)
     {
         assert(joyStickID < joyStickHandlers_.size());
@@ -132 +132 @@
     }
 
-    void ExtendedInputState::joyStickButtonHeld(unsigned int joyStickID, JoyStickButton::Enum id)
+    void ExtendedInputState::joyStickButtonHeld(unsigned int joyStickID, JoyStickButtonCode::ByEnum id)
     {
         assert(joyStickID < joyStickHandlers_.size());