From f53c4b6193d5d0ad776f81dc0a9a0907e90da3c0 Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Wed, 27 Jul 2016 09:25:28 -0600
Subject: [PATCH 1/9] OptionProperty: ability to get the string description by
 passing a value string getDescriptionByValue(int)

---
 include/openspace/properties/optionproperty.h | 8 +++++++-
 src/properties/optionproperty.cpp             | 8 ++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h
index 15eb71709f..50fea9aaeb 100644
--- a/include/openspace/properties/optionproperty.h
+++ b/include/openspace/properties/optionproperty.h
@@ -96,7 +96,7 @@ public:
 
     /**
      * Returns the list of available options.
-     * /return The list of available options
+     * \return The list of available options
      */
     const std::vector<Option>& options() const;
 
@@ -107,6 +107,12 @@ public:
      */
     void setValue(int value) override;
 
+    /**
+    * Get the description of the option that matches <code>value</code>
+    * \param value The value of the option 
+    */
+    std::string getDescriptionByValue(int value);
+
 private:
     static const std::string OptionsKey;
     std::string generateAdditionalDescription() const;
diff --git a/src/properties/optionproperty.cpp b/src/properties/optionproperty.cpp
index 50275bbc95..b205a4e9fd 100644
--- a/src/properties/optionproperty.cpp
+++ b/src/properties/optionproperty.cpp
@@ -103,6 +103,14 @@ void OptionProperty::setValue(int value) {
     LERROR("Could not find an option for value '" << value << "' in OptionProperty");
 }
 
