Changeset 1219 for code/trunk/src/orxonox/objects/SpaceShip.cc

Timestamp:

May 2, 2008, 10:44:57 PM (17 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk. Not yet tested on tardis

File:

• code/trunk/src/orxonox/objects/SpaceShip.cc (modified) (4 diffs)

code/trunk/src/orxonox/objects/SpaceShip.cc

@@ -32 +32 @@
 #include <string>
 
-#include <OIS/OIS.h>
 #include <OgreCamera.h>
 #include <OgreRenderWindow.h>
@@ -39 +38 @@
 
 #include "tinyxml/tinyxml.h"
+#include "ois/OIS.h"
 #include "util/Convert.h"
 #include "util/Math.h"
@@ -428 +428 @@
     void SpaceShip::tick(float dt)
     {
-      if (InputManager::getSingleton().getMouse()->getEventCallback() != this)
-        {
-            if (InputManager::getSingleton().getMouse())
-            {
-                InputManager::getSingleton().getMouse()->setEventCallback(this);
-                this->setMouseEventCallback_ = true;
-            }
+        if (!setMouseEventCallback_)
+        {
+          InputManager::addMouseHandler(this, "SpaceShip");
+          setMouseEventCallback_ = true;
         }
 
@@ -457 +454 @@
         }
 
-        OIS::Keyboard* mKeyboard = InputManager::getSingleton().getKeyboard();
-        //FIXME: variable never used
-        //OIS::Mouse* mMouse = InputManager::getSingleton().getMouse();
+        OIS::Keyboard* mKeyboard = InputManager::getKeyboard();