Changeset 1788 for code/trunk/src/orxonox

Timestamp:

Sep 15, 2008, 12:40:40 PM (16 years ago)

Author:

rgrieder

Message:

Added a master InputState that is always active (except of course in game state 'ioConsole' when there is no InputManager in the first place)
This is necessary to call the console whenever you like. The state is of 'extended' nature, so it can hold an arbitrary number of Handlers.
The KeyBinder however is not yet configured to manage multiple keybindings.ini —> next job

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSGraphics.cc (modified) (4 diffs)
• GSGraphics.h (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSGraphics.cc

@@ -46 +46 @@
 #include "core/CoreIncludes.h"
 #include "core/input/InputManager.h"
+#include "core/input/KeyBinder.h"
+#include "core/input/ExtendedInputState.h"
 #include "overlays/console/InGameConsole.h"
 #include "gui/GUIManager.h"
@@ -62 +64 @@
         , console_(0)
         , guiManager_(0)
+        , masterKeyBinder_(0)
         , frameCount_(0)
         , statisticsRefreshCycle_(0)
@@ -108 +111 @@
         this->renderWindow_->getCustomAttribute("WINDOW", &windowHnd);
         inputManager_->initialise(windowHnd, renderWindow_->getWidth(), renderWindow_->getHeight(), true);
+        // Configure master input state with a KeyBinder
+        //masterKeyBinder_ = new KeyBinder();
+        //inputManager_->getMasterInputState()->addKeyHandler(masterKeyBinder_);
 
         // Load the InGameConsole
@@ -135 +141 @@
         delete this->console_;
 
+        //inputManager_->getMasterInputState()->removeKeyHandler(this->masterKeyBinder_);
+        //delete this->masterKeyBinder_;
         delete this->inputManager_;
 

code/trunk/src/orxonox/gamestates/GSGraphics.h

@@ -77 +77 @@
         GUIManager*           guiManager_;
 
+        KeyBinder*            masterKeyBinder_;
+
         // variables for time statistics
         unsigned long         frameCount_;