[Orxonox-commit 1685] r6403 - in code/branches/presentation2/data: gui/scripts lua
rgrieder at orxonox.net
rgrieder at orxonox.net
Tue Dec 22 23:20:19 CET 2009
Author: rgrieder
Date: 2009-12-22 23:20:19 +0100 (Tue, 22 Dec 2009)
New Revision: 6403
Modified:
code/branches/presentation2/data/gui/scripts/AudioMenu.lua
code/branches/presentation2/data/gui/scripts/InGameMenu.lua
code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua
code/branches/presentation2/data/gui/scripts/MainMenu.lua
code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua
code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua
code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua
code/branches/presentation2/data/lua/LuaStateInit.lua
Log:
Added lua convenience function for console commmands: orxonox.execute(cmd)
Also replaced the config commands with the actual orxonox.config function.
Modified: code/branches/presentation2/data/gui/scripts/AudioMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/AudioMenu.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/gui/scripts/AudioMenu.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -56,7 +56,7 @@
end
if masterscrollbar_active == false then
mastervolume = masterscrollbarwindow:getScrollPosition()
- orxonox.CommandExecutor:execute("config SoundManager soundVolume_ " .. mastervolume)
+ orxonox.config("SoundManager", "soundVolume_", mastervolume)
end
end
@@ -66,7 +66,7 @@
function P.AudioMasterScrollbar_ended(e)
mastervolume = masterscrollbarwindow:getScrollPosition()
- orxonox.CommandExecutor:execute("config SoundManager soundVolume_ " .. mastervolume)
+ orxonox.config("SoundManager", "soundVolume_", mastervolume)
masterscrollbar_active = false
end
@@ -79,7 +79,7 @@
end
if musicscrollbar_active == false then
musicvolume = musicscrollbarwindow:getScrollPosition()
- orxonox.CommandExecutor:execute("config SoundManager ambientVolume_ " .. musicvolume)
+ orxonox.config("SoundManager", "ambientVolume_", musicvolume)
end
end
@@ -90,7 +90,7 @@
function P.AudioMusicScrollbar_ended(e)
musicmutewindow:setSelected(false)
musicvolume = musicscrollbarwindow:getScrollPosition()
- orxonox.CommandExecutor:execute("config SoundManager ambientVolume_ " .. musicvolume)
+ orxonox.config("SoundManager", "ambientVolume_", musicvolume)
musicscrollbar_active = false
end
@@ -103,7 +103,7 @@
end
if effectsscrollbar_active == false then
effectsvolume = effectsscrollbarwindow:getScrollPosition()
- orxonox.CommandExecutor:execute("config SoundManager effectsVolume_ " .. effectsvolume)
+ orxonox.config("SoundManager", "effectsVolume_", effectsvolume)
end
end
@@ -114,7 +114,7 @@
function P.AudioEffectsScrollbar_ended(e)
effectsmutewindow:setSelected(false)
effectsvolume = effectsscrollbarwindow:getScrollPosition()
- orxonox.CommandExecutor:execute("config SoundManager effectsVolume_ " .. effectsvolume)
+ orxonox.config("SoundManager", "effectsVolume_", effectsvolume)
effectsscrollbar_active = false
end
@@ -165,9 +165,9 @@
function P.AudioThemeListbox_changed(e)
if listboxwindow:isItemSelected(1) then
- orxonox.CommandExecutor:execute("setMood dnb")
+ orxonox.execute("setMood dnb")
else
- orxonox.CommandExecutor:execute("setMood default")
+ orxonox.execute("setMood default")
end
end
Modified: code/branches/presentation2/data/gui/scripts/InGameMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/InGameMenu.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/gui/scripts/InGameMenu.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -38,7 +38,7 @@
function P.callback(doExit)
if doExit then
hideGUI("InGameMenu")
- orxonox.CommandExecutor:execute("exit")
+ orxonox.execute("exit")
end
end
Modified: code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -174,9 +174,9 @@
function keyESC()
if nrOfActiveSheets == 1 and activeSheets[1] == "MainMenu" then
- orxonox.CommandExecutor:execute("exit")
+ orxonox.execute("exit")
elseif nrOfActiveSheets > 0 then
- orxonox.CommandExecutor:execute("hideGUI "..activeSheets[nrOfActiveSheets])
+ orxonox.execute("hideGUI "..activeSheets[nrOfActiveSheets])
else
showGUI("InGameMenu")
end
Modified: code/branches/presentation2/data/gui/scripts/MainMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MainMenu.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/gui/scripts/MainMenu.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -13,7 +13,7 @@
-- events for MainMenu
function P.QuickGameTestButton_clicked(e)
- orxonox.CommandExecutor:execute("startGame")
+ orxonox.execute("startGame")
end
function P.SingleplayerButton_clicked(e)
@@ -33,7 +33,7 @@
end
function P.ExitButton_clicked(e)
- orxonox.CommandExecutor:execute("exit")
+ orxonox.execute("exit")
end
return P
Modified: code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/gui/scripts/MouseControlsMenu.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -46,7 +46,7 @@
if mousenormalscrollbar_active == false then
scrollposition = mousenormalscrollbarwindow:getScrollPosition()
mousenormalsensitivity = (math.pow(64,scrollposition)+6)/14
- orxonox.CommandExecutor:execute("config KeyBinder mouseSensitivity_ " .. mousenormalsensitivity)
+ orxonox.config("KeyBinder", "mouseSensitivity_", mousenormalsensitivity)
end
end
@@ -57,7 +57,7 @@
function P.MouseControlsMouseNormalScrollbar_ended(e)
scrollposition = mousenormalscrollbarwindow:getScrollPosition()
mousenormalsensitivity = (math.pow(64,scrollposition)+6)/14
- orxonox.CommandExecutor:execute("config KeyBinder mouseSensitivity_ " .. mousenormalsensitivity)
+ orxonox.config("KeyBinder", "mouseSensitivity_", mousenormalsensitivity)
mousenormalscrollbar_active = false
end
@@ -65,7 +65,7 @@
if mousederivescrollbar_active == false then
scrollposition = mousederivescrollbarwindow:getScrollPosition()
mousederivesensitivity = (math.pow(64,scrollposition)+6)/14
- orxonox.CommandExecutor:execute("config KeyBinder mouseSensitivityDerived_ " .. mousederivesensitivity)
+ orxonox.config("KeyBinder", "mouseSensitivityDerived_", mousederivesensitivity)
end
end
@@ -76,7 +76,7 @@
function P.MouseControlsMouseDeriveScrollbar_ended(e)
scrollposition = mousederivescrollbarwindow:getScrollPosition()
mousederivesensitivity = (math.pow(64,scrollposition)+6)/14
- orxonox.CommandExecutor:execute("config KeyBinder mouseSensitivityDerived_ " .. mousederivesensitivity)
+ orxonox.config("KeyBinder", "mouseSensitivityDerived_", mousederivesensitivity)
mousederivescrollbar_active = false
end
@@ -85,7 +85,7 @@
block = true
derivewindow:setSelected(false)
block = false
- orxonox.CommandExecutor:execute("config KeyBinder bDeriveMouseInput_ false")
+ orxonox.config("KeyBinder", "bDeriveMouseInput_", 0)
end
end
@@ -94,7 +94,7 @@
block = true
normalwindow:setSelected(false)
block = false
- orxonox.CommandExecutor:execute("config KeyBinder bDeriveMouseInput_ true")
+ orxonox.config("KeyBinder", "bDeriveMouseInput_", 1)
end
end
Modified: code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/gui/scripts/MultiplayerMenu.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -69,7 +69,7 @@
local choice = winMgr:getWindow("orxonox/MultiplayerLevelListbox"):getFirstSelectedItem()
if choice then
orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
- orxonox.CommandExecutor:execute(multiplayerMode)
+ orxonox.execute(multiplayerMode)
hideAllGUIs()
end
end
Modified: code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua
===================================================================
--- code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/gui/scripts/SingleplayerMenu.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -41,7 +41,7 @@
choice = winMgr:getWindow("orxonox/SingleplayerLevelListbox"):getFirstSelectedItem()
if choice then
orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
- orxonox.CommandExecutor:execute("startGame")
+ orxonox.execute("startGame")
hideAllGUIs()
end
end
Modified: code/branches/presentation2/data/lua/LuaStateInit.lua
===================================================================
--- code/branches/presentation2/data/lua/LuaStateInit.lua 2009-12-22 21:49:25 UTC (rev 6402)
+++ code/branches/presentation2/data/lua/LuaStateInit.lua 2009-12-22 22:20:19 UTC (rev 6403)
@@ -66,3 +66,8 @@
end
return _LOADED[moduleName]
end
+
+-- Convenience function for console commands
+orxonox.execute = function(command)
+ orxonox.CommandExecutor:execute(command)
+end
More information about the Orxonox-commit
mailing list