Changeset 1236 for code/branches/input/src/orxonox/objects/SpaceShip.h

Timestamp:

May 6, 2008, 2:32:19 PM (16 years ago)

Author:

rgrieder

Message:

• feature: Automatic key repetition in InputBuffer, configurable in orxonox.ini
• replaced std::list and std::map with std::vector in InputManager where necessary
• new mouseWheelTurned event
• some renaming
• OIS:: calls only necessary in InputManager now

File:

• code/branches/input/src/orxonox/objects/SpaceShip.h (modified) (2 diffs)

code/branches/input/src/orxonox/objects/SpaceShip.h

@@ -34 +34 @@
 #include <OgrePrerequisites.h>
 
-#include "core/InputHandler.h"
+#include "core/InputInterfaces.h"
 #include "Model.h"
 #include "../tools/BillboardSet.h"
@@ -65 +65 @@
                 { SpaceShip::instance_s->setMaxSpeed(value); }
 
-            bool mouseMoved(const OIS::MouseEvent &e);
-            bool mousePressed(const OIS::MouseEvent &e, OIS::MouseButtonID id);
-            bool mouseReleased(const OIS::MouseEvent &e, OIS::MouseButtonID id);
-            bool mouseHeld(const OIS::MouseEvent &e, OIS::MouseButtonID id) { return true; }
+            bool mouseButtonPressed (const MouseState& state, MouseButton::Enum id);
+            bool mouseButtonReleased(const MouseState& state, MouseButton::Enum id);
+            bool mouseButtonHeld    (const MouseState& state, MouseButton::Enum id) { return true; }
+            bool mouseMoved         (const MouseState& state);
+            bool mouseWheelTurned   (const MouseState& state) { return true; }