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

Decentralize resource synchronization. Remove notion of SynchronizationJob.

Browse Source
This commit is contained in:
Emil Axelsson
2017-11-12 19:09:16 +01:00
parent 19812af629
commit 2fa42859cd
12 changed files with 46 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/engine/openspaceengine.cpp
View File

@@ -152,7 +152,6 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
, _networkEngine(new NetworkEngine)
, _parallelConnection(new ParallelConnection)
, _renderEngine(new RenderEngine)
, _resourceSynchronizer(new ResourceSynchronizer)
, _settingsEngine(new SettingsEngine)
, _syncEngine(std::make_unique<SyncEngine>(4096))
, _timeManager(new TimeManager)
@@ -412,7 +411,7 @@ void OpenSpaceEngine::create(int argc, char** argv,
// Set up asset loader
_engine->_assetManager = std::make_unique<AssetManager>(
std::make_unique<AssetLoader>(*OsEng.scriptEngine().luaState(), "${ASSETS}"),
std::make_unique<AssetSynchronizer>(OsEng._resourceSynchronizer.get())
std::make_unique<AssetSynchronizer>()
);
//_engine->_globalPropertyNamespace->addPropertySubOwner(_engine->_assetLoader->rootAsset());
}
@@ -1480,11 +1479,6 @@ AssetManager& OpenSpaceEngine::assetManager() {
return *_assetManager;
}
ResourceSynchronizer & OpenSpaceEngine::resourceSynchronizer() {
ghoul_assert(_resourceSynchronizer, "Resource Synchronizer must not be nullptr");
return *_resourceSynchronizer;
}
ghoul::fontrendering::FontManager& OpenSpaceEngine::fontManager() {
ghoul_assert(_fontManager, "Font Manager must not be nullptr");
return *_fontManager;