Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere

# Conflicts:
#	modules/imgui/src/renderproperties.cpp

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

@@ -104,8 +104,6 @@ public:
     void writeDocumentation();
     void toggleShutdownMode();
 
-    void runPostInitializationScripts(const std::string& sceneDescription);
-
     // Guaranteed to return a valid pointer
     ConfigurationManager& configurationManager();
     LuaConsole& console();
@@ -178,6 +176,8 @@ private:
     void gatherCommandlineArguments();
     void loadFonts();
     void runPreInitializationScripts(const std::string& sceneDescription);
+    void runPostInitializationScripts(const std::string& sceneDescription);
+    void runGlobalCustomizationScripts(const std::string& sceneDescription);
     void configureLogging();
 
     // Components

include/openspace/interaction/keybindingmanager.h

@@ -40,6 +40,15 @@ namespace openspace::interaction {
 
 class KeyBindingManager : public DocumentationGenerator {
 public:
+    using IsLocalBind = ghoul::Boolean;
+    using IsSynchronized = ghoul::Boolean;
+
+    struct KeyInformation {
+        std::string command;
+        IsSynchronized synchronization;
+        std::string documentation;
+    };
+
     KeyBindingManager();
     ~KeyBindingManager() = default;
 
@@ -59,19 +68,17 @@ public:
         std::string documentation = ""
     );
 
+    void removeKeyBinding(const std::string& key);
+
+    std::vector<std::pair<KeyWithModifier, KeyInformation>> keyBinding(
+        const std::string& key) const; 
+
     static scripting::LuaLibrary luaLibrary();
 
     // Callback functions
     void keyboardCallback(Key key, KeyModifier modifier, KeyAction action);
 
 private:
-    using Synchronized = ghoul::Boolean;
-
-    struct KeyInformation {
-        std::string command;
-        Synchronized synchronization;
-        std::string documentation;
-    };
 
     std::string generateJson() const override;
 

include/openspace/properties/numericalproperty.inl

@@ -367,12 +367,12 @@ void NumericalProperty<T>::setMaxValue(T value) {
 
 template <typename T>
 T NumericalProperty<T>::steppingValue() const {
-    return _steppingValue;
+    return _stepping;
 }
 
 template <typename T>
 void NumericalProperty<T>::setSteppingValue(T value) {
-    _steppingValue = std::move(value);
+    _stepping = std::move(value);
 }
 
 template <typename T>

include/openspace/util/keys.h

@@ -217,6 +217,7 @@ struct KeyWithModifier {
 
 KeyWithModifier stringToKey(std::string str);
 bool operator<(const KeyWithModifier& lhs, const KeyWithModifier& rhs);
+bool operator==(const KeyWithModifier& lhs, const KeyWithModifier& rhs);
 
 static const std::map<std::string, KeyModifier> KeyModifierMapping = {
     { "SHIFT", KeyModifier::Shift },