Changeset 1656 for code/branches/gui/src/core/input/InputManager.h

Timestamp:

Aug 10, 2008, 9:43:50 PM (16 years ago)

Author:

rgrieder

Message:

added reloading support for the InputManager. This could be useful when using a GUI and you want to load a joyStick that has just been plugged in.

File:

• code/branches/gui/src/core/input/InputManager.h (modified) (5 diffs)

code/branches/gui/src/core/input/InputManager.h

@@ -55 +55 @@
     {
     public:
-        int operator[](unsigned int index) { return povStates[index]; }
+        int& operator[](unsigned int index) { return povStates[index]; }
         int povStates[4];
     };
@@ -90 +90 @@
 
     public:
+        enum InputManagerState
+        {
+            Uninitialised    = 0,
+            Ready            = 1,
+            Ticking          = 2,
+            Calibrating      = 4,
+            ReloadRequest    = 8,
+            JoyStickSupport  = 16 // used with ReloadRequest to store a bool
+        };
+
         InputManager ();
         ~InputManager();
 
-        bool initialise(const size_t windowHnd, int windowWidth, int windowHeight,
-                               bool createKeyboard = true, bool createMouse = true, bool createJoySticks = false);
+        void initialise(size_t windowHnd, int windowWidth, int windowHeight, bool joyStickSupport = true);
+
+        void reloadInputSystem(bool joyStickSupport = true);
 
         int  numberOfKeyboards() { return keyboard_ ? 1 : 0; }
@@ -134 +145 @@
 
         // Intenal methods
-        bool _initialiseKeyboard();
-        bool _initialiseMouse();
-        bool _initialiseJoySticks();
+        void _initialiseKeyboard();
+        void _initialiseMouse();
+        void _initialiseJoySticks();
         void _redimensionLists();
 
@@ -143 +154 @@
         void _destroyJoySticks();
         void _destroyState(InputState* state);
+        void _clearBuffers();
+
+        void _reload(bool joyStickSupport);
 
         void _completeCalibration();
@@ -177 +191 @@
         unsigned int                        joySticksSize_;
         unsigned int                        devicesNum_;
+        size_t                              windowHnd_;            //!< Render window handle
+        InputManagerState                   internalState_;        //!< Current internal state
 
         // some internally handled states