From 94625e541bfc13e7375b9062e6b7634762ace000 Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Wed, 27 Jul 2016 17:02:24 -0600
Subject: [PATCH] FIXED: Slightly rearrange/cleanup OpenspaceEngine::initialize
 Simplify scene file config/commandline logic, group scene and renderEngine
 work

(Stashed changes took over real changes)
---
 src/engine/openspaceengine.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 0031cbf06a..14cb15a595 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -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);