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

Timestamp:

Mar 21, 2009, 8:47:11 PM (16 years ago)

Author:

rgrieder

Message:

Upgrade number two for the InputManager: An InputState can have two new properties. You can tell it to always receive input, no matter what the input stack actually is. Secondly there is a 'transparent' option to be kind of invisible to the other states. I have found no use yet, but three more lines weren't a big deal
This change ultimately supersedes the need for a master InputState.

Location:

code/branches/gui/src/orxonox

Files:

• gamestates/GSGraphics.cc (modified) (5 diffs)
• gamestates/GSGraphics.h (modified) (1 diff)
• overlays/console/InGameConsole.cc (modified) (1 diff)

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

@@ -39 +39 @@
 #include "core/input/InputManager.h"
 #include "core/input/KeyBinder.h"
-#include "core/input/ExtendedInputState.h"
+#include "core/input/SimpleInputState.h"
 #include "core/Loader.h"
 #include "core/XMLFile.h"
@@ -57 +57 @@
         , graphicsManager_(0)
         , masterKeyBinder_(0)
+        , masterInputState_(0)
         , debugOverlay_(0)
     {
@@ -91 +92 @@
         renderWindow->getCustomAttribute("WINDOW", &windowHnd);
         inputManager_->initialise(windowHnd, renderWindow->getWidth(), renderWindow->getHeight(), true);
-        // Configure master input state with a KeyBinder
+
+        masterInputState_ = InputManager::getInstance().createInputState<SimpleInputState>("master", true);
         masterKeyBinder_ = new KeyBinder();
         masterKeyBinder_->loadBindings("masterKeybindings.ini");
-        inputManager_->getMasterInputState()->addKeyHandler(masterKeyBinder_);
+        masterInputState_->setKeyHandler(masterKeyBinder_);
 
         // Load the InGameConsole
@@ -103 +105 @@
         guiManager_ = new GUIManager();
         guiManager_->initialise(renderWindow);
+
+        InputManager::getInstance().requestEnterState("master");
     }
 
     void GSGraphics::leave()
     {
+        if (Core::showsGraphics())
+            InputManager::getInstance().requestLeaveState("master");
+
         delete this->guiManager_;
 
@@ -119 +126 @@
 
         delete graphicsManager_;
+
+        if (Core::showsGraphics())
+        {
+            masterInputState_->setHandler(0);
+            InputManager::getInstance().requestDestroyState("master");
+            if (this->masterKeyBinder_)
+            {
+                delete this->masterKeyBinder_;
+                this->masterKeyBinder_ = 0;
+            }
+        }
     }
 

code/branches/gui/src/orxonox/gamestates/GSGraphics.h

@@ -65 +65 @@
 
         KeyBinder*            masterKeyBinder_;
+        SimpleInputState*     masterInputState_;
         XMLFile*              debugOverlay_;
     };

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

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