[Orxonox-commit 2005] r6722 - in code/branches/gamestates2: data/gui/scripts src/libraries/core src/orxonox/gamestates src/orxonox/overlays
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Apr 13 18:17:51 CEST 2010
Author: rgrieder
Date: 2010-04-13 18:17:51 +0200 (Tue, 13 Apr 2010)
New Revision: 6722
Modified:
code/branches/gamestates2/data/gui/scripts/AudioMenu.lua
code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua
code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua
code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua
code/branches/gamestates2/data/gui/scripts/GUITools.lua
code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua
code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua
code/branches/gamestates2/data/gui/scripts/InGameMenu.lua
code/branches/gamestates2/data/gui/scripts/InfoPopup.lua
code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua
code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua
code/branches/gamestates2/data/gui/scripts/MainMenu.lua
code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua
code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua
code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua
code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua
code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua
code/branches/gamestates2/src/libraries/core/GUIManager.cc
code/branches/gamestates2/src/libraries/core/GUIManager.h
code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc
code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc
Log:
Renamed showGUI and hideGUI to showMenuSheet and hideMenuSheet.
Modified: code/branches/gamestates2/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/AudioMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/AudioMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -168,7 +168,7 @@
end
function P.AudioBackButton_clicked(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/ControlsMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -3,15 +3,15 @@
local P = createMenuSheet("ControlsMenu")
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
return P
Modified: code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/CreditsMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -3,7 +3,7 @@
local P = createMenuSheet("CreditsMenu")
function P.CreditsBackButton_clicked(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/DecisionPopup.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -15,14 +15,14 @@
if P.functionPtr ~= nil then
P.functionPtr(true)
end
- hideGUI("DecisionPopup")
+ hideMenuSheet("DecisionPopup")
end
function P.button_no(e)
if P.functionPtr ~= nil then
P.functionPtr(false)
end
- hideGUI("DecisionPopup")
+ hideMenuSheet("DecisionPopup")
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/GUITools.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/GUITools.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/GUITools.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -14,13 +14,13 @@
end
function openDecisionPopup( text, callbackPtr )
- showGUI("DecisionPopup", false, true)
+ showMenuSheet("DecisionPopup", false, true)
DecisionPopup.setCallback(callbackPtr)
DecisionPopup.setText(text)
end
function openInfoPopup(text, functionPtr, closeButton, arguments)
- showGUI("InfoPopup", false, true)
+ showMenuSheet("InfoPopup", false, true)
InfoPopup.execute(functionPtr, arguments)
InfoPopup.setText(text)
InfoPopup.setCloseButton(closeButton)
Modified: code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/GameplayMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -36,7 +36,7 @@
end
function P.GameplayBackButton_clicked(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/GraphicsMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -191,7 +191,7 @@
end
function P.GraphicsBackButton_clicked(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/InGameMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/InGameMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/InGameMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -11,20 +11,20 @@
orxonox.Game:getInstance():popState()
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
end
Modified: code/branches/gamestates2/data/gui/scripts/InfoPopup.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/InfoPopup.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/InfoPopup.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -28,7 +28,7 @@
-- events for ingamemenu
function P.close(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/InitialiseGUI.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -74,14 +74,14 @@
------------------------
-- ?
-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
end
-- 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)
if not menuSheet then
@@ -102,7 +102,7 @@
-- Hide if already displayed (to make sure it is up front in the end)
if activeMenuSheets[name] ~= nil then
- hideGUI(name)
+ hideMenuSheet(name)
end
-- Add the sheet in a tuple of additional information
@@ -145,7 +145,7 @@
return menuSheet
end
-function hideGUI(name)
+function hideMenuSheet(name)
local sheetTuple = activeMenuSheets[name]
if sheetTuple == nil then
return
@@ -205,9 +205,9 @@
end
-- 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
@@ -216,9 +216,9 @@
if activeMenuSheets.size == 1 and activeMenuSheets[1].sheet.name == "MainMenu" then
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
Modified: code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/KeyBindMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -243,7 +243,7 @@
end
function P.KeyBindBackButton_clicked(e)
- hideGUI("KeyBindMenu")
+ hideMenuSheet("KeyBindMenu")
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/MainMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/MainMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -8,19 +8,19 @@
end
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
function P.ExitButton_clicked(e)
Modified: code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/MouseControlsMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -94,7 +94,7 @@
end
function P.MouseControlsBackButton_clicked(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/MultiplayerMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -61,12 +61,12 @@
if choice then
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
return P
Modified: code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -3,7 +3,7 @@
local P = createMenuSheet("MultiplayerOptionsMenu")
function P.MultiplayerOptionsBackButton_clicked(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/SettingsMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -3,23 +3,23 @@
local P = createMenuSheet("SettingsMenu")
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
function P.SettingsResetSettingsButton_clicked(e)
@@ -28,7 +28,7 @@
end
function P.SettingsBackButton_clicked(e)
- hideGUI(P.name)
+ hideMenuSheet(P.name)
end
return P
Modified: code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/data/gui/scripts/SingleplayerMenu.lua 2010-04-13 16:17:51 UTC (rev 6722)
@@ -33,12 +33,12 @@
if choice then
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
return P
Modified: code/branches/gamestates2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/gamestates2/src/libraries/core/GUIManager.cc 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/src/libraries/core/GUIManager.cc 2010-04-13 16:17:51 UTC (rev 6722)
@@ -225,20 +225,19 @@
The name of the GUI
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)
+ /*static*/ void GUIManager::showGUI(const std::string& name, bool bHidePrevious)
{
- GUIManager::getInstance().executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ")");
+ GUIManager::getInstance().executeCode("showMenuSheet(\"" + name + "\", " + multi_cast<std::string>(bHidePrevious) + ")");
}
/**
@brief
Hack-ish. Needed for GUIOverlay.
*/
- void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool hidePrevious, bool showCursor)
+ void GUIManager::showGUIExtra(const std::string& name, const std::string& ptr, bool bHidePrevious)
{
- this->executeCode("showGUI(\"" + name + "\", " + multi_cast<std::string>(hidePrevious) + ", " + multi_cast<std::string>(showCursor) + ", " + ptr + ")");
+ this->executeCode("showMenuSheet(\"" + name + "\", " + multi_cast<std::string>(bHidePrevious) + ", " + ptr + ")");
}
/**
@@ -249,7 +248,7 @@
*/
/*static*/ void GUIManager::hideGUI(const std::string& name)
{
- GUIManager::getInstance().executeCode("hideGUI(\"" + name + "\")");
+ GUIManager::getInstance().executeCode("hideMenuSheet(\"" + name + "\")");
}
const std::string& GUIManager::createInputState(const std::string& name, TriBool::Value showCursor, TriBool::Value useKeyboard, bool bBlockJoyStick)
Modified: code/branches/gamestates2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/gamestates2/src/libraries/core/GUIManager.h 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/src/libraries/core/GUIManager.h 2010-04-13 16:17:51 UTC (rev 6722)
@@ -74,8 +74,8 @@
void preUpdate(const Clock& time);
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();
void setBackground(const std::string& name);
Modified: code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/src/orxonox/gamestates/GSMainMenu.cc 2010-04-13 16:17:51 UTC (rev 6722)
@@ -84,7 +84,7 @@
void GSMainMenu::activate()
{
// 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");
// GUIManager::getInstance().setBackground("");
Modified: code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc
===================================================================
--- code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc 2010-04-13 15:58:55 UTC (rev 6721)
+++ code/branches/gamestates2/src/orxonox/overlays/GUISheet.cc 2010-04-13 16:17:51 UTC (rev 6722)
@@ -64,7 +64,7 @@
void GUISheet::show()
{
- GUIManager::showGUI(this->script_, this->bHidePrevious_, this->bShowCursor_);
+ GUIManager::showGUI(this->script_, this->bHidePrevious_);
}
void GUISheet::hide()
More information about the Orxonox-commit
mailing list