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

Timestamp:

Apr 10, 2008, 5:12:02 PM (17 years ago)

Author:

rgrieder

Message:

• modified the input handler
• few more little changes

Location:

code/branches/input/src/orxonox/objects

Files:

• Fighter.cc (modified) (1 diff)
• SpaceShip.cc (modified) (2 diffs)

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

@@ -267 +267 @@
         OIS::Mouse* mMouse = InputManager::getSingleton()->getMouse();
 
-        mKeyboard->capture();
-        mMouse->capture();
+        //mKeyboard->capture();
+        //mMouse->capture();
 
         if (leftButtonPressed_)

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

@@ -417 +417 @@
     void SpaceShip::tick(float dt)
     {
-        if (!this->setMouseEventCallback_)
+      if (InputManager::getSingleton()->getMouse()->getEventCallback() != this)
         {
             if (InputManager::getSingleton()->getMouse())
@@ -448 +448 @@
         OIS::Keyboard* mKeyboard = InputManager::getSingleton()->getKeyboard();
         OIS::Mouse* mMouse = InputManager::getSingleton()->getMouse();
-
-        mKeyboard->capture();
-        mMouse->capture();