Changeset 6743 for code/branches/gamestates2

Timestamp:

Apr 16, 2010, 1:07:57 PM (15 years ago)

Author:

rgrieder

Message:

• Bugfix in keyESC.
• Default behaviour for GUI sheet InputStates is now not to handle keyboard input —> KeyBinder is used.
• Added some temporary hackery to GSMainMenu to enable the use of Keys in the MainMenu.

Location:

code/branches/gamestates2

Files:

• data/gui/scripts/MenuSheet.lua (modified) (1 diff)
• data/gui/scripts/SheetManager.lua (modified) (1 diff)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (5 diffs)

code/branches/gamestates2/data/gui/scripts/MenuSheet.lua

@@ -16 +16 @@
     newSheet.bHidePrevious  = handleDefArg(_bHidePrevious,  true)
     newSheet.tShowCursor    = handleDefArg(_tShowCusor,     TriBool.True)
-    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.True)
+    newSheet.tUseKeyboard   = handleDefArg(_tUseKeyboard,   TriBool.Dontcare)
     newSheet.bBlockJoyStick = handleDefArg(_bBlockJoyStick, false)
 

code/branches/gamestates2/data/gui/scripts/SheetManager.lua

@@ -181 +181 @@
         orxonox.execute("exit")
     elseif activeMenuSheets.size > 0 then
-        orxonox.execute("hideMenuSheet "..activeMenuSheets.topSheetTuple.sheet.name)
+        orxonox.execute("hideGUI "..activeMenuSheets.topSheetTuple.sheet.name)
     else
         showMenuSheet("InGameMenu")

code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc

@@ -40 +40 @@
 #include "Scene.h"
 #include "sound/AmbientSound.h"
+// HACK
+#include "core/input/InputManager.h"
+#include "core/input/InputState.h"
 
 namespace orxonox
@@ -49 +52 @@
     {
         RegisterRootObject(GSMainMenu);
+
+        InputManager::getInstance().createInputState("MainMenuHackery")->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
 
         // create an empty Scene
@@ -68 +73 @@
             this->ambient_->destroy();
 
+        InputManager::getInstance().destroyState("MainMenuHackery");
+
         this->scene_->getSceneManager()->destroyCamera(this->camera_);
         this->scene_->destroy();
@@ -79 +86 @@
         GUIManager::getInstance().setBackgroundImage("MainMenuBackground", "Background");
         GraphicsManager::getInstance().setCamera(this->camera_);
+
+        InputManager::getInstance().enterState("MainMenuHackery");
 
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSMainMenu::startStandalone), "startGame"));
@@ -106 +115 @@
             this->ambient_->stop();
         }
+
+        InputManager::getInstance().leaveState("MainMenuHackery");
 
         GUIManager::getInstance().setCamera(0);