Changeset 1887 for code/trunk/src/core/input/InputManager.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/InputManager.h (modified) (4 diffs)

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

@@ -110 +110 @@
         void clearBuffers();
 
-        int  numberOfKeyboards() { return keyboard_ ? 1 : 0; }
-        int  numberOfMice()      { return mouse_    ? 1 : 0; }
-        int  numberOfJoySticks() { return joySticksSize_; }
+        unsigned int  numberOfKeyboards() { return keyboard_ ? 1 : 0; }
+        unsigned int  numberOfMice()      { return mouse_    ? 1 : 0; }
+        unsigned int  numberOfJoySticks() { return joySticksSize_; }
 
         void setWindowExtents(const int width, const int height);
+        void setKeyDetectorCallback(const std::string& command);
 
         template <class T>
@@ -132 +133 @@
 
         // console commands
-        static void storeKeyStroke(const std::string& name);
-        static void keyBind(const std::string& command);
         static void calibrate();
         static void reload(bool joyStickSupport = true);
@@ -148 +147 @@
         void _initialiseMouse();
         void _initialiseJoySticks();
-        void _redimensionLists();
+        void _configureNumberOfJoySticks();
 
         void _destroyKeyboard();
@@ -223 +222 @@
 
         std::vector<Key>                    keysDown_;
-        std::vector<MouseButton::Enum>      mouseButtonsDown_;
-        std::vector<std::vector<JoyStickButton::Enum> >  joyStickButtonsDown_;
+        std::vector<MouseButtonCode::ByEnum>      mouseButtonsDown_;
+        std::vector<std::vector<JoyStickButtonCode::ByEnum> >  joyStickButtonsDown_;
 
         static std::string                  bindingCommmandString_s;