+std::string OptionProperty::getDescriptionByValue(int value) {
+    for (auto option : _options) {
+        if (option.value == value) {
+            return option.description;
+        }
+    }
+}
+
 std::string OptionProperty::generateAdditionalDescription() const {
     // @REFACTOR from selectionproperty.cpp, possible refactoring? ---abock
     std::string result;

From 07e8a059d16c0d8d3aa834ddcb61846d7975b1b8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 27 Jul 2016 20:46:56 +0200
Subject: [PATCH 2/9] Correctly output CMake messages about dependency only
 when they are needed

---
 support/cmake/support_macros.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/support/cmake/support_macros.cmake b/support/cmake/support_macros.cmake
index 8060ce731c..8d05a9628f 100644
--- a/support/cmake/support_macros.cmake
+++ b/support/cmake/support_macros.cmake
@@ -374,8 +374,10 @@ function (handle_internal_modules)
                 if (OPENSPACE_DEPENDENCIES)
                     foreach (dependency ${OPENSPACE_DEPENDENCIES})
                         create_option_name(${dependency} dependencyOptionName)
-                        set(${dependencyOptionName} ON CACHE BOOL "ff" FORCE)
-                        message(STATUS "${dependencyOptionName} was set to build, due to dependency towards ${optionName}")
+                        if (NOT ${dependencyOptionName})
+                            set(${dependencyOptionName} ON CACHE BOOL "ff" FORCE)
+                            message(STATUS "${dependencyOptionName} was set to build, due to dependency towards ${optionName}")
+                        endif ()
                     endforeach ()
                 endif ()
             endif ()

From 035f5ba9894e7f577e4b329d12fb360418c1cff2 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Wed, 27 Jul 2016 20:49:51 +0200
Subject: [PATCH 3/9] Remove extra whitespace is autumn.tf

---
 data/scene/iswa/tfs/{autumn.tf  => autumn.tf} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/scene/iswa/tfs/{autumn.tf  => autumn.tf} (100%)

diff --git a/data/scene/iswa/tfs/autumn.tf  b/data/scene/iswa/tfs/autumn.tf
similarity index 100%
rename from data/scene/iswa/tfs/autumn.tf 
rename to data/scene/iswa/tfs/autumn.tf

From fdb90f74ac8acb1c0ccdfd8ae9d6fe46e9041a57 Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Wed, 27 Jul 2016 16:45:43 -0600
Subject: [PATCH 4/9] Added scene selector in the SettingsEngine, in the GUI
 under Global Properties. Has placeholder functionality for what's coming in
 the next commit.

---
 include/openspace/engine/settingsengine.h | 12 ++++--
 src/engine/openspaceengine.cpp            |  3 ++
 src/engine/settingsengine.cpp             | 48 +++++++++++++++++++++--
 3 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/include/openspace/engine/settingsengine.h b/include/openspace/engine/settingsengine.h
index 583abba854..ce79ac0996 100644
--- a/include/openspace/engine/settingsengine.h
+++ b/include/openspace/engine/settingsengine.h
@@ -27,18 +27,24 @@
 
 #include <openspace/properties/propertyowner.h>
 #include <openspace/properties/scalarproperty.h>
+#include <openspace/properties/optionproperty.h>
 
 namespace openspace {
 
 class SettingsEngine : public properties::PropertyOwner {
 public:
-  SettingsEngine();
+    SettingsEngine();
+
+    void initialize();
 
 private:
-  properties::FloatProperty _eyeSeparation;
+    void initEyeSeparation();
+    void initSceneFiles();
+
+    properties::FloatProperty _eyeSeparation;
+    properties::OptionProperty _scenes;
 };
 
 } // namespace openspace
 
-
 #endif //#ifndef __SETTINGSENGINE_H__
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 99630b394a..9e72793d23 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -416,6 +416,9 @@ bool OpenSpaceEngine::initialize() {
         ConfigurationManager::KeyShutdownCountdown, _shutdownWait
     );
 
+    // Initialize the SettingsEngine
+    _settingsEngine->initialize();
+
     // Load scenegraph
     Scene* sceneGraph = new Scene;
     _renderEngine->setSceneGraph(sceneGraph);
diff --git a/src/engine/settingsengine.cpp b/src/engine/settingsengine.cpp
index 0dd553da15..9f0ad0615c 100644
--- a/src/engine/settingsengine.cpp
+++ b/src/engine/settingsengine.cpp
@@ -25,17 +25,57 @@
 #include <openspace/engine/settingsengine.h>
 
 #include <openspace/engine/openspaceengine.h>
+#include <openspace/engine/configurationmanager.h>
 #include <openspace/engine/wrapper/windowwrapper.h>
+#include <openspace/scene/scene.h>
+
+#include <ghoul/ghoul.h>
+#include <ghoul/filesystem/filesystem.h>
 
 namespace openspace {
 
-SettingsEngine::SettingsEngine() :
-    _eyeSeparation("eyeSeparation", "Eye Separation" , 0.f, 0.f, 10.f)
+SettingsEngine::SettingsEngine()
+    : _eyeSeparation("eyeSeparation", "Eye Separation" , 0.f, 0.f, 10.f)
+    , _scenes("scenes", "Scene", properties::OptionProperty::DisplayType::DROPDOWN)
 {
+    setName("Global Properties");
+}
+
+void SettingsEngine::initialize() {
+    initEyeSeparation();
+    initSceneFiles();
+}
+
+
+void SettingsEngine::initEyeSeparation() {
     addProperty(_eyeSeparation);
-    setName("Global");
+
+    // Set interaction to change the window's (SGCT's) eye separation
     _eyeSeparation.onChange(
-        [this](){ OsEng.windowWrapper().setEyeSeparationDistance(_eyeSeparation); });
+        [this]() { OsEng.windowWrapper().setEyeSeparationDistance(_eyeSeparation); });
+}
+
+void SettingsEngine::initSceneFiles() {
+    addProperty(_scenes);
+
+    // Load all matching files in the Scene
+    // TODO: match regex with either with new ghoul readFiles or local code
+    std::string sceneDir = "${SCENE}";
+    std::vector<std::string> scenes = ghoul::filesystem::Directory(sceneDir).readFiles();
+    for (std::size_t i = 0; i < scenes.size(); ++i) {
+        _scenes.addOption(i, scenes[i]);
+    }
+
+    // Set interaction to change ConfigurationManager and schedule the load
+    _scenes.onChange(
+        [this]() {
+            std::string sceneFile = _scenes.getDescriptionByValue(_scenes);
+            OsEng.configurationManager().setValue(
+                ConfigurationManager::KeyConfigScene, sceneFile);
+            std::cout << "For a relatively atomic commit, just pretending to load "
+                << sceneFile << std::endl;
+        }
+    );
 }
 
 }

From 10f9742213e64a5a612a0f3821c808a320e5314f Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Wed, 27 Jul 2016 16:49:01 -0600
Subject: [PATCH 5/9] Activate scene change dropdown in Global
 Properties/SettingsEngine Included some cleanup how the Scene::update
 function works with the InteractionHandler

---
 src/engine/settingsengine.cpp |  3 +--
 src/scene/scene.cpp           | 11 +++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/engine/settingsengine.cpp b/src/engine/settingsengine.cpp
index 9f0ad0615c..c4dbe49758 100644
--- a/src/engine/settingsengine.cpp
+++ b/src/engine/settingsengine.cpp
@@ -72,8 +72,7 @@ void SettingsEngine::initSceneFiles() {
             std::string sceneFile = _scenes.getDescriptionByValue(_scenes);
             OsEng.configurationManager().setValue(
                 ConfigurationManager::KeyConfigScene, sceneFile);
-            std::cout << "For a relatively atomic commit, just pretending to load "
-                << sceneFile << std::endl;
+            OsEng.renderEngine().scene()->scheduleLoadSceneFile(sceneFile);
         }
     );
 }
