Changeset 1637 for code/branches/input/src/orxonox/Orxonox.cc

Timestamp:

Jul 20, 2008, 6:49:24 PM (16 years ago)

Author:

rgrieder

Message:

Finally! The InputManager is now working like I imagined it to. And it's even easier to use it as well.
A little explanation: Every time you change something about the input distribution, it is a change of 'state' represented by the class 'InputState'.
That can be for instance: "console", "game", "gui", etc. Every state has a name and a priority which describes who comes first. Now if one state doesn't handle mouse input or instance, then the one with the next lower priority gets it. To prevent that, you can add the 'EmptyHandler' to the state with setMouseHandler.
InputState is just an abstract base class. There are two classes implementing it: SimpleInputState and ExtendedInputState. The latter allows for multiple input handlers for one single device.

Basically, what you need to know is what you see in Orxonox.cc, InGameConsole.cc and Shell.cc.

File:

• code/branches/input/src/orxonox/Orxonox.cc (modified) (4 diffs)

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

@@ -58 +58 @@
 #include "core/Loader.h"
 #include "core/input/InputManager.h"
+#include "core/input/SimpleInputState.h"
+#include "core/input/KeyBinder.h"
 #include "core/TclBind.h"
 #include "core/Core.h"
@@ -135 +137 @@
     if (this->timer_)
       delete this->timer_;
+    dynamic_cast<SimpleInputState*>(InputManager::getState("game"))->removeAndDestroyAllHandlers();
     InputManager::destroy();
     GraphicsEngine::getSingleton().destroy();
@@ -290 +293 @@
             ogre_->getWindowWidth(), ogre_->getWindowHeight(), true, true, true))
         return false;
+      KeyBinder* keyBinder = new KeyBinder();
+      InputManager::createSimpleInputState("game", 20)->setHandler(keyBinder);
 
       // TOOD: load the GUI here
       // set InputManager to GUI mode
-      InputManager::setInputState(InputManager::IS_GUI);
       // TODO: run GUI here
 
       // The following lines depend very much on the GUI output, so they're probably misplaced here..
 
-      InputManager::setInputState(InputManager::IS_NONE);
+      keyBinder->loadBindings();
+      InputManager::requestEnterState("game");
 
       // create Ogre SceneManager
@@ -325 +330 @@
         return false;
     }
-
-    InputManager::setInputState(InputManager::IS_NORMAL);
 
     return startRenderLoop();