diff --git a/modules/dataloader/operators/loader.cpp b/modules/dataloader/operators/loader.cpp index 2b0882940d..77241d682c 100644 --- a/modules/dataloader/operators/loader.cpp +++ b/modules/dataloader/operators/loader.cpp @@ -54,12 +54,16 @@ #include #include #include +#include +#include +#include #include using Directory = ghoul::filesystem::Directory; using File = ghoul::filesystem::File; using RawPath = ghoul::filesystem::Directory::RawPath; +using PrettyPrint = ghoul::DictionaryLuaFormatter::PrettyPrint; using Recursive = ghoul::filesystem::Directory::Recursive; using TestResult = openspace::documentation::TestResult; using json = nlohmann::json; @@ -615,7 +619,7 @@ const std::string Loader::createAssetFile(ghoul::Dictionary assetDictionary) Directory d = getAssetFolderDirectory(); const std::string path = d.path(); - ghoul::DictionaryLuaFormatter formatter; + ghoul::DictionaryLuaFormatter formatter(PrettyPrint::Yes, " "); const std::string dictionaryString = formatter.format(assetDictionary); std::string identifier = assetDictionary.value(KeyIdentifier); @@ -642,7 +646,7 @@ const std::string Loader::createAssetFile(ghoul::Dictionary assetDictionary) void Loader::loadCreatedAsset(const std::string& path) { - + global::openSpaceEngine.assetManager().add(path); } // void Loader::createVolumeDataItem(std::string absPath) {} diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 8b58b0a9a8..86b8eb9909 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -292,6 +292,20 @@ void OpenSpaceEngine::initialize() { LDEBUG("Registering Lua libraries"); registerCoreClasses(global::scriptEngine); + // Set up asset loader + std::unique_ptr w = + std::make_unique(); + SynchronizationWatcher* rawWatcher = w.get(); + + global::openSpaceEngine._assetManager = std::make_unique( + std::make_unique( + *global::scriptEngine.luaState(), + rawWatcher, + FileSys.absPath("${ASSETS}") + ), + std::move(w) + ); + global::scriptEngine.addLibrary(global::openSpaceEngine._assetManager->luaLibrary()); for (OpenSpaceModule* module : global::moduleEngine.modules()) { @@ -316,20 +330,6 @@ void OpenSpaceEngine::initialize() { func(); } - // Set up asset loader - std::unique_ptr w = - std::make_unique(); - SynchronizationWatcher* rawWatcher = w.get(); - - global::openSpaceEngine._assetManager = std::make_unique( - std::make_unique( - *global::scriptEngine.luaState(), - rawWatcher, - FileSys.absPath("${ASSETS}") - ), - std::move(w) - ); - global::openSpaceEngine._assetManager->initialize(); scheduleLoadSingleAsset(global::configuration.asset);