diff --git a/src/scene/scene.cpp b/src/scene/scene.cpp
index ff6591ac9b..96af4fe010 100644
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -91,9 +91,12 @@ void Scene::update(const UpdateData& data) {
     if (!_sceneGraphToLoad.empty()) {
         OsEng.renderEngine().scene()->clearSceneGraph();
         try {
+            // Reset the InteractionManager to Orbital/default mode
+            // TODO: Decide if it belongs in the scene and/or how it gets reloaded
+            OsEng.interactionHandler().setInteractionModeToOrbital();
+
             loadSceneInternal(_sceneGraphToLoad);
-            _sceneGraphToLoad = "";
-            
+
             // After loading the scene, the keyboard bindings have been set
             
             std::string type;
@@ -109,6 +112,9 @@ void Scene::update(const UpdateData& data) {
             if (hasType && hasFile) {
                 OsEng.interactionHandler().writeKeyboardDocumentation(type, file);
             }
+
+            LINFO("Loaded " << _sceneGraphToLoad);
+            _sceneGraphToLoad = "";
         }
         catch (const ghoul::RuntimeError& e) {
             LERROR(e.what());
@@ -150,6 +156,7 @@ void Scene::scheduleLoadSceneFile(const std::string& sceneDescriptionFilePath) {
 }
 
 void Scene::clearSceneGraph() {
+    LINFO("Clearing current scene graph");
     // deallocate the scene graph. Recursive deallocation will occur
     _graph.clear();
     //if (_root) {

From 10e00b0d3c5fad91964d98461d3e297337bc936b Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Wed, 27 Jul 2016 16:58:04 -0600
Subject: [PATCH 6/9] Slightly rearrange/cleanup OpenspaceEngine::initialize
 Simplify scene file config/commandline logic, group scene and renderEngine
 work

---
 src/engine/openspaceengine.cpp | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 9e72793d23..0031cbf06a 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -415,32 +415,35 @@ bool OpenSpaceEngine::initialize() {
     configurationManager().getValue(
         ConfigurationManager::KeyShutdownCountdown, _shutdownWait
     );
+    
+    if (!commandlineArgumentPlaceholders.sceneName.empty())
+        configurationManager().setValue(
+            ConfigurationManager::KeyConfigScene, commandlineArgumentPlaceholders.sceneName);
+
+    // Initialize SettingsEngine
+    _settingsEngine->initialize();
 
     // Initialize the SettingsEngine
     _settingsEngine->initialize();
 
     // Load scenegraph
     Scene* sceneGraph = new Scene;
-    _renderEngine->setSceneGraph(sceneGraph);
-
-    // initialize the RenderEngine
-    _renderEngine->initialize();
     sceneGraph->initialize();
+    std::string scenePath = "";
+    configurationManager().getValue(ConfigurationManager::KeyConfigScene, scenePath);
+    sceneGraph->scheduleLoadSceneFile(scenePath);
+
+    // Initialize the RenderEngine
+    _renderEngine->setSceneGraph(sceneGraph);
+    _renderEngine->initialize();
+    
 
-    std::string sceneDescriptionPath = "";
-    if (commandlineArgumentPlaceholders.sceneName.empty()) {
-        success = configurationManager().getValue(
-            ConfigurationManager::KeyConfigScene, sceneDescriptionPath);
-    }
-    else
-        sceneDescriptionPath = commandlineArgumentPlaceholders.sceneName;
-    sceneGraph->scheduleLoadSceneFile(sceneDescriptionPath);
 
     //_interactionHandler->setKeyboardController(new interaction::KeyboardControllerFixed);
     //_interactionHandler->setMouseController(new interaction::OrbitalMouseController);
 
     // Run start up scripts
-    runPreInitializationScripts(sceneDescriptionPath);
+    runPreInitializationScripts(scenePath);
 
     // Load a light and a monospaced font
     loadFonts();

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 7/9] 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);

From 9a435ac74db29721d8ec6311cc7fe935fce953f0 Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Wed, 27 Jul 2016 19:25:49 -0600
Subject: [PATCH 8/9] Extended temporary fade functionality Fade in on
 initialization, toggleFade Lua binding to "w", prevent trying to fade out/in
 if already at min/max

---
 scripts/common.lua                 |  2 ++
 src/engine/openspaceengine.cpp     |  3 +++
 src/rendering/renderengine.cpp     | 19 +++++++++++++++++--
 src/rendering/renderengine_lua.inl | 19 +++++++++++++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/scripts/common.lua b/scripts/common.lua
index b8dcf5a401..45646532c8 100644
--- a/scripts/common.lua
+++ b/scripts/common.lua
@@ -21,6 +21,8 @@ helper.setCommonKeys = function()
 
     openspace.bindKey("f", helper.property.invert('Interaction.rotationalFriction'))
     openspace.bindKey("Shift+f", helper.property.invert('Interaction.zoomFriction'))
+
+    openspace.bindKey("w", "openspace.toggleFade(3)")
 end
 
 helper.setDeltaTimeKeys = function(t)
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 14cb15a595..a6dfcbeff6 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -435,6 +435,9 @@ bool OpenSpaceEngine::initialize() {
     // Initialize the RenderEngine
     _renderEngine->setSceneGraph(sceneGraph);
     _renderEngine->initialize();
+    _renderEngine->setGlobalBlackOutFactor(0.0);
+    _renderEngine->startFading(1, 3.0);
+
 
     //_interactionHandler->setKeyboardController(new interaction::KeyboardControllerFixed);
     //_interactionHandler->setMouseController(new interaction::OrbitalMouseController);
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index a48d56a66d..bd6954f1da 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -325,11 +325,19 @@ void RenderEngine::preSynchronization() {
 
 void RenderEngine::postSynchronizationPreDraw() {
     //temporary fade funtionality
+    float fadedIn = 1.0;
+    float fadedOut = 0.0;
+    // Don't restart the fade if you've already done it in that direction
+    if (  (_fadeDirection > 0 && _globalBlackOutFactor == fadedIn)
+       || (_fadeDirection < 0 && _globalBlackOutFactor == fadedOut)) {
+        _fadeDirection = 0;
+    }
+
     if (_fadeDirection != 0) {
         if (_currentFadeTime > _fadeDuration){
+            _globalBlackOutFactor = _fadeDirection > 0 ? fadedIn : fadedOut;
             _fadeDirection = 0;
-            _globalBlackOutFactor = fminf(1.f, fmaxf(0.f, _globalBlackOutFactor));
-        } 
+        }
         else {
             if (_fadeDirection < 0)
                 _globalBlackOutFactor = glm::smoothstep(1.f, 0.f, _currentFadeTime / _fadeDuration);
@@ -711,6 +719,13 @@ scripting::LuaLibrary RenderEngine::luaLibrary() {
                 "bool",
                 "Sets the performance measurements"
             },
+            {
+                "toggleFade",
+                &luascriptfunctions::toggleFade,
+                "number",
+                "Toggles fading in or out",
+                true
+            },
             {
                 "fadeIn",
                 &luascriptfunctions::fadeIn,
diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl
index 5e3937aeb6..29e143c736 100644
--- a/src/rendering/renderengine_lua.inl
+++ b/src/rendering/renderengine_lua.inl
@@ -107,6 +107,25 @@ int setPerformanceMeasurement(lua_State* L) {
     return 0;
 }
 
+/**
+* \ingroup LuaScripts
+* toggleFade(float):
+* Toggle a global fade over (float) seconds
+*/
+int toggleFade(lua_State* L) {
+    int nArguments = lua_gettop(L);
+    if (nArguments != 1)
+        return luaL_error(L, "Expected %i arguments, got %i", 1, nArguments);
+
+    double t = luaL_checknumber(L, -1);
+    
+    float fadedIn = 0.0;
+    int direction = OsEng.renderEngine().globalBlackOutFactor() == fadedIn ? -1 : 1;
+
+    OsEng.renderEngine().startFading(direction, static_cast<float>(t));
+    return 0;
+}
+
 /**
 * \ingroup LuaScripts
 * fadeIn(float):

From 1943e069a0488fa54ab11ff88911dbebeff26812 Mon Sep 17 00:00:00 2001
From: Matthew Territo <wundahful@users.noreply.github.com>
Date: Wed, 27 Jul 2016 19:32:06 -0600
Subject: [PATCH 9/9] FIXED: Extended temporary fade functionality Fade in on
 initialization, toggleFade Lua binding to "w", prevent trying to fade out/in
 if already at min/max

Flipped a variable between compiles and apparently lost track of which was the correct one :-/
---
 src/rendering/renderengine_lua.inl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rendering/renderengine_lua.inl b/src/rendering/renderengine_lua.inl
index 29e143c736..71b6a4fd2e 100644
--- a/src/rendering/renderengine_lua.inl
+++ b/src/rendering/renderengine_lua.inl
@@ -119,7 +119,7 @@ int toggleFade(lua_State* L) {
 
     double t = luaL_checknumber(L, -1);
     
-    float fadedIn = 0.0;
+    float fadedIn = 1.0;
     int direction = OsEng.renderEngine().globalBlackOutFactor() == fadedIn ? -1 : 1;
 
     OsEng.renderEngine().startFading(direction, static_cast<float>(t));