[Orxonox-commit 1904] r6621 - code/branches/gamestate/data/gui/scripts
rgrieder at orxonox.net
rgrieder at orxonox.net
Fri Mar 26 20:51:38 CET 2010
Author: rgrieder
Date: 2010-03-26 20:51:37 +0100 (Fri, 26 Mar 2010)
New Revision: 6621
Modified:
code/branches/gamestate/data/gui/scripts/AudioMenu.lua
code/branches/gamestate/data/gui/scripts/BasicGUI.lua
code/branches/gamestate/data/gui/scripts/ControlsMenu.lua
code/branches/gamestate/data/gui/scripts/CreditsMenu.lua
code/branches/gamestate/data/gui/scripts/DecisionPopup.lua
code/branches/gamestate/data/gui/scripts/GUITools.lua
code/branches/gamestate/data/gui/scripts/GameplayMenu.lua
code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua
code/branches/gamestate/data/gui/scripts/InGameMenu.lua
code/branches/gamestate/data/gui/scripts/InfoPopup.lua
code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua
code/branches/gamestate/data/gui/scripts/MainMenu.lua
code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua
code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua
code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua
code/branches/gamestate/data/gui/scripts/PickupInventory.lua
code/branches/gamestate/data/gui/scripts/QuestGUI.lua
code/branches/gamestate/data/gui/scripts/SettingsMenu.lua
code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua
Log:
Simplified GUI sheet creation (first lines in the lua file) a lot by exporting it to GUITools.lua
Modified: code/branches/gamestate/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/AudioMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/AudioMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- AudioMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("AudioMenu")
-if _REQUIREDNAME == nil then
- AudioMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("AudioMenu")
function P:init()
soundMgr = orxonox.SoundManager:getInstance()
Modified: code/branches/gamestate/data/gui/scripts/BasicGUI.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/BasicGUI.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/BasicGUI.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,11 +1,7 @@
--- gui.lua
+-- BasicGUI.lua
local P = {}
-if _REQUIREDNAME == nil then
- BasicGUI = P
-else
- _G[_REQUIREDNAME] = P
-end
+_G[_REQUIREDNAME or "BasicGUI"] = P
-- useless, even wrong? P is the class, not the object..
P.overlay = nil
@@ -26,7 +22,8 @@
function P:init()
end
--- Override this function if you need to
+-- Override this function if you want to change one of the three input parameters:
+-- showCursor = true, useKeyboard = true and blockJoyStick = false
-- But don't forget to stick to the naming convention ("GUI_" .. self.filename)
function P:createInputState()
self.inputState = guiMgr:createInputState("GUI_" .. self.filename)
Modified: code/branches/gamestate/data/gui/scripts/ControlsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/ControlsMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/ControlsMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- ControlsMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("ControlsMenu")
-if _REQUIREDNAME == nil then
- ControlsMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("ControlsMenu")
function P.ControlsMouseControlsButton_clicked(e)
showGUI("MouseControlsMenu", true)
Modified: code/branches/gamestate/data/gui/scripts/CreditsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/CreditsMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/CreditsMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,9 @@
-- CreditsMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("CreditsMenu")
-if _REQUIREDNAME == nil then
- CreditsMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local sheetName = _REQUIREDNAME or "CreditsMenu"
+-- Create object of type BasicGUI and make it global
+local P = require("BasicGUI"):new(sheetName)
+_G[sheetName] = P
function P.CreditsBackButton_clicked(e)
hideGUI(P.filename)
Modified: code/branches/gamestate/data/gui/scripts/DecisionPopup.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/DecisionPopup.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/DecisionPopup.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- DecisionPopup.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("DecisionPopup")
-if _REQUIREDNAME == nil then
- DecisionPopup = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("DecisionPopup")
function P.setCallback(functionPtr)
P.functionPtr = functionPtr
Modified: code/branches/gamestate/data/gui/scripts/GUITools.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/GUITools.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/GUITools.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,3 +1,10 @@
+function createSheet(sheetName)
+ -- Create object of type BasicGUI and make it global
+ local sheet = require("BasicGUI"):new(sheetName)
+ _G[sheetName] = sheet
+ return sheet
+end
+
function openDecisionPopup( text, callbackPtr )
showGUI("DecisionPopup", false, true)
DecisionPopup.setCallback(callbackPtr)
Modified: code/branches/gamestate/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/GameplayMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/GameplayMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- GameplayMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("GameplayMenu")
-if _REQUIREDNAME == nil then
- GameplayMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("GameplayMenu")
function P:init()
dropdown = winMgr:getWindow("orxonox/ThemeCombobox")
Modified: code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- GraphicsMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("GraphicsMenu")
-if _REQUIREDNAME == nil then
- GraphicsMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("GraphicsMenu")
function P:init()
block = true
Modified: code/branches/gamestate/data/gui/scripts/InGameMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/InGameMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/InGameMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- InGameMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("InGameMenu")
-if _REQUIREDNAME == nil then
- InGameMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("InGameMenu")
-- events for ingamemenu
function P.button_quit_clicked(e)
Modified: code/branches/gamestate/data/gui/scripts/InfoPopup.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/InfoPopup.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/InfoPopup.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,14 +1,7 @@
-- InfoPopup.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("InfoPopup")
+local P = createSheet("InfoPopup")
-if _REQUIREDNAME == nil then
- InfoPopup = P
-else
- _G[_REQUIREDNAME] = P
-end
-
function P.execute(functionPtr, arguments)
if functionPtr ~= nil then
if arguments ~= nil then
Modified: code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,14 +1,7 @@
-- KeyBindMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("KeyBindMenu")
+local P = createSheet("KeyBindMenu")
-if _REQUIREDNAME == nil then
- KeyBindMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
-
function P:init()
commandList = {}
Modified: code/branches/gamestate/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MainMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/MainMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- MainMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("MainMenu")
-if _REQUIREDNAME == nil then
- MainMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("MainMenu")
-- events for MainMenu
function P.QuickGameTestButton_clicked(e)
Modified: code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- MouseControlsMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("MouseControlsMenu")
-if _REQUIREDNAME == nil then
- MouseControlsMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("MouseControlsMenu")
function P:init()
block = false
Modified: code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- MultiplayerMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("MultiplayerMenu")
-if _REQUIREDNAME == nil then
- MultiplayerMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("MultiplayerMenu")
function P:init()
listbox = winMgr:getWindow("orxonox/MultiplayerLevelListbox")
Modified: code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- MultiplayerOptionsMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("MultiplayerOptionsMenu")
-if _REQUIREDNAME == nil then
- MultiplayerOptionsMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("MultiplayerOptionsMenu")
function P.MultiplayerOptionsBackButton_clicked(e)
hideGUI(P.filename)
Modified: code/branches/gamestate/data/gui/scripts/PickupInventory.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/PickupInventory.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/PickupInventory.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- PickupInventory.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("PickupInventory")
-if _REQUIREDNAME == nil then
- PickupInventory = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("PickupInventory")
P.lastEquipmentCount_ = 0
P.lastUsableCount_ = 0
Modified: code/branches/gamestate/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/QuestGUI.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/QuestGUI.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,11 +1,7 @@
-gui = require("BasicGUI")
-local P = BasicGUI:new("QuestGUI")
-if _REQUIREDNAME == nil then
- QuestGUI = P
-else
- _G[_REQUIREDNAME] = P
-end
+-- QuestGUI.lua
+local P = createSheet("QuestGUI")
+
function P:show()
self.window:show() -- TDO: Do this through parent...
self.visible = true
Modified: code/branches/gamestate/data/gui/scripts/SettingsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/SettingsMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/SettingsMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- SettingsMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("SettingsMenu")
-if _REQUIREDNAME == nil then
- SettingsMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("SettingsMenu")
function P.SettingsGameplayButton_clicked(e)
showGUI("GameplayMenu", true)
Modified: code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua 2010-03-25 22:03:20 UTC (rev 6620)
+++ code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua 2010-03-26 19:51:37 UTC (rev 6621)
@@ -1,12 +1,6 @@
-- SingleplayerMenu.lua
-BasicGUI = require("BasicGUI")
-local P = BasicGUI:new("SingleplayerMenu")
-if _REQUIREDNAME == nil then
- SingleplayerMenu = P
-else
- _G[_REQUIREDNAME] = P
-end
+local P = createSheet("SingleplayerMenu")
function P:init()
listbox = winMgr:getWindow("orxonox/SingleplayerLevelListbox")
More information about the Orxonox-commit
mailing list