Changeset 6722 for code/branches

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

Files:

• data/gui/scripts/AudioMenu.lua (modified) (1 diff)
• data/gui/scripts/ControlsMenu.lua (modified) (1 diff)
• data/gui/scripts/CreditsMenu.lua (modified) (1 diff)
• data/gui/scripts/DecisionPopup.lua (modified) (2 diffs)
• data/gui/scripts/GUITools.lua (modified) (2 diffs)
• data/gui/scripts/GameplayMenu.lua (modified) (1 diff)
• data/gui/scripts/GraphicsMenu.lua (modified) (1 diff)
• data/gui/scripts/InGameMenu.lua (modified) (1 diff)
• data/gui/scripts/InfoPopup.lua (modified) (1 diff)
• data/gui/scripts/InitialiseGUI.lua (modified) (6 diffs)
• data/gui/scripts/KeyBindMenu.lua (modified) (1 diff)
• data/gui/scripts/MainMenu.lua (modified) (1 diff)
• data/gui/scripts/MouseControlsMenu.lua (modified) (1 diff)
• data/gui/scripts/MultiplayerMenu.lua (modified) (1 diff)
• data/gui/scripts/MultiplayerOptionsMenu.lua (modified) (1 diff)
• data/gui/scripts/SettingsMenu.lua (modified) (2 diffs)
• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (3 diffs)
• src/libraries/core/GUIManager.h (modified) (1 diff)
• src/orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)
• src/orxonox/overlays/GUISheet.cc (modified) (1 diff)

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

@@ -169 +169 @@
 
 function P.AudioBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -4 +4 @@
 
 function P.ControlsMouseControlsButton_clicked(e)
-    showGUI("MouseControlsMenu", true)
+    showMenuSheet("MouseControlsMenu", true)
 end
 
 function P.ControlsKeyboardControlsButton_clicked(e)
-    showGUI("KeyBindMenu", true)
+    showMenuSheet("KeyBindMenu", true)
 end
 
 function P.ControlsBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -4 +4 @@
 
 function P.CreditsBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -16 +16 @@
         P.functionPtr(true)
     end
-    hideGUI("DecisionPopup")
+    hideMenuSheet("DecisionPopup")
 end
 
@@ -23 +23 @@
         P.functionPtr(false)
     end
-    hideGUI("DecisionPopup")
+    hideMenuSheet("DecisionPopup")
 end
 

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

@@ -15 +15 @@
 
 function openDecisionPopup( text, callbackPtr )
-    showGUI("DecisionPopup", false, true)
+    showMenuSheet("DecisionPopup", false, true)
     DecisionPopup.setCallback(callbackPtr)
     DecisionPopup.setText(text)
@@ -21 +21 @@
 
 function openInfoPopup(text, functionPtr, closeButton, arguments)
-    showGUI("InfoPopup", false, true)
+    showMenuSheet("InfoPopup", false, true)
     InfoPopup.execute(functionPtr, arguments)
     InfoPopup.setText(text)

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

@@ -37 +37 @@
 
 function P.GameplayBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -192 +192 @@
 
 function P.GraphicsBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -12 +12 @@
     orxonox.Game:getInstance():popState()
     orxonox.Game:getInstance():requestState("mainmenu")
-    hideGUI("InGameMenu")
+    hideMenuSheet("InGameMenu")
 end
 
 function P.button_settings_clicked(e)
-    showGUI("SettingsMenu", true)
+    showMenuSheet("SettingsMenu", true)
 end
 
 function P.button_return_clicked(e)
-    hideGUI("InGameMenu")
+    hideMenuSheet("InGameMenu")
 end
 
 function P.callback(doExit)
     if doExit then
-        hideGUI("InGameMenu")
+        hideMenuSheet("InGameMenu")
         orxonox.execute("exit")
     end

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

