Changeset 1878 for code/trunk/src/core/input/InputInterfaces.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/InputInterfaces.h (modified) (5 diffs)

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

@@ -287 +287 @@
 
 
-    class _CoreExport InputTickable
-    {
-    public:
-        virtual ~InputTickable() { }
+    class _CoreExport InputHandler
+    {
+    public:
+        virtual ~InputHandler() { }
         virtual void tickInput(float dt) = 0;
     };
@@ -298 +298 @@
         Interface class used for key input listeners.
     */
-    class _CoreExport KeyHandler : virtual public InputTickable
+    class _CoreExport KeyHandler : virtual public InputHandler
     {
     public:
@@ -312 +312 @@
         Interface class used for mouse input listeners.
     */
-    class _CoreExport MouseHandler : virtual public InputTickable
+    class _CoreExport MouseHandler : virtual public InputHandler
     {
     public:
@@ -329 +329 @@
         Interface class used for joy stick input listeners.
     */
-    class _CoreExport JoyStickHandler : virtual public InputTickable
+    class _CoreExport JoyStickHandler : virtual public InputHandler
     {
     public:
@@ -342 +342 @@
     class _CoreExport EmptyHandler : public KeyHandler, public MouseHandler, public JoyStickHandler
     {
+        friend class InputManager;
     private:
+        EmptyHandler() { }
+        EmptyHandler(EmptyHandler&);
+        virtual ~EmptyHandler() { }
+
         void tickInput(float dt) { }
         void tickJoyStick(float dt, unsigned int joyStick) { }