Changeset 1215 for code/branches/input/src/orxonox

Timestamp:

May 2, 2008, 9:31:20 PM (17 years ago)

Author:

rgrieder

Message:

• SpaceShip is now a default listener for mouse input. still a hack..
• several changes in InputManager.cc regarding joy sticks
• Key bindings work, but not very advanced

Location:

code/branches/input/src/orxonox

Files:

• Orxonox.cc (modified) (1 diff)
• objects/SpaceShip.cc (modified) (1 diff)

code/branches/input/src/orxonox/Orxonox.cc

@@ -398 +398 @@
           ogre_->getWindowWidth(), ogre_->getWindowHeight()))
       abortImmediateForce();
-    InputManager::setInputState(InputManager::IS_CUSTOM);
-    InputManager::enableKeyHandler("keybinder");
-    InputManager::enableMouseHandler("keybinder");
-    InputManager::enableJoyStickHandler("keybinder", 0);
+    InputManager::setInputState(InputManager::IS_NORMAL);
   }
 

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

@@ -431 +431 @@
         {
           InputManager::addMouseHandler(this, "SpaceShip");
-          InputManager::enableMouseHandler("SpaceShip");
           setMouseEventCallback_ = true;
         }