Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

include/openspace/engine/configurationmanager.h

@@ -51,6 +51,9 @@ public:
     /// The key that stores the location of the SGCT configuration file that is used on
     /// application launch
     static const std::string KeyConfigSgct;
+    /// The key that defines a list of scripts for global customization that get executed
+    /// regardless of which scene is loaded
+    static const std::string KeyGlobalCustomizationScripts;
     /// The part of the key that defines the type
     static const std::string PartType;
     /// The part of the key that defines the file

include/openspace/engine/openspaceengine.h

@@ -43,6 +43,7 @@ namespace openspace {
 
 class AssetManager;
 class ConfigurationManager;
+class Dashboard;
 class DownloadManager;
 class GUI;
 class LoadingScreen;
@@ -109,6 +110,7 @@ public:
     ConfigurationManager& configurationManager();
     LuaConsole& console();
     AssetManager& assetManager();
+    Dashboard& dashboard();
     DownloadManager& downloadManager();
     ModuleEngine& moduleEngine();
     LoadingScreen& loadingScreen();
@@ -177,13 +179,18 @@ private:
     void loadSingleAsset(const std::string& assetPath);
     void gatherCommandlineArguments();
     void loadFonts();
+
     void configureLogging(bool consoleLog);
     void writeDocumentations();
     
+    void runGlobalCustomizationScripts(const std::string& sceneDescription);
+    void configureLogging();
+
     // Components
     std::unique_ptr<ConfigurationManager> _configurationManager;
     std::unique_ptr<Scene> _scene;
     std::unique_ptr<AssetManager> _assetManager;
+    std::unique_ptr<Dashboard> _dashboard;
     std::unique_ptr<DownloadManager> _downloadManager;
     std::unique_ptr<LuaConsole> _console;
     std::unique_ptr<ModuleEngine> _moduleEngine;