Changeset 919 for code/branches/network/src/orxonox/InputHandler.h

Timestamp:

Mar 24, 2008, 1:12:31 PM (17 years ago)

Author:

rgrieder

Message:

• AudioManager is now Tickable
• NPC update moved to its tick-function
• corrected CMakeLists
• added a few window properties to GraphicsEngine
• OrxListener has been completely replaced

File:

• code/branches/network/src/orxonox/InputHandler.h (modified) (2 diffs)

code/branches/network/src/orxonox/InputHandler.h

@@ -39 +39 @@
 #include <OIS/OISKeyboard.h>
 
-#include <OgrePrerequisites.h>
-
 #include "OrxonoxPrereqs.h"
+//#include "core/OrxonoxClass.h"
 #include "core/Tickable.h"
 
 namespace orxonox
 {
-  class _OrxonoxExport InputHandler : public Tickable, public OIS::KeyListener,
-                                      public OIS::MouseListener
+  class _OrxonoxExport InputHandler
+        : public Tickable,
+          public OIS::KeyListener, public OIS::MouseListener
   {
   public:
-    InputHandler();
 
-    void initialise(Ogre::RenderWindow *renderWindow);
+    void initialise(size_t windowHnd, int windowWidth, int windowHeight);
     void tick(float dt);
     void setWindowExtents(int width, int height);
+
+    OIS::Mouse    *getMouse()    { return this->mouse_   ; }
+    OIS::Keyboard *getKeyboard() { return this->keyboard_; }
 
     // input events
@@ -63 +65 @@
                 bool keyReleased  (const OIS::KeyEvent   &arg);
 
+    static InputHandler* getSingleton();
+
+    void setConfigValues();
+
   private:
+    // don't mess with a Singleton
+    InputHandler ();
+    InputHandler (const InputHandler&) { }
+    ~InputHandler() { }
+
     OIS::InputManager *inputSystem_;
     OIS::Keyboard     *keyboard_;
     OIS::Mouse        *mouse_;
+
+    // Key bindings
+    int codeFire_;
+    OIS::KeyCode codeMoveForward_;
 
   };