Changeset 1878 for code/trunk/src/core/input/InputManager.h

Timestamp:

Oct 3, 2008, 1:26:48 PM (16 years ago)

Author:

rgrieder

Message:

Fixed two issues with input:

• Buffer gets cleared now when the window focus changes
• Added a configValue in the InGameConsole:

Until now the input was always transparent to the level when activating the console (exception keyboard input of course)
bHidesAllInput_ can change that setting (configured in orxonox.ini)

@Oli: Sorry, couldn't apply the patch in the network branch because of conflicts (I have already made some changes to the InputManager in the trunk)

File:

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

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

@@ -108 +108 @@
         void reloadInputSystem(bool joyStickSupport = true);
 
+        void clearBuffers();
+
         int  numberOfKeyboards() { return keyboard_ ? 1 : 0; }
         int  numberOfMice()      { return mouse_    ? 1 : 0; }
@@ -115 +117 @@
 
         template <class T>
-        T* createInputState(const std::string& name, int priority)
-        {
-            T* state = new T;
-            if (_configureInputState(state, name, priority))
-                return state;
-            else
-            {
-                delete state;
-                return 0;
-            }
-        }
+        T* createInputState(const std::string& name, int priority);
 
         InputState* getState       (const std::string& name);
@@ -139 +131 @@
         static InputManager* getInstancePtr() { return singletonRef_s; }
 
-    public: // console commands
+        // 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);
+
+    public: // variables
+        static EmptyHandler                 EMPTY_HANDLER;
 
     private: // functions
@@ -197 +192 @@
         InputManagerState                   internalState_;        //!< Current internal state
 
-        // some internally handled states
+        // some internally handled states and handlers
         SimpleInputState*                   stateDetector_;        //!< KeyDetector instance
         SimpleInputState*                   stateCalibrator_;
@@ -234 +229 @@
         static InputManager*                singletonRef_s;
     };
+
+    /**
+    @brief
+        Creates a new InputState by type, name and priority.
+        
+        You will have to use this method because the
+        c'tors and d'tors are private.
+    @remarks
+        The InputManager will take care of the state completely. That also
+        means it gets deleted when the InputManager is destroyed!
+    @param name
+        Name of the InputState when referenced as string
+    @param priority
+        Priority matters when multiple states are active. You can specify any
+        number, but 1 - 99 is preferred (99 means high).
+    */
+    template <class T>
+    T* InputManager::createInputState(const std::string& name, int priority)
+    {
+        T* state = new T;
+        if (_configureInputState(state, name, priority))
+            return state;
+        else
+        {
+            delete state;
+            return 0;
+        }
+    }
 }