Changeset 1182 for code/branches/input/src/core/InputHandler.h

Timestamp:

Apr 24, 2008, 9:40:23 PM (16 years ago)

Author:

rgrieder

Message:

• InputManager works so far, but has to be largely extended

File:

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

code/branches/input/src/core/InputHandler.h

@@ -38 +38 @@
 
 #include <string>
+#include <list>
 #include <OIS/OIS.h>
 
@@ -44 +45 @@
 namespace orxonox
 {
+  namespace KeybindSetting
+  {
+    enum KeybindSetting
+    {
+      None,
+      OnPress,
+      OnRelease,
+      Continuous,
+    };
+  }
+
+  class _CoreExport BaseInputHandler
+      : public OIS::KeyListener, public OIS::MouseListener
+  {
+    virtual void tick(float dt) = 0;
+  };
+    
   /**
     @brief Captures mouse and keyboard input while in the actual game mode.
     Manages the key bindings.
   */
-  class _CoreExport InputHandlerGame
-        : public OIS::KeyListener, public OIS::MouseListener
+  class _CoreExport InputHandlerGame : public BaseInputHandler
   {
   public:
@@ -65 +82 @@
                 bool keyReleased  (const OIS::KeyEvent   &arg);
 
+    void tick(float dt);
+
     // temporary hack
     void callListeners(InputEvent &evt);
+
+    //! Stores all the keys that are down
+    std::list<OIS::KeyCode> keysDown_;
 
     /** denotes the maximum number of different keys there are in OIS.
@@ -72 +94 @@
     static const int numberOfKeys_s = 256;
     //! Array of input events for every pressed key
-    std::string bindingsKeyPressed_[numberOfKeys_s];
+    std::string bindingsKeyPress_[numberOfKeys_s];
     //! Array of input events for every released key
-    std::string bindingsKeyReleased_[numberOfKeys_s];
+    std::string bindingsKeyRelease_[numberOfKeys_s];
+    //! Array of input events for every holding key
+    std::string bindingsKeyHold_[numberOfKeys_s];
 
     /** denotes the maximum number of different buttons there are in OIS.
@@ -91 +115 @@
     GUI.
   */
-  class _CoreExport InputHandlerGUI
-        : public OIS::KeyListener, public OIS::MouseListener
+  class _CoreExport InputHandlerGUI : public BaseInputHandler
   {
   public:
     InputHandlerGUI ();
     ~InputHandlerGUI();
+
+    void tick(float dt);
 
   private: