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

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source
This commit is contained in:
Emil Axelsson
2017-12-04 10:52:12 +01:00
parent f3aeecaf23 38338725b9
commit fb675dfeab
175 changed files with 5984 additions and 4556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/engine/openspaceengine.cpp
View File

@@ -429,6 +429,8 @@ void OpenSpaceEngine::destroy() {
_engine->_syncEngine->removeSyncables(_engine->timeManager().getSyncables());
_engine->_syncEngine->removeSyncables(_engine->_renderEngine->getSyncables());
_engine->_renderEngine->deinitializeGL();
_engine->_moduleEngine->deinitialize();
_engine->_console->deinitialize();
@@ -637,10 +639,11 @@ void OpenSpaceEngine::loadSingleAsset(const std::string& assetPath) {
LoadingScreen::ShowProgressbar(showProgressbar)
);
*/
_renderEngine->setGlobalBlackOutFactor(0.0);
_renderEngine->startFading(1, 3.0);
_syncEngine->addSyncables(_timeManager->getSyncables());
_syncEngine->addSyncables(_renderEngine->getSyncables());