@@ -29 +29 @@
 -- events for ingamemenu
 function P.close(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -75 +75 @@
 
 -- ?
-function showGUI(name, bHidePrevious, ptr)
-    local sheet = showGUI(name, bHidePrevious)
+function showMenuSheet(name, bHidePrevious, ptr)
+    local sheet = showMenuSheet(name, bHidePrevious)
     sheet.overlay = ptr
     return sheet
@@ -82 +82 @@
 
 -- Shows the specified menu sheet and loads it if neccessary
-function showGUI(name, bHidePrevious)
+function showMenuSheet(name, bHidePrevious)
     -- Get sheet (or load it)
     local menuSheet = loadSheet(name)
@@ -103 +103 @@
     -- Hide if already displayed (to make sure it is up front in the end)
     if activeMenuSheets[name] ~= nil then
-        hideGUI(name)
+        hideMenuSheet(name)
     end
 
@@ -146 +146 @@
 end
 
-function hideGUI(name)
+function hideMenuSheet(name)
     local sheetTuple = activeMenuSheets[name]
     if sheetTuple == nil then
@@ -206 +206 @@
 
 -- Hides all menu GUI sheets
-function hideAllGUIs()
+function hideAllMenuSheets()
     while activeMenuSheets.size ~= 0 do
-        hideGUI(activeMenuSheets.topSheetTuple.sheet.name)
+        hideMenuSheet(activeMenuSheets.topSheetTuple.sheet.name)
     end
 end
@@ -217 +217 @@
         orxonox.execute("exit")
     elseif activeMenuSheets.size > 0 then
-        orxonox.execute("hideGUI "..activeMenuSheets.topSheetTuple.sheet.name)
+        orxonox.execute("hideMenuSheet "..activeMenuSheets.topSheetTuple.sheet.name)
     else
-        showGUI("InGameMenu")
+        showMenuSheet("InGameMenu")
     end
 end

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

@@ -244 +244 @@
 
 function P.KeyBindBackButton_clicked(e)
-    hideGUI("KeyBindMenu")
+    hideMenuSheet("KeyBindMenu")
 end
 

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

@@ -9 +9 @@
 
 function P.SingleplayerButton_clicked(e)
-    showGUI("SingleplayerMenu", true)
+    showMenuSheet("SingleplayerMenu", true)
 end
 
 function P.MultiplayerButton_clicked(e)
-    showGUI("MultiplayerMenu", true)
+    showMenuSheet("MultiplayerMenu", true)
 end
 
 function P.SettingsButton_clicked(e)
-    showGUI("SettingsMenu", true)
+    showMenuSheet("SettingsMenu", true)
 end
 
 function P.CreditsButton_clicked(e)
-    showGUI("CreditsMenu", true)
+    showMenuSheet("CreditsMenu", true)
 end
 

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

@@ -95 +95 @@
 
 function P.MouseControlsBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -62 +62 @@
         orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
         orxonox.execute(multiplayerMode)
-        hideAllGUIs()
+        hideAllMenuSheets()
     end
 end
 
 function P.MultiplayerBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -4 +4 @@
 
 function P.MultiplayerOptionsBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -4 +4 @@
 
 function P.SettingsGameplayButton_clicked(e)
-    showGUI("GameplayMenu", true)
+    showMenuSheet("GameplayMenu", true)
 end
 
 function P.SettingsMultiplayerOptionsButton_clicked(e)
-    showGUI("MultiplayerOptionsMenu", true)
+    showMenuSheet("MultiplayerOptionsMenu", true)
 end
 
 function P.SettingsControlsButton_clicked(e)
-    showGUI("ControlsMenu", true)
+    showMenuSheet("ControlsMenu", true)
 end
 
 function P.SettingsGraphicsButton_clicked(e)
-    showGUI("GraphicsMenu", true)
+    showMenuSheet("GraphicsMenu", true)
 end
 
 function P.SettingsAudioButton_clicked(e)
-    showGUI("AudioMenu", true)
+    showMenuSheet("AudioMenu", true)
 end
 
@@ -29 +29 @@
 
 function P.SettingsBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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

@@ -34 +34 @@
         orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
         orxonox.execute("startGame")
-        hideAllGUIs()
+        hideAllMenuSheets()
     end
 end
 
 function P.SingleplayerBackButton_clicked(e)
-    hideGUI(P.name)
+    hideMenuSheet(P.name)
 end
 

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_);
     }