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

FIXED: Slightly rearrange/cleanup OpenspaceEngine::initialize

Browse Source 
Simplify scene file config/commandline logic, group scene and renderEngine work

(Stashed changes took over real changes)
This commit is contained in:
Matthew Territo
2016-07-27 17:02:24 -06:00
parent 10e00b0d3c
commit 94625e541b
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/engine/openspaceengine.cpp
View File

@@ -415,20 +415,19 @@ bool OpenSpaceEngine::initialize() {
configurationManager().getValue(
ConfigurationManager::KeyShutdownCountdown, _shutdownWait
);
if (!commandlineArgumentPlaceholders.sceneName.empty())
configurationManager().setValue(
ConfigurationManager::KeyConfigScene, commandlineArgumentPlaceholders.sceneName);
// Initialize SettingsEngine
_settingsEngine->initialize();
ConfigurationManager::KeyConfigScene,
commandlineArgumentPlaceholders.sceneName);
// Initialize the SettingsEngine
_settingsEngine->initialize();
// Load scenegraph
// Initialize the Scene
Scene* sceneGraph = new Scene;
sceneGraph->initialize();
std::string scenePath = "";
configurationManager().getValue(ConfigurationManager::KeyConfigScene, scenePath);
sceneGraph->scheduleLoadSceneFile(scenePath);
@@ -436,8 +435,6 @@ bool OpenSpaceEngine::initialize() {
// Initialize the RenderEngine
_renderEngine->setSceneGraph(sceneGraph);
_renderEngine->initialize();
//_interactionHandler->setKeyboardController(new interaction::KeyboardControllerFixed);
//_interactionHandler->setMouseController(new interaction::OrbitalMouseController);