mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reverted to combining assets into combined init followed by post-init

Browse Source
This commit is contained in:
GPayne
2021-08-25 00:02:45 -06:00
parent 4016180b8c
commit 194741d136
3 changed files with 73 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/openspace/engine/openspaceengine.h
View File

@@ -108,14 +108,16 @@ public:
static scripting::LuaLibrary luaLibrary();
private:
void loadSingleAsset(const std::string& assetPath);
void loadAsset_init(const std::string assetName);
void loadAsset_postInit(const std::string assetName);
void loadFonts();
void runGlobalCustomizationScripts();
void configureLogging();
std::string generateFilePath(std::string openspaceRelativePath);
void resetPropertyChangeFlagsOfSubowners(openspace::properties::PropertyOwner* po);
void loadInitAssetSection(const std::string profileSectionName);
void loadInitAssetSection(std::string& initAssetOutput,
std::string profileSectionName);
std::unique_ptr<Scene> _scene;
std::unique_ptr<AssetManager> _assetManager;