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

Timestamp:

Apr 29, 2008, 11:13:11 PM (16 years ago)

Author:

rgrieder

Message:

• InputManager fully functional (most parts tested), if there wasn't that selfish SpaceShip who claims all the mouse input…
• InputHandler still loads hard coded key bindings, but works fine otherwise
• I've tried to give full multiple joy stick support. Couldn't yet test that however. And more than one Joystick still doesn't make sense as long as we don't have split view

File:

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

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

@@ -38 +38 @@
 
 #include <string>
-#include <list>
-#include <OIS/OIS.h>
-
-#include "InputEvent.h"
+#include "ois/OIS.h"
 
 namespace orxonox
@@ -56 +53 @@
   }
 
-  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.
+    @brief Interface class used for key input listeners.
   */
-  class _CoreExport InputHandlerGame : public BaseInputHandler
+  class _CoreExport KeyHandler : public OIS::KeyListener
   {
   public:
-    InputHandlerGame ();
-    ~InputHandlerGame();
+    virtual bool keyHeld(const OIS::KeyEvent &arg) = 0;
+  };
+
+  /**
+    @brief Interface class used for mouse input listeners.
+  */
+  class _CoreExport MouseHandler : public OIS::MouseListener
+  {
+  public:
+    virtual bool mouseHeld(const OIS::MouseEvent &arg, OIS::MouseButtonID id) = 0;
+  };
+
+  /**
+    @brief Interface class used for joy stick input listeners.
+  */
+  class _CoreExport JoyStickHandler : public OIS::JoyStickListener
+  {
+  public:
+    virtual bool buttonHeld(const OIS::JoyStickEvent &arg, int button) = 0;
+  };
+ 
+
+  /**
+    @brief Captures mouse, keyboard and joy stick input while in the actual game mode.
+           Manages the key bindings.
+  */
+  class _CoreExport KeyBinder : public KeyHandler, public MouseHandler, public JoyStickHandler
+  {
+  public:
+    KeyBinder ();
+    ~KeyBinder();
 
     bool loadBindings();
+    void clearBindings();
 
-  private:
-    // input events
-                bool mousePressed (const OIS::MouseEvent &arg, OIS::MouseButtonID id);
-                bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id);
-    bool mouseMoved   (const OIS::MouseEvent &arg);
+  private: // functions
                 bool keyPressed   (const OIS::KeyEvent   &arg);
                 bool keyReleased  (const OIS::KeyEvent   &arg);
+                bool keyHeld      (const OIS::KeyEvent   &arg);
 
-    void tick(float dt);
+    bool mousePressed (const OIS::MouseEvent &arg, OIS::MouseButtonID id);
+                bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id);
+                bool mouseHeld    (const OIS::MouseEvent &arg, OIS::MouseButtonID id);
+    bool mouseMoved   (const OIS::MouseEvent &arg);
 
-    // temporary hack
-    void callListeners(InputEvent &evt);
+                bool buttonPressed (const OIS::JoyStickEvent &arg, int button);
+                bool buttonReleased(const OIS::JoyStickEvent &arg, int button);
+                bool buttonHeld    (const OIS::JoyStickEvent &arg, int button);
+                bool axisMoved     (const OIS::JoyStickEvent &arg, int axis);
+                bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
+                bool povMoved      (const OIS::JoyStickEvent &arg, int id);
 
-    //! Stores all the keys that are down
-    std::list<OIS::KeyCode> keysDown_;
-
+  private: // variables
     /** denotes the maximum number of different keys there are in OIS.
-        256 should be ok since the highest number in the enum is 237. */
+        256 should be ok since the highest number in the OIS enum is 237. */
     static const int numberOfKeys_s = 256;
     //! Array of input events for every pressed key
-    std::string bindingsKeyPress_[numberOfKeys_s];
+    std::string bindingsKeyPress_  [numberOfKeys_s];
     //! Array of input events for every released key
     std::string bindingsKeyRelease_[numberOfKeys_s];
-    //! Array of input events for every holding key
-    std::string bindingsKeyHold_[numberOfKeys_s];
+    //!Array of input events for every held key
+    std::string bindingsKeyHold_   [numberOfKeys_s];
 
     /** denotes the maximum number of different buttons there are in OIS.
-        16 should be ok since the highest number in the enum is 7. */
-    static const int numberOfButtons_s = 16;
-    //! Array of input events for every pressed key
-    std::string bindingsButtonPressed_[numberOfButtons_s];
-    //! Array of input events for every released key
-    std::string bindingsButtonReleased_[numberOfButtons_s];
+        16 should be ok since the highest number in the OIS enum is 7. */
+    static const int numberOfMouseButtons_s = 16;
+    //! Array of input events for every pressed mouse button
+    std::string bindingsMouseButtonPress_  [numberOfMouseButtons_s];
+    //! Array of input events for every released mouse button
+    std::string bindingsMouseButtonRelease_[numberOfMouseButtons_s];
+    //! Array of input events for every held mouse button
+    std::string bindingsMouseButtonHold_   [numberOfMouseButtons_s];
+
+    /** denotes the maximum number of different buttons there are in OIS.
+        32 should be ok. */
+    static const int numberOfJoyStickButtons_s = 32;
+    //! Array of input events for every pressed joy stick button
+    std::string bindingsJoyStickButtonPress_  [numberOfJoyStickButtons_s];
+    //! Array of input events for every released joy stick button
+    std::string bindingsJoyStickButtonRelease_[numberOfJoyStickButtons_s];
+    //! Array of input events for every held joy stick button
+    std::string bindingsJoyStickButtonHold_   [numberOfJoyStickButtons_s];
 
   };
@@ -115 +149 @@
     GUI.
   */
-  class _CoreExport InputHandlerGUI : public BaseInputHandler
-  {
-  public:
-    InputHandlerGUI ();
-    ~InputHandlerGUI();
+  //class _CoreExport GUIInputHandler : public KeyHandler, public MouseHandler, public JoyStickHandler
+  //{
+  //public:
+  //  GUIInputHandler ();
+  //  ~GUIInputHandler();
 
-    void tick(float dt);
+  //private:
+  //  // input events
+                //bool keyPressed   (const OIS::KeyEvent   &arg);
+                //bool keyReleased  (const OIS::KeyEvent   &arg);
+                //bool keyHeld      (const OIS::KeyEvent   &arg);
 
-  private:
-    // input events
-                bool mousePressed (const OIS::MouseEvent &arg, OIS::MouseButtonID id);
-                bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id);
-    bool mouseMoved   (const OIS::MouseEvent &arg);
-                bool keyPressed   (const OIS::KeyEvent   &arg);
-                bool keyReleased  (const OIS::KeyEvent   &arg);
-  };
+  //  bool mousePressed (const OIS::MouseEvent &arg, OIS::MouseButtonID id);
+                //bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id);
+                //bool mouseHeld    (const OIS::MouseEvent &arg, OIS::MouseButtonID id);
+  //  bool mouseMoved   (const OIS::MouseEvent &arg);
+
+                //bool buttonPressed (const OIS::JoyStickEvent &arg, int button);
+                //bool buttonReleased(const OIS::JoyStickEvent &arg, int button);
+                //bool buttonHeld    (const OIS::JoyStickEvent &arg, int button);
+                //bool axisMoved     (const OIS::JoyStickEvent &arg, int axis);
+                //bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
+                //bool povMoved      (const OIS::JoyStickEvent &arg, int id);
+  //};
 
 }