Changeset 8862 for code/trunk

Timestamp:

Aug 23, 2011, 3:05:58 PM (13 years ago)

Author:

landauf

Message:

added config value to enable/disable preloading of menu sheets during startup (fast menus vs fast startup)

Location:

code/trunk

Files:

• data/gui/scripts/GUISheet.lua (modified) (1 diff)
• src/libraries/core/GUIManager.cc (modified) (1 diff)
• src/libraries/core/GUIManager.h (modified) (2 diffs)

code/trunk/data/gui/scripts/GUISheet.lua

@@ -76 +76 @@
 
     -- Also load additional sheets to avoid display lags
-    if self.loadAlong then
+    if self.loadAlong and orxonox.GUIManager:preloadMenuSheets() then
         for k, sheet in pairs(self.loadAlong) do
             loadSheet(sheet)

code/trunk/src/libraries/core/GUIManager.cc

@@ -371 +371 @@
         SetConfigValue(guiScheme_, GUIManager::defaultScheme_).description("Changes the current GUI scheme.").callback(this, &GUIManager::changedGUIScheme);
         SetConfigValue(numScrollLines_, 1).description("How many lines to scroll in a list if the scroll wheel is used");
+        SetConfigValue(bPreloadMenuSheets_, false).description("Pre-load menu sheets during startup");
+
         SetConfigValueExternal(outputLevelCeguiLog_, BaseWriter::getConfigurableSectionName(), "outputLevelCeguiLog", CEGUI::Standard).description("The log level of the CEGUI log file").callback(this, &GUIManager::changedCeguiOutputLevel);
     }

code/trunk/src/libraries/core/GUIManager.h

@@ -111 +111 @@
         void setBackgroundImage(const std::string& image);
 
+        static bool preloadMenuSheets() { return GUIManager::getInstance().bPreloadMenuSheets_; } // tolua_export
         static bool inDevMode(void); // tolua_export
 
@@ -200 +201 @@
         bool oldCEGUI_;
 
-        int numScrollLines_; ///< How many lines to scroll in a list if the scroll wheel is used
+        int numScrollLines_;        ///< How many lines to scroll in a list if the scroll wheel is used
+        bool bPreloadMenuSheets_;   ///< If true, menu sheets are pre-loaded during startup
 
     }; // tolua_export