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

Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp

include/openspace/engine/configurationmanager.h

@@ -1,4 +1,4 @@
-/*****************************************************************************************
+/*****************************************************************************************
  *                                                                                       *
  * OpenSpace                                                                             *
  *                                                                                       *
@@ -78,12 +78,16 @@ public:
     static const std::string KeySettingsScript;
     /// The key that stores the settings for determining log-related settings
     static const std::string KeyLogging;
+    /// The key that stores the directory for Logging
+    static const std::string PartLogDir;
     /// The key that stores the desired LogLevel for the whole application
     /// \sa ghoul::logging::LogManager
     static const std::string PartLogLevel;
     /// The key that stores whether the log should be immediately flushed after a n
     /// \sa ghoul::logging::LogManager
     static const std::string PartImmediateFlush;
+    /// The key for prefixing PerformanceMeasurement logfiles
+    static const std::string PartLogPerformancePrefix;
     /// The key that stores a subdirectory with a description for additional
     /// ghoul::logging::Log%s to be created
     /// \sa LogFactory
@@ -144,6 +148,11 @@ public:
     static const std::string PartFilterIdentifierIdentifier;
     /// The part of the key storing a list of severities that should be filtered out
     static const std::string PartFilterSeverity;
+    /// The part of the key storing whether the OpenGL state should be checked each call
+    static const std::string KeyCheckOpenGLState;
+    /// The part of the key storing whether each OpenGL call should be logged
+    static const std::string KeyLogEachOpenGLCall;
+
 
     /**
      * Iteratively walks the directory structure starting with \p filename to find the

include/openspace/engine/moduleengine.h

@@ -97,7 +97,7 @@ public:
     ModuleSubClass* module() const {
         auto it = std::find_if(_modules.begin(), _modules.end(),
             [](const std::unique_ptr<OpenSpaceModule>& module) {
-                return module->name() == ModuleSubClass::name;
+                return module->name() == ModuleSubClass::Name;
             });
         if (it != _modules.end()) {
             return dynamic_cast<ModuleSubClass*>(it->get());

include/openspace/engine/openspaceengine.h

@@ -64,7 +64,10 @@ class SyncEngine;
 class TimeManager;
 class WindowWrapper;
 
-namespace interaction { class InteractionHandler; }
+namespace interaction {
+    class NavigationHandler;
+    class KeyBindingManager;
+}
 namespace gui { class GUI; }
 namespace properties { class PropertyOwner; }
 namespace scripting {
@@ -98,7 +101,7 @@ public:
     void charCallback(unsigned int codepoint, KeyModifier mod);
     void mouseButtonCallback(MouseButton button, MouseAction action);
     void mousePositionCallback(double x, double y);
-    void mouseScrollWheelCallback(double pos);
+    void mouseScrollWheelCallback(double posX, double posY);
     void externalControlCallback(const char* receivedChars, int size, int clientId);
     void encode();
     void decode();
@@ -124,7 +127,8 @@ public:
     WindowWrapper& windowWrapper();
     AssetLoader& assetLoader();
     ghoul::fontrendering::FontManager& fontManager();
-    interaction::InteractionHandler& interactionHandler();
+    interaction::NavigationHandler& navigationHandler();
+    interaction::KeyBindingManager& keyBindingManager();
     properties::PropertyOwner& globalPropertyOwner();
     scripting::ScriptEngine& scriptEngine();
     scripting::ScriptScheduler& scriptScheduler();
@@ -163,7 +167,9 @@ public:
         std::function<void (double, double)> function);
     
     // Registers a callback that is called when a scroll wheel change is received
-    void registerModuleMouseScrollWheelCallback(std::function<bool (double)> function);
+    void registerModuleMouseScrollWheelCallback(
+        std::function<bool (double, double)> function
+    );
     
     /**
      * Returns the Lua library that contains all Lua functions available to affect the
@@ -197,7 +203,8 @@ private:
     std::unique_ptr<WindowWrapper> _windowWrapper;
     std::unique_ptr<ghoul::cmdparser::CommandlineParser> _commandlineParser;
     std::unique_ptr<ghoul::fontrendering::FontManager> _fontManager;
-    std::unique_ptr<interaction::InteractionHandler> _interactionHandler;
+    std::unique_ptr<interaction::NavigationHandler> _navigationHandler;
+    std::unique_ptr<interaction::KeyBindingManager> _keyBindingManager;
     std::unique_ptr<scripting::ScriptEngine> _scriptEngine;
     std::unique_ptr<scripting::ScriptScheduler> _scriptScheduler;
     std::unique_ptr<VirtualPropertyManager> _virtualPropertyManager;
@@ -225,7 +232,7 @@ private:
         
         std::vector<std::function<bool (MouseButton, MouseAction)>> mouseButton;
         std::vector<std::function<void (double, double)>> mousePosition;
-        std::vector<std::function<bool (double)>> mouseScrollWheel;
+        std::vector<std::function<bool (double, double)>> mouseScrollWheel;
     } _moduleCallbacks;
     
     double _runTime;