Changeset 6048 for code/branches/menu/src/libraries

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/src/libraries/core

Files:

• GUIManager.cc (modified) (2 diffs)
• GUIManager.h (modified) (2 diffs)
• Game.cc (modified) (3 diffs)
• Game.h (modified) (1 diff)

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