Changeset 1182 for code/branches/input/src/orxonox/objects

Timestamp:

Apr 24, 2008, 9:40:23 PM (17 years ago)

Author:

rgrieder

Message:

• InputManager works so far, but has to be largely extended

File:

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

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

@@ -428 +428 @@
     void SpaceShip::tick(float dt)
     {
-      if (InputManager::getSingleton().getMouse()->getEventCallback() != this)
-        {
-            if (InputManager::getSingleton().getMouse())
+      if (InputManager::getMouse()->getEventCallback() != this)
+        {
+            if (InputManager::getMouse())
             {
-                InputManager::getSingleton().getMouse()->setEventCallback(this);
+                InputManager::getMouse()->setEventCallback(this);
                 this->setMouseEventCallback_ = true;
             }
@@ -457 +457 @@
         }
 
-        OIS::Keyboard* mKeyboard = InputManager::getSingleton().getKeyboard();
+        OIS::Keyboard* mKeyboard = InputManager::getKeyboard();
         //FIXME: variable never used
         //OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();