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

Let assets control their own lifecycle

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-12 14:55:30 +01:00
parent e0504980ad
commit 1417db5ed7
12 changed files with 714 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/openspaceengine.cpp
View File

@@ -58,7 +58,7 @@
#include <openspace/util/factorymanager.h>
#include <openspace/util/openspacemodule.h>
#include <openspace/util/resourcesynchronizer.h>
#include <openspace/util/synchronizationwatcher.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/task.h>
#include <openspace/util/time.h>
@@ -411,8 +411,12 @@ void OpenSpaceEngine::create(int argc, char** argv,
sgctArguments.insert(sgctArguments.begin() + 2, absPath(sgctConfigurationPath));
// Set up asset loader
std::unique_ptr<SynchronizationWatcher> w = std::make_unique<SynchronizationWatcher>();
SynchronizationWatcher* rawWatcher = w.get();
_engine->_assetManager = std::make_unique<AssetManager>(
std::make_unique<AssetLoader>(*OsEng.scriptEngine().luaState(), "${ASSETS}")
std::make_unique<AssetLoader>(*OsEng.scriptEngine().luaState(), rawWatcher, "${ASSETS}"),
std::move(w)
);
//_engine->_globalPropertyNamespace->addPropertySubOwner(_engine->_assetLoader->rootAsset());
}