mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 21:48:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Correct the order of initialization and scene loading

Browse Source
This commit is contained in:
Emil Axelsson
2017-04-05 17:40:00 +02:00
parent 567b5a528f
commit 6a851e11a3
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/openspaceengine.cpp
+9 -14
View File
@@ -504,9 +504,14 @@ void OpenSpaceEngine::initialize() {
_renderEngine->initialize();
for (const auto& func : _moduleCallbacks.initialize) {
func();
}
scheduleLoadScene(scenePath);
LINFO("Finished initializing");
LTRACE("OpenSpaceEngine::initialize(end)");
}
void OpenSpaceEngine::scheduleLoadScene(std::string scenePath) {
@@ -515,6 +520,8 @@ void OpenSpaceEngine::scheduleLoadScene(std::string scenePath) {
}
void OpenSpaceEngine::loadScene(const std::string& scenePath) {
LTRACE("OpenSpaceEngine::loadScene(begin)");
windowWrapper().setBarrier(false);
windowWrapper().setSynchronization(false);
OnExit(
@@ -532,7 +539,6 @@ void OpenSpaceEngine::loadScene(const std::string& scenePath) {
LERRORC(e.component, e.message);
}
Scene* scene;
try {
scene = _sceneManager->loadScene(scenePath);
@@ -614,22 +620,11 @@ void OpenSpaceEngine::loadScene(const std::string& scenePath) {
}
}
_renderEngine->setGlobalBlackOutFactor(0.0);
_renderEngine->startFading(1, 3.0);
for (const auto& func : _moduleCallbacks.initialize) {
func();
}
// Run start up scripts
runPreInitializationScripts(scenePath);
_syncEngine->addSyncables(Time::ref().getSyncables());
_syncEngine->addSyncables(_renderEngine->getSyncables());
_syncEngine->addSyncable(_scriptEngine.get());
LINFO("Finished initializing");
LTRACE("OpenSpaceEngine::initialize(end)");
LTRACE("OpenSpaceEngine::loadScene(end)");
}
void OpenSpaceEngine::deinitialize() {