Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 30, 2008, 9:58:13 AM (16 years ago)
Author:
rgrieder
Message:
  • added some const qualifiers
  • renamed a few very ugly variables for the 7th time
  • added new functions (isHandlerActive, isDeviceInitialised)
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r1203 r1204  
    4343#include "ois/OIS.h"
    4444#include "Tickable.h"
    45 //#include "InputEvent.h"
    46 #include "InputHandler.h"
    4745
    4846namespace orxonox
    … …  
    5452  /**
    5553    @brief Captures and distributes mouse and keyboard input.
    56     It resolves the key bindings to InputEvents which can be heard by
    57     implementing the InputEventListener interface.
    5854  */
    5955  class _CoreExport InputManager
    6056        : public Tickable,
    61           public OIS::MouseListener, public OIS::KeyListener, public OIS::JoyStickListener
     57          public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener
    6258  {
    6359  public: // enumerations
    … …  
    7672
    7773  public: // static functions
    78     static bool initialise(size_t windowHnd, int windowWidth, int windowHeight,
    79           bool createKeyboard = true, bool createMouse = true, bool createJoySticks = false);
     74    static bool initialise(const size_t windowHnd, const int windowWidth, const int windowHeight,
     75          const bool createKeyboard = true, const bool createMouse = true, const bool createJoySticks = false);
    8076    static bool initialiseKeyboard();
    8177    static bool initialiseMouse();
    8278    static bool initialiseJoySticks();
     79    static bool isKeyboardInitialised();
     80    static bool isMouseInitialised();
     81    static bool areJoySticksInitialised();
    8382
    8483    static void destroy();
    … …  
    8786    static void destroyJoySticks();
    8887
    89     static void setWindowExtents(int width, int height);
     88    static void setWindowExtents(const int width, const int height);
    9089
    9190    static void setInputState(const InputState state);
    9291    static InputState getInputState();
    93     static void setKeyBindingState           (bool bActive);
    94     static void setMouseButtonBindingState   (bool bActive);
    95     static void setJoyStickButtonBindingState(bool bActive);
    9692
    97     static bool addKeyListener(KeyHandler* listener, const std::string& name);
    98     static bool removeKeyListener  (const std::string& name);
    99     static bool enableKeyListener  (const std::string& name);
    100     static bool disableKeyListener (const std::string& name);
    101     static bool isKeyListenerActive(const std::string& name);
    102     static KeyHandler* getKeyListener(const std::string& name);
     93    static bool addKeyHandler                 (KeyHandler* handler, const std::string& name);
     94    static bool removeKeyHandler              (const std::string& name);
     95    static KeyHandler* getKeyHandler          (const std::string& name);
     96    static bool enableKeyHandler              (const std::string& name);
     97    static bool disableKeyHandler             (const std::string& name);
     98    static bool isKeyHandlerActive            (const std::string& name);
    10399
    104     static bool addMouseListener(MouseHandler* listener, const std::string& name);
    105     static bool removeMouseListener  (const std::string& name);
    106     static bool enableMouseListener  (const std::string& name);
    107     static bool disableMouseListener (const std::string& name);
    108     static bool isMouseListenerActive(const std::string& name);
    109     static MouseHandler* getMouseListener(const std::string& name);
     100    static bool addMouseHandler               (MouseHandler* handler, const std::string& name);
     101    static bool removeMouseHandler            (const std::string& name);
     102    static MouseHandler* getMouseHandler      (const std::string& name);
     103    static bool enableMouseHandler            (const std::string& name);
     104    static bool disableMouseHandler           (const std::string& name);
     105    static bool isMouseHandlerActive          (const std::string& name);
    110106
    111     static bool addJoyStickListener(JoyStickHandler* listener, const std::string& name);
    112     static bool removeJoyStickListener  (const std::string& name);
    113     static bool enableJoyStickListener  (const std::string& name, const int id);
    114     static bool disableJoyStickListener (const std::string& name, const int id);
    115     static bool isJoyStickListenerActive(const std::string& name);
    116     static JoyStickHandler* getJoyStickListener(const std::string& name);
     107    static bool addJoyStickHandler            (JoyStickHandler* handler, const std::string& name);
     108    static bool removeJoyStickHandler         (const std::string& name);
     109    static JoyStickHandler* getJoyStickHandler(const std::string& name);
     110    static bool enableJoyStickHandler        (const std::string& name, const int id);
     111    static bool disableJoyStickHandler        (const std::string& name, const int id);
     112    static bool isJoyStickHandlerActive       (const std::string& name, const int id);
    117113
    118114    // Temporary solutions. Will be removed soon!
    … …  
    127123
    128124    // Intenal methods
    129     bool _initialise(size_t, int, int, bool, bool, bool);
     125    bool _initialise(const size_t, const int, const int, const bool, const bool, const bool);
    130126    bool _initialiseKeyboard();
    131127    bool _initialiseMouse();
    … …  
    157153
    158154  private: // variables
    159     OIS::InputManager* inputSystem_;            //!< OIS input manager
    160     OIS::Keyboard*     keyboard_;               //!< OIS mouse
    161     OIS::Mouse*        mouse_;                  //!< OIS keyboard
    162     std::map<int, OIS::JoyStick*> joySticks_;   //!< OIS joy sticks
     155    OIS::InputManager*                          inputSystem_; //!< OIS input manager
     156    OIS::Keyboard*                              keyboard_;    //!< OIS mouse
     157    OIS::Mouse*                                 mouse_;       //!< OIS keyboard
     158    std::map<int, OIS::JoyStick*>               joySticks_;   //!< OIS joy sticks
    163159
    164160    InputState state_;
    165161    InputState stateRequest_;
    166162
    167     std::map<std::string, KeyHandler*>      listenersKey_;
    168     std::map<std::string, MouseHandler*>    listenersMouse_;
    169     std::map<std::string, JoyStickHandler*> listenersJoySticks_;
     163    std::map<std::string, KeyHandler*>          keyHandlers_;
     164    std::map<std::string, MouseHandler*>        mouseHandlers_;
     165    std::map<std::string, JoyStickHandler*>     joyStickHandlers_;
    170166
    171     std::list<KeyHandler*>      listenersKeyActive_;
    172     std::list<MouseHandler*>    listenersMouseActive_;
    173     std::map< int, std::list<JoyStickHandler*> > listenersJoySticksActive_;
     167    std::list<KeyHandler*>                      activeKeyHandlers_;
     168    std::list<MouseHandler*>                    activeMouseHandlers_;
     169    std::map<int, std::list<JoyStickHandler*> > activeJoyStickHandlers_;
    174170
    175     std::list<OIS::KeyCode>         keysDown_;
    176     std::list<OIS::MouseButtonID>   mouseButtonsDown_;
    177     std::map< int, std::list<int> > joySticksButtonsDown_;
     171    std::list<OIS::KeyCode>                     keysDown_;
     172    std::list<OIS::MouseButtonID>               mouseButtonsDown_;
     173    std::map< int, std::list<int> >             joyStickButtonsDown_;
    178174
    179175  };
Note: See TracChangeset for help on using the changeset viewer.