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

Prepare for data sync

Browse Source
This commit is contained in:
Emil Axelsson
2017-09-14 20:16:51 +02:00
parent 4cdae984e9
commit af8bec1441
20 changed files with 925 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/engine/openspaceengine.cpp
View File

@@ -1,4 +1,4 @@
/*****************************************************************************************
/*****************************************************************************************
* *
* OpenSpace *
* *
@@ -54,11 +54,12 @@
#include <openspace/util/resourcesynchronization.h>
#include <openspace/util/factorymanager.h>
#include <openspace/util/task.h>
#include <openspace/util/openspacemodule.h>
#include <openspace/util/resourcesynchronizer.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/task.h>
#include <openspace/util/time.h>
#include <openspace/util/timemanager.h>
#include <openspace/util/spicemanager.h>
#include <openspace/util/transformationmanager.h>
#include <ghoul/ghoul.h>
@@ -144,6 +145,7 @@ OpenSpaceEngine::OpenSpaceEngine(std::string programName,
, _networkEngine(new NetworkEngine)
, _parallelConnection(new ParallelConnection)
, _renderEngine(new RenderEngine)
, _resourceSynchronizer(new ResourceSynchronizer(8))
, _settingsEngine(new SettingsEngine)
, _syncEngine(std::make_unique<SyncEngine>(4096))
, _timeManager(new TimeManager)
@@ -409,7 +411,7 @@ void OpenSpaceEngine::create(int argc, char** argv,
// Set up asset loader and scene loader
_engine->_assetLoader = std::make_unique<AssetLoader>(
OsEng.scriptEngine().luaState(), "${ASSETS}", "${SYNC}");
*OsEng.scriptEngine().luaState(), OsEng.resourceSynchronizer(), "${ASSETS}", "${SYNC}");
_engine->_sceneLoader = std::make_unique<SceneLoader>(_engine->_assetLoader.get());
_engine->_globalPropertyNamespace->addPropertySubOwner(_engine->_assetLoader->rootAsset());
}
@@ -1473,6 +1475,11 @@ AssetLoader & OpenSpaceEngine::assetLoader() {
return *_assetLoader;
}
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;