Solve conflict

include/openspace/engine/configurationmanager.h

@@ -109,6 +109,8 @@ public:
     /// The key that stores the switch for enabling/disabling the rendering on a master
     /// computer
     static const std::string KeyRenderingMethod;
+    /// The key that determines whether a new cache folder is used for each scene file
+    static const std::string KeyPerSceneCache;
     /// The key that stores the http proxy settings for the downloadmanager
     static const std::string KeyHttpProxy;
     /// The key that stores the address of the http proxy

include/openspace/engine/moduleengine.h

@@ -75,6 +75,14 @@ public:
      */
     std::vector<OpenSpaceModule*> modules() const;
 
+    /**
+     * Returns the combined minimum OpenGL version. The return value is the maximum
+     * version of all registered modules' OpenGL versions.
+     * \return The combined minimum OpenGL version
+     */
+    ghoul::systemcapabilities::OpenGLCapabilitiesComponent::Version
+        requiredOpenGLVersion() const;
+
     /**
     * Returns the Lua library that contains all Lua functions available to affect the
     * modules.

include/openspace/interaction/interactionhandler.h

@@ -34,6 +34,7 @@
 #include <openspace/util/mouse.h>
 #include <openspace/util/keys.h>
 
+#include <ghoul/misc/boolean.h>
 
 #include <list>
 
@@ -70,8 +71,18 @@ public:
     void addKeyframe(const datamessagestructures::CameraKeyframe &kf);
     void clearKeyframes();
 
-    void bindKeyLocal(Key key, KeyModifier modifier, std::string lua);
-    void bindKey(Key key, KeyModifier modifier, std::string lua);
+    void bindKeyLocal(
+        Key key,
+        KeyModifier modifier,
+        std::string luaCommand,
+        std::string documentation = ""
+    );
+    void bindKey(
+        Key key,
+        KeyModifier modifier,
+        std::string luaCommand,
+        std::string documentation = ""
+    );
     void lockControls();
     void unlockControls();
 
@@ -105,11 +116,19 @@ public:
     void writeKeyboardDocumentation(const std::string& type, const std::string& file);
 
 private:
+    using Synchronized = ghoul::Boolean;
+
+    struct KeyInformation {
+        std::string command;
+        Synchronized synchronization;
+        std::string documentation;
+    };
+
     void setInteractionMode(std::shared_ptr<InteractionMode> interactionMode);
 
     bool _cameraUpdatedFromScript = false;
 
-    std::multimap<KeyWithModifier, std::pair<std::string, bool>> _keyLua;
+    std::multimap<KeyWithModifier, KeyInformation> _keyLua;
 
     std::unique_ptr<InputState> _inputState;
     Camera* _camera;

include/openspace/network/parallelconnection.h

@@ -44,14 +44,7 @@
 #include <map>
 #include <condition_variable>
 
-#ifdef WIN32
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <winsock2.h>
-#include <windows.h>
-#include <ws2tcpip.h>
-#endif
+
 
 #if defined(WIN32) || defined(__MING32__) || defined(__MING64__)
 typedef size_t _SOCKET;
@@ -60,6 +53,8 @@ typedef int _SOCKET;
 #include <netdb.h>
 #endif
 
+struct addrinfo;
+
 namespace openspace {
 
 class ParallelConnection {

include/openspace/properties/optionproperty.h

@@ -51,8 +51,8 @@ public:
     };
 
     enum class DisplayType {
-        RADIO,
-        DROPDOWN
+        Radio,
+        Dropdown
     };
 
     /**

include/openspace/rendering/renderengine.h

@@ -27,15 +27,12 @@
 
 #include <openspace/scripting/scriptengine.h>
 
-#include <openspace/properties/vectorproperty.h>
-#include <openspace/properties/stringproperty.h>
-#include <openspace/rendering/screenspacerenderable.h>
+#include <openspace/properties/optionproperty.h>
+#include <openspace/properties/propertyowner.h>
+#include <openspace/properties/scalarproperty.h>
 
 #include <openspace/util/syncdata.h>
 
-
-#include <openspace/performance/performancemanager.h>
-
 namespace ghoul {
 namespace fontrendering {
     class Font;
@@ -49,6 +46,10 @@ class SharedMemory;
 
 namespace openspace {
 
+namespace performance {
+class PerformanceManager;
+}
+
 // Forward declare to minimize dependencies
 class Camera;
 class SyncBuffer;
@@ -59,7 +60,7 @@ class RaycasterManager;
 class ScreenLog;
 class ScreenSpaceRenderable;
 
-class RenderEngine {
+class RenderEngine : public properties::PropertyOwner {
 public:
     enum class RendererImplementation {
         Framebuffer = 0,
@@ -112,10 +113,8 @@ public:
 
     void takeScreenshot(bool applyWarping = false);
     void toggleInfoText(bool b);
-    void toggleFrametimeType(int t);
 
     // Performance measurements
-    void setPerformanceMeasurements(bool performanceMeasurements);
     bool doesPerformanceMeasurements() const;
     performance::PerformanceManager* performanceManager();
 
@@ -193,15 +192,6 @@ public:
     glm::ivec2 renderingResolution() const;
     glm::ivec2 fontResolution() const;
 
-    // This is temporary until a proper screenspace solution is found ---abock
-    struct OnScreenInformation{
-        glm::vec2 _position;
-        unsigned int _size;
-        int _node;
-    };
-
-    SyncData<OnScreenInformation> _onScreenInformation;
-
     std::vector<Syncable*> getSyncables();
     
 private:
@@ -214,6 +204,7 @@ private:
     Scene* _sceneGraph;
     RaycasterManager* _raycasterManager;
 
+    properties::BoolProperty _performanceMeasurements;
     std::unique_ptr<performance::PerformanceManager> _performanceManager;
 
     std::unique_ptr<Renderer> _renderer;
@@ -222,7 +213,9 @@ private:
     ghoul::Dictionary _resolveData;
     ScreenLog* _log;
 
-    FrametimeType _frametimeType;
+    properties::OptionProperty _frametimeType;
+
+    //FrametimeType _frametimeType;
 
     bool _showInfo;
     bool _showLog;

include/openspace/util/openspacemodule.h

@@ -29,6 +29,8 @@
 
 #include <openspace/documentation/documentation.h>
 
+#include <ghoul/systemcapabilities/openglcapabilitiescomponent.h>
+
 #include <string>
 #include <vector>
 
@@ -66,8 +68,20 @@ public:
      */
     void deinitialize();
 
+    /**
+     * Returns a list of Documentation classes that are valid for this OpenSpaceModule.
+     * \return A list of Documentation classes that are valid for this OpenSapceModule
+     */
     virtual std::vector<Documentation> documentations() const;
 
+    /**
+     * Returns the minimum required OpenGL version of this OpenSpaceModule. Unless
+     * overwritten, it returns an OpenGL version of <code>3.3</code>.
+     * \return The minimum required OpenGL version of this OpenSpaceModule
+     */
+    virtual ghoul::systemcapabilities::OpenGLCapabilitiesComponent::Version
+        requiredOpenGLVersion() const;
+
 protected:
     /**
      * Customization point for each derived class. The internalInitialize method is called

include/openspace/util/updatestructures.h

@@ -45,8 +45,8 @@ struct TransformData {
 struct UpdateData {
     TransformData modelTransform;
     double time;
-    bool isTimeJump;
     double delta;
+    bool isTimeJump;
     bool doPerformanceMeasurement;
 };