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

Timestamp:

Jun 3, 2008, 12:20:36 AM (16 years ago)

Author:

rgrieder

Message:

• moved Tickable to objects again
• network, audio and core now have their own tick routine
• Sequence is defined in Orxonox.cc

File:

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

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

@@ -43 +43 @@
 #include "ois/OIS.h"
 #include "util/Math.h"
-#include "core/Tickable.h"
+#include "core/OrxonoxClass.h"
 #include "InputInterfaces.h"
 
@@ -89 +89 @@
   */
   class _CoreExport InputManager
-        : public TickableReal,
+        : public OrxonoxClass,
           public OIS::KeyListener, public OIS::MouseListener, public OIS::JoyStickListener
   {
@@ -143 +143 @@
     static void calibrate();
 
+    static void tick(float dt);
+
     static bool addKeyHandler                 (KeyHandler* handler, const std::string& name);
     static bool removeKeyHandler              (const std::string& name);
@@ -191 +193 @@
     unsigned int _getJoystick(const OIS::JoyStickEvent& arg);
 
-    void tick(float dt);
+    void _tick(float dt);
 
     // input events