[Orxonox-commit 1741] r6459 - code/branches/gamestate/data/gui/scripts
rgrieder at orxonox.net
rgrieder at orxonox.net
Sun Jan 24 17:03:27 CET 2010
Author: rgrieder
Date: 2010-01-24 17:03:27 +0100 (Sun, 24 Jan 2010)
New Revision: 6459
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/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 BasicGUI construction. Just give the name of the GUI as argument. The rest will be deduced.
Modified: code/branches/gamestate/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/AudioMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/AudioMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- AudioMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("AudioMenu")
if _REQUIREDNAME == nil then
AudioMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "AudioMenu"
-P.layoutString = "AudioMenu.layout"
-
function P:init()
soundMgr = orxonox.SoundManager:getInstance()
block = false
Modified: code/branches/gamestate/data/gui/scripts/BasicGUI.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/BasicGUI.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/BasicGUI.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -7,11 +7,16 @@
_G[_REQUIREDNAME] = P
end
+-- useless?
P.overlay = nil
-- constructor of the GUI
-function P:new (gui, fname)
- local newElement = { window = gui, filename = fname, visible = false } or {}
+function P:new(_filename, _visible, _gui)
+ local newElement = {
+ filename = _filename,
+ gui = _gui,
+ visible = _visible or false
+ } or {}
setmetatable(newElement, self) -- connects new element with class
self.__index = self
return newElement
@@ -22,19 +27,19 @@
end
-- hide function for the GUI
-function P:hide ()
+function P:hide()
self.window:hide()
self.visible = false
end
-- show function for the GUI
-function P:show ()
+function P:show()
self.window:show()
self.visible = true
end
-function P:load ()
- self.window = winMgr:loadWindowLayout(self.layoutString)
+function P:load()
+ self.window = winMgr:loadWindowLayout(self.filename .. ".layout")
self:init()
return self
end
Modified: code/branches/gamestate/data/gui/scripts/ControlsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/ControlsMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/ControlsMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- ControlsMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("ControlsMenu")
if _REQUIREDNAME == nil then
ControlsMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "ControlsMenu"
-P.layoutString = "ControlsMenu.layout"
-
function P.ControlsMouseControlsButton_clicked(e)
showGUI("MouseControlsMenu", true)
end
Modified: code/branches/gamestate/data/gui/scripts/CreditsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/CreditsMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/CreditsMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- CreditsMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("CreditsMenu")
if _REQUIREDNAME == nil then
CreditsMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "CreditsMenu"
-P.layoutString = "CreditsMenu.layout"
-
function P.CreditsBackButton_clicked(e)
hideGUI(P.filename)
end
Modified: code/branches/gamestate/data/gui/scripts/DecisionPopup.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/DecisionPopup.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/DecisionPopup.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- DecisionPopup.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("DecisionPopup")
if _REQUIREDNAME == nil then
DecisionPopup = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "DecisionPopup"
-P.layoutString = "DecisionPopup.layout"
-
function P:init()
end
Modified: code/branches/gamestate/data/gui/scripts/GameplayMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/GameplayMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/GameplayMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- GameplayMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GameplayMenu")
if _REQUIREDNAME == nil then
GameplayMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "GameplayMenu"
-P.layoutString = "GameplayMenu.layout"
-
function P:init()
dropdown = winMgr:getWindow("orxonox/ThemeCombobox")
local themeList = {}
Modified: code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/GraphicsMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- GraphicsMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("GraphicsMenu")
if _REQUIREDNAME == nil then
GraphicsMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "GraphicsMenu"
-P.layoutString = "GraphicsMenu.layout"
-
function P:init()
block = true
file = orxonox.PathConfig:getConfigPathString() .. orxonox.getConfig("GraphicsManager", "ogreConfigFile_")
Modified: code/branches/gamestate/data/gui/scripts/InGameMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/InGameMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/InGameMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,15 +1,13 @@
-- InGameMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InGameMenu")
if _REQUIREDNAME == nil then
InGameMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "InGameMenu"
-P.layoutString = "InGameMenu.layout"
function P:init()
end
Modified: code/branches/gamestate/data/gui/scripts/InfoPopup.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/InfoPopup.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/InfoPopup.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,7 +1,7 @@
-- InfoPopup.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("InfoPopup")
if _REQUIREDNAME == nil then
InfoPopup = P
@@ -9,9 +9,6 @@
_G[_REQUIREDNAME] = P
end
-P.filename = "InfoPopup"
-P.layoutString = "InfoPopup.layout"
-
function P:init()
end
Modified: code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/KeyBindMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,7 +1,7 @@
-- KeyBindMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("KeyBindMenu")
if _REQUIREDNAME == nil then
KeyBindMenu = P
@@ -9,9 +9,6 @@
_G[_REQUIREDNAME] = P
end
-P.filename = "KeyBindMenu"
-P.layoutString = "KeyBindMenu.layout"
-
function P:init()
commandList = {}
Modified: code/branches/gamestate/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MainMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/MainMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- MainMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MainMenu")
if _REQUIREDNAME == nil then
MainMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "MainMenu"
-P.layoutString = "MainMenu.layout"
-
-- events for MainMenu
function P.QuickGameTestButton_clicked(e)
orxonox.execute("startGame")
Modified: code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/MouseControlsMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- MouseControlsMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MouseControlsMenu")
if _REQUIREDNAME == nil then
MouseControlsMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "MouseControlsMenu"
-P.layoutString = "MouseControlsMenu.layout"
-
function P:init()
block = false
mousenormalscrollbarwindow = tolua.cast(winMgr:getWindow("orxonox/MouseNormalScrollbar"),"CEGUI::Scrollbar")
Modified: code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/MultiplayerMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- MultiplayerMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerMenu")
if _REQUIREDNAME == nil then
MultiplayerMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "MultiplayerMenu"
-P.layoutString = "MultiplayerMenu.layout"
-
function P:init()
listbox = winMgr:getWindow("orxonox/MultiplayerLevelListbox")
preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
Modified: code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/MultiplayerOptionsMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- MultiplayerOptionsMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("MultiplayerOptionsMenu")
if _REQUIREDNAME == nil then
MultiplayerOptionsMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "MultiplayerOptionsMenu"
-P.layoutString = "MultiplayerOptionsMenu.layout"
-
function P.MultiplayerOptionsBackButton_clicked(e)
hideGUI(P.filename)
end
Modified: code/branches/gamestate/data/gui/scripts/PickupInventory.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/PickupInventory.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/PickupInventory.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- PickupInventory.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("PickupInventory")
if _REQUIREDNAME == nil then
PickupInventory = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "PickupInventory"
-P.layoutString = "PickupInventory.layout"
-
P.lastEquipmentCount_ = 0
P.lastUsableCount_ = 0
P.currentUsableID_ = 0
Modified: code/branches/gamestate/data/gui/scripts/QuestGUI.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/QuestGUI.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/QuestGUI.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,14 +1,11 @@
gui = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("QuestGUI")
if _REQUIREDNAME == nil then
QuestGUI = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "QuestGUI"
-P.layoutString = "QuestGUI.layout"
-
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-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/SettingsMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- SettingsMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SettingsMenu")
if _REQUIREDNAME == nil then
SettingsMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "SettingsMenu"
-P.layoutString = "SettingsMenu.layout"
-
function P.SettingsGameplayButton_clicked(e)
showGUI("GameplayMenu", true)
end
Modified: code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua 2010-01-23 15:39:40 UTC (rev 6458)
+++ code/branches/gamestate/data/gui/scripts/SingleplayerMenu.lua 2010-01-24 16:03:27 UTC (rev 6459)
@@ -1,16 +1,13 @@
-- SingleplayerMenu.lua
BasicGUI = require("BasicGUI")
-local P = BasicGUI:new() --inherit everything from the gui package
+local P = BasicGUI:new("SingleplayerMenu")
if _REQUIREDNAME == nil then
SingleplayerMenu = P
else
_G[_REQUIREDNAME] = P
end
-P.filename = "SingleplayerMenu"
-P.layoutString = "SingleplayerMenu.layout"
-
function P:init()
listbox = winMgr:getWindow("orxonox/SingleplayerLevelListbox")
preselect = orxonox.LevelManager:getInstance():getDefaultLevel()
More information about the Orxonox-commit
mailing list