Changeset 6722 for code/branches/gamestates2/src

Timestamp:

Apr 13, 2010, 6:17:51 PM (15 years ago)

Author:

rgrieder

Message:

Renamed showGUI and hideGUI to showMenuSheet and hideMenuSheet.

Location:

code/branches/gamestates2/src

Files:

• libraries/core/GUIManager.cc (modified) (3 diffs)
• libraries/core/GUIManager.h (modified) (1 diff)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• orxonox/overlays/GUISheet.cc (modified) (1 diff)

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

@@ -226 +226 @@
 
         The function executes the Lua function with the same name in case the GUIManager is ready.
-        For more details check out loadGUI_2.lua where the function presides.
-    */
-    /*static*/ void GUIManager::showGUI(const std::string& name, bool hidePrevious, bool showCursor)
-    {
-        GUIManager::getInstance().executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ")");
+    */
+    /*static*/ void GUIManager::showGUI(const std::string& name, bool bHidePrevious)
+    {
+        GUIManager::getInstance().executeCode("showMenuSheet(\"" + name + "\", " + multi_cast<std::string>(bHidePrevious) + ")");
     }
 
@@ -237 +236 @@
         Hack-ish. Needed for GUIOverlay.
     */
-    void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious, bool showCursor)
-    {
-        this->executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ", " + ptr + ")");
+    void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool bHidePrevious)
+    {
+        this->executeCode("showMenuSheet(\"" + name + "\", " + multi_cast<std::string>(bHidePrevious) + ", " + ptr + ")");
     }
 
@@ -250 +249 @@
     /*static*/ void GUIManager::hideGUI(const std::string& name)
     {
-        GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
+        GUIManager::getInstance().executeCode("hideMenuSheet(\"" + name + "\")");
     }
 

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

@@ -75 +75 @@
 
         void loadGUI(const std::string& name);
-        static void showGUI(const std::string& name, bool hidePrevious=false, bool showCursor=true);
-        void showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious=false, bool showCursor=true);
+        static void showGUI(const std::string& name, bool bHidePrevious = false);
+        void showGUIExtra(const std::string& name, const std::string& ptr, bool bHidePrevious = false);
         static void hideGUI(const std::string& name);
         void keyESC();

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

@@ -85 +85 @@
     {
         // show main menu
-        GUIManager::getInstance().showGUI("MainMenu", true, GraphicsManager::getInstance().isFullScreen());
+        GUIManager::getInstance().showGUI("MainMenu", true);
         GUIManager::getInstance().setCamera(this->camera_);
         GUIManager::getInstance().setBackground("MainMenuBackground");

code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc

@@ -65 +65 @@
     void GUISheet::show()
     {
-        GUIManager::showGUI(this->script_, this->bHidePrevious_, this->bShowCursor_);
+        GUIManager::showGUI(this->script_, this->bHidePrevious_);
     }