Changeset 8078 for code/branches/usability

Timestamp:

Mar 15, 2011, 9:09:58 PM (14 years ago)

Author:

dafrick

Message:

Reverting changes made in revision 8035, that based the menu navigation on console commands, due to implemential difficulties of the hacks to make menu navigation work fully.
So, at the moment, we'll have to make due with the old version of the menu navigation implementation.

Location:

code/branches/usability

Files:

• data/defaultConfig/keybindings.ini (modified) (5 diffs)
• data/gui/scripts/GUISheet.lua (modified) (2 diffs)
• data/gui/scripts/GraphicsMenu.lua (modified) (1 diff)
• data/gui/scripts/MenuSheet.lua (modified) (1 diff)
• data/gui/scripts/SheetManager.lua (modified) (6 diffs)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)
• src/libraries/core/GUIManager.h (modified) (2 diffs)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• src/orxonox/overlays/InGameConsole.cc (modified) (3 diffs)

code/branches/usability/data/defaultConfig/keybindings.ini

@@ -19 +19 @@
 KeyDelete="scale 1 rotateRoll"
 KeyDivide=
-KeyDown="scale -1 moveFrontBack | navigateGUI down"
+KeyDown="scale -1 moveFrontBack"
 KeyE="scale -1 rotateRoll"
 KeyEnd=boost
@@ -52 +52 @@
 KeyKanji=
 KeyL=
-KeyLeft="scale -1 moveRightLeft | navigateGUI left"
+KeyLeft="scale -1 moveRightLeft"
 KeyLeftAlt=
 KeyLeftBracket=
@@ -93 +93 @@
 KeyNumpadAdd=
 KeyNumpadComma=
-KeyNumpadEnter="navigateGUI enter"
+KeyNumpadEnter=
 KeyNumpadEquals=
 KeyNumpadPeriod=
@@ -108 +108 @@
 KeyQ="scale 1 rotateRoll"
 KeyR="scale 1 moveUpDown"
-KeyReturn="navigateGUI enter"
-KeyRight="scale 1 moveRightLeft | navigateGUI right"
+KeyReturn=
+KeyRight="scale 1 moveRightLeft"
 KeyRightAlt=
 KeyRightBracket=
@@ -126 +126 @@
 KeyTab="NewHumanController changeMode"
 KeyU=""
-KeyUP="scale 1 moveFrontBack | navigateGUI up"
+KeyUP="scale 1 moveFrontBack"
 KeyUnassigned="InGameConsole openConsole"
 KeyUnderline=

code/branches/usability/data/gui/scripts/GUISheet.lua

@@ -29 +29 @@
 
 -- Override this function if you want to react on keystrokes
-function P:onKeyPressed(mode)
+function P:onKeyPressed()
 end
 
@@ -85 +85 @@
 
 -- Handles key pressed while the gui sheed is displayed
-function P:keyPressed(mode)
+function P:keyPressed()
     if self.buttons then
-        if mode == "down" then     -- key down
+        if code == "208" then     -- key down
             self:moveSelectionRow(1)
-        elseif mode == "up" then -- key up
+        elseif code == "200" then -- key up
             self:moveSelectionRow(-1)
-        elseif mode == "right" then -- key right
+        elseif code == "205" then -- key right
             self:moveSelectionColumn(1)
-        elseif mode == "left" then -- key left
+        elseif code == "203" then -- key left
             self:moveSelectionColumn(-1)
-        elseif mode == "enter" then -- key enter or key numpad enter
+        elseif code == "28" or code == "156"  then -- key enter or key numpad enter
             self:pressSelectedButton()
         end
     end
 
-    self:onKeyPressed(mode)
+    self:onKeyPressed()
 end
 

code/branches/usability/data/gui/scripts/GraphicsMenu.lua

@@ -1 +1 @@
 -- GraphicsMenu.lua
 
-local P = createMenuSheet("GraphicsMenu", true, TriBool.True, TriBool.True)
+local P = createMenuSheet("GraphicsMenu")
 
 P.resolutionList = {"custom", "640 x 480", "720 x 480", "720 x 576", "800 x 600", "1024 x 600", "1024 x 768", "1152 x 864", "1280 x 720", "1280 x 800", "1280 x 960", "1280 x 1024", "1360 x 768", "1440 x 900", "1600 x 900", "1600 x 1200", "1680 x 1050"}

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

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

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

@@ -5 +5 @@
 local activeMenuSheets = {size = 0, topSheetTuple = nil}
 local menuSheetsRoot = guiMgr:getMenuRootWindow()
+local bInGameConsoleClosed = false
 local mainMenuLoaded = false
---orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
+orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "KeyDown", "keyPressed")
 orxonox.GUIManager:subscribeEventHelper(menuSheetsRoot, "Sized", "windowResized")
 
@@ -131 +132 @@
     if previous and previous.pressedEnter and menuSheet:hasSelection() == false then
         menuSheet:setSelectionNear(1, 1)
-    end
-
-    if activeMenuSheets.size > 0 then
-        guiMgr:guisActiveChanged(true)
     end
 
@@ -207 +204 @@
     end
 
-    if activeMenuSheets.size == 0 then
-        guiMgr:guisActiveChanged(false)
-    end
-
     sheetTuple.sheet:quit()
 end
@@ -224 +217 @@
     -- HUGE, very HUGE hacks!
 
-    -- Count the number of sheets that don't need input until the first that does.
+    -- If the InGameConsole is active, ignore the ESC command.
+    if bInGameConsoleClosed == true then
+        bInGameConsoleClosed = false
+        return
+    end
+
+    -- Count the number of sheets that don't need input till the first that does.
     local counter = noInputSheetIndex()
 
