[Orxonox-commit 2031] r6748 - code/trunk/data/gui/scripts

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-16 20:09:17 +0200 (Fri, 16 Apr 2010)
New Revision: 6748

Modified:
   code/trunk/data/gui/scripts/ControlsMenu.lua
   code/trunk/data/gui/scripts/GUISheet.lua
   code/trunk/data/gui/scripts/InGameMenu.lua
   code/trunk/data/gui/scripts/KeyBindMenu.lua
   code/trunk/data/gui/scripts/MainMenu.lua
   code/trunk/data/gui/scripts/SettingsMenu.lua
Log:
A GUISheet can assign its field "loadAlong" any strings designating other sheets that have to be loaded as well.
Implemented this for all menus sheets as I see fit (load the whole MainMenu, but don't load MainMenu or Settings for the InGameMenu).
This is just a measure to avoid lags when clicking through the menus.

Modified: code/trunk/data/gui/scripts/ControlsMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/ControlsMenu.lua	2010-04-16 13:01:06 UTC (rev 6747)
+++ code/trunk/data/gui/scripts/ControlsMenu.lua	2010-04-16 18:09:17 UTC (rev 6748)
@@ -1,6 +1,7 @@
 -- ControlsMenu.lua
 
 local P = createMenuSheet("ControlsMenu")
+P.loadAlong = { "MouseControlsMenu", "KeyBindMenu" }
 
 function P.ControlsMouseControlsButton_clicked(e)
     showMenuSheet("MouseControlsMenu", true)

Modified: code/trunk/data/gui/scripts/GUISheet.lua
===================================================================
--- code/trunk/data/gui/scripts/GUISheet.lua	2010-04-16 13:01:06 UTC (rev 6747)
+++ code/trunk/data/gui/scripts/GUISheet.lua	2010-04-16 18:09:17 UTC (rev 6748)
@@ -49,6 +49,13 @@
     self:hide()
     -- Allow sheets to do some work upon loading
     self:onLoad()
+
+    -- Also load additional sheets to avoid display lags
+    if self.loadAlong then
+        for k, sheet in pairs(self.loadAlong) do
+            loadSheet(sheet)
+        end
+    end
     return self
 end
 

Modified: code/trunk/data/gui/scripts/InGameMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/InGameMenu.lua	2010-04-16 13:01:06 UTC (rev 6747)
+++ code/trunk/data/gui/scripts/InGameMenu.lua	2010-04-16 18:09:17 UTC (rev 6748)
@@ -1,6 +1,7 @@
 -- InGameMenu.lua
 
 local P = createMenuSheet("InGameMenu")
+P.loadAlong = { "DecisionPopup" }
 
 -- events for ingamemenu
 function P.button_quit_clicked(e)

Modified: code/trunk/data/gui/scripts/KeyBindMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/KeyBindMenu.lua	2010-04-16 13:01:06 UTC (rev 6747)
+++ code/trunk/data/gui/scripts/KeyBindMenu.lua	2010-04-16 18:09:17 UTC (rev 6748)
@@ -1,6 +1,7 @@
 -- KeyBindMenu.lua
 
 local P = createMenuSheet("KeyBindMenu")
+P.loadAlong = { "InfoPopup" }
 
 function P.onLoad()
 

Modified: code/trunk/data/gui/scripts/MainMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/MainMenu.lua	2010-04-16 13:01:06 UTC (rev 6747)
+++ code/trunk/data/gui/scripts/MainMenu.lua	2010-04-16 18:09:17 UTC (rev 6748)
@@ -1,6 +1,7 @@
 -- MainMenu.lua
 
 local P = createMenuSheet("MainMenu")
+P.loadAlong = { "SingleplayerMenu", "MultiplayerMenu", "SettingsMenu", "CreditsMenu" }
 
 -- events for MainMenu
 function P.QuickGameTestButton_clicked(e)

Modified: code/trunk/data/gui/scripts/SettingsMenu.lua
===================================================================
--- code/trunk/data/gui/scripts/SettingsMenu.lua	2010-04-16 13:01:06 UTC (rev 6747)
+++ code/trunk/data/gui/scripts/SettingsMenu.lua	2010-04-16 18:09:17 UTC (rev 6748)
@@ -1,6 +1,7 @@
 -- SettingsMenu.lua
 
 local P = createMenuSheet("SettingsMenu")
+P.loadAlong = { "ControlsMenu", "AudioMenu", "GraphicsMenu" }
 
 function P.SettingsGameplayButton_clicked(e)
     showMenuSheet("GameplayMenu", true)