Changeset 2814 for code/branches/gui/src/orxonox

Timestamp:

Mar 21, 2009, 5:30:16 PM (15 years ago)

Author:

rgrieder

Message:

InputManager upgrade number one: InputState priorities are managed automatically. However you can still use the enum in InputManager.h and get yourself a high priority.
High priorities are only to be used for special cases like calibrator, console or detector.
All other states are simply pushed onto the normal stack.

Location:

code/branches/gui/src/orxonox

Files:

• gamestates/GSLevel.cc (modified) (1 diff)
• gui/GUIManager.cc (modified) (1 diff)
• overlays/console/InGameConsole.cc (modified) (1 diff)

code/branches/gui/src/orxonox/gamestates/GSLevel.cc

@@ -82 +82 @@
         if (Core::showsGraphics())
         {
-            inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game", 20);
+            inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("game");
             keyBinder_ = new KeyBinder();
             keyBinder_->loadBindings("keybindings.ini");

code/branches/gui/src/orxonox/gui/GUIManager.cc

@@ -167 +167 @@
 
                 // register us as input handler
-                SimpleInputState* state = InputManager::getInstance().createInputState<SimpleInputState>("gui", 30);
+                SimpleInputState* state = InputManager::getInstance().createInputState<SimpleInputState>("gui");
                 state->setHandler(this);
                 state->setJoyStickHandler(&InputManager::EMPTY_HANDLER);

code/branches/gui/src/orxonox/overlays/console/InGameConsole.cc

@@ -173 +173 @@
     {
         // create the corresponding input state
-        inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("console", 40);
+        inputState_ = InputManager::getInstance().createInputState<SimpleInputState>("console", InputStatePriority::Console);
         inputState_->setKeyHandler(Shell::getInstance().getInputBuffer());
         bHidesAllInputChanged();