@@ -238 +237 @@
 end
 
--- Function to navigate the GUI, is called by the GUIManager, whenever a relevant key is pressed.
--- The mode specifies the action to be taken.
-function navigateGUI(mode)
+function keyPressed(e)
+    local we = tolua.cast(e, "CEGUI::KeyEventArgs")
     local sheet = activeMenuSheets[activeMenuSheets.size]
-    sheet.sheet:keyPressed(mode)
+    code = tostring(we.scancode)
+    -- Some preprocessing
+    if not mainMenuLoaded and not sheet.bNoInput then
+        if code == "1" then
+            keyESC()
+        elseif code == "0"then
+            orxonox.CommandExecutor:execute("InGameConsole openConsole")
+        end
+    end
+    sheet.sheet:keyPressed()
 end
 
@@ -286 +293 @@
     end
     return counter
+end
+
+function inGameConsoleClosed()
+    bInGameConsoleClosed = not bInGameConsoleClosed;
 end
 

code/branches/usability/src/libraries/core/GUIManager.cc

@@ -103 +103 @@
     /*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen";
 
-    static const std::string __CC_navigateGUI_name = "navigateGUI";
-
     SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);
     SetConsoleCommand("hideGUI", &GUIManager::hideGUI);
     SetConsoleCommand("toggleGUI", &GUIManager::toggleGUI).defaultValue(1, false).defaultValue(2, false);
-    SetConsoleCommand(__CC_navigateGUI_name, &GUIManager::navigateGUI).deactivate();
-
-    //! Strings that specify modes for the GUI navigation.
-    /*static*/ const std::string GUIManager::NAVIGATE_UP = "up";
-    /*static*/ const std::string GUIManager::NAVIGATE_DOWN = "down";
-    /*static*/ const std::string GUIManager::NAVIGATE_LEFT = "left";
-    /*static*/ const std::string GUIManager::NAVIGATE_RIGHT = "right";
-    /*static*/ const std::string GUIManager::NAVIGATE_ENTER = "enter";
 
     /**
@@ -374 +364 @@
             this->rootWindow_->setProperty("Alpha", "1.0");
         this->rootWindow_->setProperty("Image", image);
-    }
-
-    /**
-    @brief
-        Method to navigate the GUI, by specifying the mode of navigation.
-    @param mode
-        The mode of navigation, at this point can be either 'up', 'down', 'left', 'right' or 'enter'.
-    */
-    /*static*/ void GUIManager::navigateGUI(const std::string& mode)
-    {
-        if(mode == NAVIGATE_UP)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_UP + "\")");
-        else if(mode == NAVIGATE_DOWN)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_DOWN + "\")");
-        else if(mode == NAVIGATE_LEFT)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_LEFT + "\")");
-        else if(mode == NAVIGATE_RIGHT)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_RIGHT + "\")");
-        else if(mode == NAVIGATE_ENTER)
-            GUIManager::getInstance().executeCode("navigateGUI(\"" + NAVIGATE_ENTER + "\")");
-    }
-
-    /**
-    @brief
-        Is called by lua to change whether there are any GUIs active at the moment.
-    @param active
-        Whether GUIs are active.
-    */
-    void GUIManager::guisActiveChanged(bool active)
-    {
-        if(this->GUIsActive_ == active)
-            return;
-        this->GUIsActive_ = active;
-        if(this->GUIsActive_)
-            ModifyConsoleCommand(__CC_navigateGUI_name).activate();
-        else
-            ModifyConsoleCommand(__CC_navigateGUI_name).deactivate();
     }
 

code/branches/usability/src/libraries/core/GUIManager.h

@@ -95 +95 @@
         void setBackgroundImage(const std::string& image);
 
-        static void navigateGUI(const std::string& mode);
-        void guisActiveChanged(bool active); // tolua_export
-
         /**
         @brief Helper method to get the developer's mode without having to export Core.h.
@@ -134 +131 @@
         template <typename FunctionType>
         bool protectedCall(FunctionType function);
-
-        static const std::string NAVIGATE_UP;
-        static const std::string NAVIGATE_DOWN;
-        static const std::string NAVIGATE_LEFT;
-        static const std::string NAVIGATE_RIGHT;
-        static const std::string NAVIGATE_ENTER;
-
-        bool GUIsActive_; //!< Whether there are any GUIs active at a given moment.
 
         // keyHandler functions

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

@@ -68 +68 @@
         RegisterRootObject(GSMainMenu);
 
-        InputManager::getInstance().createInputState("MainMenuHackery")->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
+        InputManager::getInstance().createInputState("MainMenuHackery", true, true)->setKeyHandler(KeyBinderManager::getInstance().getDefaultAsHandler());
 
         // create an empty Scene

code/branches/usability/src/orxonox/overlays/InGameConsole.cc

@@ -49 +49 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/command/ConsoleCommand.h"
+#include "core/GUIManager.h"
 #include "core/input/InputManager.h"
 #include "core/input/InputState.h"
@@ -533 +534 @@
         {
             this->bActive_ = false;
+            GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()"); // Notify the SheetManager in lua, that the console has been closed.
             InputManager::getInstance().leaveState("console");
             this->shell_->unregisterListener(this);
@@ -609 +611 @@
     /*static*/ void InGameConsole::closeConsole()
     {
+        GUIManager::getInstance().getLuaState()->doString("inGameConsoleClosed()");  // Notify the SheetManager in lua, that the console has been closed, but not by ESC.
         InGameConsole::getInstance().deactivate();
     }