Changeset 6048 for code/branches

Timestamp:

Nov 12, 2009, 11:32:41 AM (15 years ago)

Author:

scheusso

Message:

ESC handling in ingame menu: if theres already an opened GUI sheet then hide it, if not open the ingame menu
in mainmenu everything should remain the same

Location:

code/branches/menu

Files:

• data/defaultConfig/keybindings.ini (modified) (1 diff)
• data/gui/scripts/InGameMenu.lua (modified) (2 diffs)
• data/gui/scripts/InitialiseGUI.lua (modified) (3 diffs)
• src/libraries/core/GUIManager.cc (modified) (2 diffs)
• src/libraries/core/GUIManager.h (modified) (2 diffs)
• src/libraries/core/Game.cc (modified) (3 diffs)
• src/libraries/core/Game.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (3 diffs)
• src/orxonox/gamestates/GSLevel.h (modified) (2 diffs)

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

@@ -23 +23 @@
 KeyEnd=boost
 KeyEquals=
-KeyEscape="exit"
+KeyEscape="toggleIngameGUI"
 KeyF="scale -1 moveUpDown"
 KeyF1="OverlayGroup toggleVisibility Debug"

code/branches/menu/data/gui/scripts/InGameMenu.lua

@@ -18 +18 @@
 -- events for ingamemenu
 function P.button_quit_clicked(e)
-    orxonox.CommandExecutor:execute("hideGUI InGameMenu")
-    orxonox.CommandExecutor:execute("exit")
+    openDecisionPopup( "Do you really want to quit the game?", InGameMenu.callback )
 end
 
@@ -34 +33 @@
 end
 
+function P.callback(doExit)
+    if doExit then
+        orxonox.CommandExecutor:execute("hideGUI InGameMenu")
+        orxonox.CommandExecutor:execute("exit")
+    end
+end
+
 return P
 

code/branches/menu/data/gui/scripts/InitialiseGUI.lua

@@ -21 +21 @@
 bHidePrevious = {}
 
+-- Require all tools
+require("GUITools")
+
 -- loads the GUI with the specified filename
 -- be sure to set the global variable "filename" before calling this function
@@ -28 +31 @@
     if loadedGui == nil then
         loadedGuiNS = require(filename)
+        if loadedGuiNS == nil then
+            return
+        end
         loadedGui = loadedGuiNS:load()
         loadedGUIs[filename] = loadedGui
@@ -147 +153 @@
 end
 
+function keyESC()
+    orxonox.CommandExecutor:execute("hideGUI "..activeSheets[nrOfActiveSheets])
+end
+
 function setBackground(filename)
     local newroot

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

@@ -108 +108 @@
         , resourceProvider_(0)
         , camera_(NULL)
+        , bShowIngameGUI_(false)
     {
         using namespace CEGUI;
@@ -251 +252 @@
         }
     }
+
+    void GUIManager::toggleIngameGUI()
+    {
+        if ( this->bShowIngameGUI_==false )
+        {
+            GUIManager::showGUI("InGameMenu");
+            this->bShowIngameGUI_ = true;
+        }
+        else
+        {
+            GUIManager::hideGUI("InGameMenu");
+            this->bShowIngameGUI_ = false;
+        }
+    }
     
-    void GUIManager::setToggleMode(const bool& mode)
-    {
-        this->bToggleMode_ = mode;
-        this->executeCode("setToggleMode(" + multi_cast<std::string>(mode) + ")");
+    void GUIManager::keyESC()
+    {
+        if( this->showingGUIs_.size() == 0 )
+            this->showGUI("InGameMenu");
+        else
+            this->executeCode("keyESC()");
     }
     

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

@@ -71 +71 @@
         void showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious=false, bool showCursor=true);
         static void hideGUI(const std::string& name);
-        void setToggleMode(const bool& mode);
+        void toggleIngameGUI();
+        void keyESC();
         void setBackground(const std::string& name);
 
@@ -113 +114 @@
 
         static GUIManager*                   singletonPtr_s;    //!< Singleton reference to GUIManager
-        bool                                 bToggleMode_;
+        bool                                 bShowIngameGUI_;
 
     };

code/branches/menu/src/libraries/core/Game.cc

@@ -51 +51 @@
 #include "GameMode.h"
 #include "GameState.h"
+#include "GUIManager.h"
 
 namespace orxonox
@@ -57 +58 @@
         { Game::getInstance().stop(); }
     SetConsoleCommandShortcutExternAlias(stop_game, "exit");
+    static void key_esc()
+        { Game::getInstance().keyESC(); }
+    SetConsoleCommandShortcutExternAlias(key_esc, "keyESC");
     static void printFPS()
         { COUT(0) << Game::getInstance().getAvgFPS() << std::endl; }
@@ -354 +358 @@
     }
 
+    void Game::keyESC()
+    {
+        if( this->getState("mainMenu") && this->getState("mainMenu")->getActivity().active==true )
+            this->stop();
+        else
+            GUIManager::getInstance().keyESC();
+    }
+
     void Game::stop()
     {

code/branches/menu/src/libraries/core/Game.h

@@ -98 +98 @@
         void run();
         void stop();
+        void keyESC();
 
         static Game& getInstance(){ return Singleton<Game>::getInstance(); } // tolua_export

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

@@ -56 +56 @@
         , guiKeysOnlyInputState_(0)
         , startFile_(0)
+        , bShowIngameGUI_(false)
     {
     }
@@ -78 +79 @@
             guiKeysOnlyInputState_ = InputManager::getInstance().createInputState("guiKeysOnly");
             guiKeysOnlyInputState_->setKeyHandler(GUIManager::getInstancePtr());
-
-            CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(createFunctor(&GSLevel::showIngameGUI, this), "showIngameGUI"));
         }
 
@@ -94 +93 @@
             // connect the HumanPlayer to the game
             PlayerManager::getInstance().clientConnected(0);
-        }
-    }
-
-    void GSLevel::showIngameGUI(bool show)
-    {
-        if (show)
-        {
-            GUIManager::showGUI("inGameTest");
-        }
-        else
-        {
-            GUIManager::hideGUI("inGameTest");
         }
     }

code/branches/menu/src/orxonox/gamestates/GSLevel.h

@@ -52 +52 @@
         void loadLevel();
         void unloadLevel();
-        void showIngameGUI(bool show);
 
         InputState*              gameInputState_;          //!< input state for normal ingame playing
@@ -60 +59 @@
         XMLFile* startFile_;
         std::set<BaseObject*> staticObjects_;
+        bool bShowIngameGUI_;
     };
 }