Changeset 6403

Timestamp:

Dec 22, 2009, 11:20:19 PM (15 years ago)

Author:

rgrieder

Message:

Added lua convenience function for console commmands: orxonox.execute(cmd)
Also replaced the config commands with the actual orxonox.config function.

Location:

code/branches/presentation2/data

Files:

• gui/scripts/AudioMenu.lua (modified) (7 diffs)
• gui/scripts/InGameMenu.lua (modified) (1 diff)
• gui/scripts/InitialiseGUI.lua (modified) (1 diff)
• gui/scripts/MainMenu.lua (modified) (2 diffs)
• gui/scripts/MouseControlsMenu.lua (modified) (6 diffs)
• gui/scripts/MultiplayerMenu.lua (modified) (1 diff)
• gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• lua/LuaStateInit.lua (modified) (1 diff)

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

@@ -57 +57 @@
     if masterscrollbar_active == false then
         mastervolume = masterscrollbarwindow:getScrollPosition()
-        orxonox.CommandExecutor:execute("config SoundManager soundVolume_ " .. mastervolume)
+        orxonox.config("SoundManager", "soundVolume_", mastervolume)
     end
 end
@@ -67 +67 @@
 function P.AudioMasterScrollbar_ended(e)
     mastervolume = masterscrollbarwindow:getScrollPosition()
-    orxonox.CommandExecutor:execute("config SoundManager soundVolume_ " .. mastervolume)
+    orxonox.config("SoundManager", "soundVolume_", mastervolume)
     masterscrollbar_active = false
 end
@@ -80 +80 @@
     if musicscrollbar_active == false then
         musicvolume = musicscrollbarwindow:getScrollPosition()
-        orxonox.CommandExecutor:execute("config SoundManager ambientVolume_ " .. musicvolume)
+        orxonox.config("SoundManager", "ambientVolume_", musicvolume)
     end
 end
@@ -91 +91 @@
     musicmutewindow:setSelected(false)
     musicvolume = musicscrollbarwindow:getScrollPosition()
-    orxonox.CommandExecutor:execute("config SoundManager ambientVolume_ " .. musicvolume)
+    orxonox.config("SoundManager", "ambientVolume_", musicvolume)
     musicscrollbar_active = false
 end
@@ -104 +104 @@
     if effectsscrollbar_active == false then
         effectsvolume = effectsscrollbarwindow:getScrollPosition()
-        orxonox.CommandExecutor:execute("config SoundManager effectsVolume_ " .. effectsvolume)
+        orxonox.config("SoundManager", "effectsVolume_", effectsvolume)
     end
 end
@@ -115 +115 @@
     effectsmutewindow:setSelected(false)
     effectsvolume = effectsscrollbarwindow:getScrollPosition()
-    orxonox.CommandExecutor:execute("config SoundManager effectsVolume_ " .. effectsvolume)
+    orxonox.config("SoundManager", "effectsVolume_", effectsvolume)
     effectsscrollbar_active = false
 end
@@ -166 +166 @@
 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

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

@@ -39 +39 @@
     if doExit then
         hideGUI("InGameMenu")
-        orxonox.CommandExecutor:execute("exit")
+        orxonox.execute("exit")
     end
 end

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

@@ -175 +175 @@
 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")

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

@@ -14 +14 @@
 -- events for MainMenu
 function P.QuickGameTestButton_clicked(e)
-    orxonox.CommandExecutor:execute("startGame")
+    orxonox.execute("startGame")
 end
 
@@ -34 +34 @@
 
 function P.ExitButton_clicked(e)
-    orxonox.CommandExecutor:execute("exit")
+    orxonox.execute("exit")
 end
 

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

@@ -47 +47 @@
         scrollposition = mousenormalscrollbarwindow:getScrollPosition()
         mousenormalsensitivity = (math.pow(64,scrollposition)+6)/14
-        orxonox.CommandExecutor:execute("config KeyBinder mouseSensitivity_ " .. mousenormalsensitivity)
+        orxonox.config("KeyBinder", "mouseSensitivity_", mousenormalsensitivity)
     end
 end
@@ -58 +58 @@
     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
@@ -66 +66 @@
         scrollposition = mousederivescrollbarwindow:getScrollPosition()
         mousederivesensitivity = (math.pow(64,scrollposition)+6)/14
-        orxonox.CommandExecutor:execute("config KeyBinder mouseSensitivityDerived_ " .. mousederivesensitivity)
+        orxonox.config("KeyBinder", "mouseSensitivityDerived_", mousederivesensitivity)
     end
 end
@@ -77 +77 @@
     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
@@ -86 +86 @@
         derivewindow:setSelected(false)
         block = false
-        orxonox.CommandExecutor:execute("config KeyBinder bDeriveMouseInput_ false")
+        orxonox.config("KeyBinder", "bDeriveMouseInput_", 0)
     end
 end
@@ -95 +95 @@
         normalwindow:setSelected(false)
         block = false
-        orxonox.CommandExecutor:execute("config KeyBinder bDeriveMouseInput_ true")
+        orxonox.config("KeyBinder", "bDeriveMouseInput_", 1)
     end
 end

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

@@ -70 +70 @@
     if choice then
         orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
-        orxonox.CommandExecutor:execute(multiplayerMode)
+        orxonox.execute(multiplayerMode)
         hideAllGUIs()
     end

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

@@ -42 +42 @@
     if choice then
         orxonox.LevelManager:getInstance():setDefaultLevel(choice:getText() .. ".oxw")
-        orxonox.CommandExecutor:execute("startGame")
+        orxonox.execute("startGame")
         hideAllGUIs()
     end

code/branches/presentation2/data/lua/LuaStateInit.lua

@@ -67 +67 @@
   return _LOADED[moduleName]
 end
+
+-- Convenience function for console commands
+orxonox.execute = function(command)
+  orxonox.CommandExecutor:execute(command)
+end