mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 13:12:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

- Disable barrier when loading a scene.

Browse Source 
- Remove syncables before deinitializing openspaceengine
This commit is contained in:
Emil Axelsson
2017-03-16 14:35:22 +01:00
parent ca6348194e
commit 361f9face5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/engine/openspaceengine.cpp
View File

@@ -376,6 +376,10 @@ void OpenSpaceEngine::destroy() {
func();
}
_engine->_syncEngine->removeSyncables(Time::ref().getSyncables());
_engine->_syncEngine->removeSyncables(_engine->_renderEngine->getSyncables());
_engine->_syncEngine->removeSyncable(_engine->_scriptEngine.get());
_engine->_moduleEngine->deinitialize();
_engine->_console->deinitialize();
@@ -511,9 +515,14 @@ void OpenSpaceEngine::scheduleLoadScene(const std::string& scenePath) {
}
void OpenSpaceEngine::loadScene(const std::string& scenePath) {
windowWrapper().setBarrier(false);
windowWrapper().setSynchronization(false);
OnExit(
[this]() { windowWrapper().setSynchronization(true); }
[this]() {
windowWrapper().setSynchronization(true);
windowWrapper().setBarrier(true);
}
);
// Run start up scripts