Changeset 1215 for code/branches/input/src/core/InputManager.h

Timestamp:

May 2, 2008, 9:31:20 PM (16 years ago)

Author:

rgrieder

Message:

• SpaceShip is now a default listener for mouse input. still a hack..
• several changes in InputManager.cc regarding joy sticks
• Key bindings work, but not very advanced

File:

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

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

@@ -77 +77 @@
     static bool initialiseMouse();
     static bool initialiseJoySticks();
-    static bool isKeyboardInitialised();
-    static bool isMouseInitialised();
-    static bool areJoySticksInitialised();
+    static int  numberOfKeyboards();
+    static int  numberOfMice();
+    static int  numberOfJoySticks();
 
     static void destroy();
@@ -148 +148 @@
                 bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
                 bool povMoved      (const OIS::JoyStickEvent &arg, int id);
+                bool vector3Moved  (const OIS::JoyStickEvent &arg, int id);
 
     static InputManager& _getSingleton();
@@ -156 +157 @@
     OIS::Keyboard*                              keyboard_;    //!< OIS mouse
     OIS::Mouse*                                 mouse_;       //!< OIS keyboard
-    std::map<int, OIS::JoyStick*>               joySticks_;   //!< OIS joy sticks
+    std::vector<OIS::JoyStick*>                 joySticks_;   //!< OIS joy sticks
 
     InputState state_;
@@ -165 +166 @@
     std::map<std::string, JoyStickHandler*>     joyStickHandlers_;
 
-    std::list<KeyHandler*>                      activeKeyHandlers_;
-    std::list<MouseHandler*>                    activeMouseHandlers_;
-    std::map<int, std::list<JoyStickHandler*> > activeJoyStickHandlers_;
+    std::vector<KeyHandler*>                    activeKeyHandlers_;
+    std::vector<MouseHandler*>                  activeMouseHandlers_;
+    std::map< OIS::JoyStick*, std::vector<JoyStickHandler*> > activeJoyStickHandlers_;
 
     std::list<OIS::KeyCode>                     keysDown_;
     std::list<OIS::MouseButtonID>               mouseButtonsDown_;
-    std::map< int, std::list<int> >             joyStickButtonsDown_;
+    std::map< OIS::JoyStick*, std::list<int> >  joyStickButtonsDown_;
 
   };