Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8862 for code/trunk


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/data/gui/scripts/GUISheet.lua

    r8079 r8862  
    7676
    7777    -- Also load additional sheets to avoid display lags
    78     if self.loadAlong then
     78    if self.loadAlong and orxonox.GUIManager:preloadMenuSheets() then
    7979        for k, sheet in pairs(self.loadAlong) do
    8080            loadSheet(sheet)
  • code/trunk/src/libraries/core/GUIManager.cc

    r8861 r8862  
    371371        SetConfigValue(guiScheme_, GUIManager::defaultScheme_).description("Changes the current GUI scheme.").callback(this, &GUIManager::changedGUIScheme);
    372372        SetConfigValue(numScrollLines_, 1).description("How many lines to scroll in a list if the scroll wheel is used");
     373        SetConfigValue(bPreloadMenuSheets_, false).description("Pre-load menu sheets during startup");
     374
    373375        SetConfigValueExternal(outputLevelCeguiLog_, BaseWriter::getConfigurableSectionName(), "outputLevelCeguiLog", CEGUI::Standard).description("The log level of the CEGUI log file").callback(this, &GUIManager::changedCeguiOutputLevel);
    374376    }
  • code/trunk/src/libraries/core/GUIManager.h

    r8858 r8862  
    111111        void setBackgroundImage(const std::string& image);
    112112
     113        static bool preloadMenuSheets() { return GUIManager::getInstance().bPreloadMenuSheets_; } // tolua_export
    113114        static bool inDevMode(void); // tolua_export
    114115
     
    200201        bool oldCEGUI_;
    201202
    202         int numScrollLines_; ///< How many lines to scroll in a list if the scroll wheel is used
     203        int numScrollLines_;        ///< How many lines to scroll in a list if the scroll wheel is used
     204        bool bPreloadMenuSheets_;   ///< If true, menu sheets are pre-loaded during startup
    203205
    204206    }; // tolua_export
Note: See TracChangeset for help on using the changeset viewer.