Merge branch 'master' into feature/profiles

include/openspace/engine/globals.h

@@ -124,7 +124,8 @@ static VersionChecker& versionChecker = detail::gVersionChecker();
 static VirtualPropertyManager& virtualPropertyManager = detail::gVirtualPropertyManager();
 static WindowDelegate& windowDelegate = detail::gWindowDelegate();
 static configuration::Configuration& configuration = detail::gConfiguration();
-static interaction::InteractionMonitor& interactionMonitor = detail::gInteractionMonitor();
+static interaction::InteractionMonitor& interactionMonitor =
+    detail::gInteractionMonitor();
 static interaction::JoystickInputStates& joystickInputStates =
     detail::gJoystickInputStates();
 static interaction::WebsocketInputStates& websocketInputStates =

include/openspace/engine/openspaceengine.h

@@ -88,8 +88,8 @@ public:
     void touchDetectionCallback(TouchInput input);
     void touchUpdateCallback(TouchInput input);
     void touchExitCallback(TouchInput input);
-    std::vector<char> encode();
-    void decode(std::vector<char> data);
+    std::vector<std::byte> encode();
+    void decode(std::vector<std::byte> data);
 
     void scheduleLoadSingleAsset(std::string assetPath);
     void toggleShutdownMode();
@@ -125,6 +125,8 @@ private:
     bool _hasScheduledAssetLoading = false;
     std::string _scheduledAssetPathToLoad;
 
+    glm::vec2 _mousePosition;
+
     //grabs json from each module to pass to the documentation engine.
     std::string _documentationJson;
 

include/openspace/engine/syncengine.h

@@ -53,13 +53,13 @@ public:
      * Encodes all added Syncables in the injected <code>SyncBuffer</code>.
      * This method is only called on the SGCT master node
      */
-    std::vector<char> encodeSyncables();
+    std::vector<std::byte> encodeSyncables();
 
     /**
      * Decodes the <code>SyncBuffer</code> into the added Syncables.
      * This method is only called on the SGCT slave nodes
      */
-    void decodeSyncables(std::vector<char> data);
+    void decodeSyncables(std::vector<std::byte> data);
 
     /**
      * Invokes the presync method of all added Syncables

include/openspace/engine/windowdelegate.h

@@ -40,8 +40,6 @@ struct WindowDelegate {
 
     void (*setSynchronization)(bool enabled) = [](bool) {};
 
-    void (*clearAllWindows)(const glm::vec4& clearColor) = [](const glm::vec4&) {};
-
     bool (*windowHasResized)() = []() { return false; };
 
     double (*averageDeltaTime)() = []() { return 0.0; };
@@ -56,52 +54,29 @@ struct WindowDelegate {
 
     double (*applicationTime)() = []() { return 0.0; };
 
-    glm::vec2 (*mousePosition)() = []() { return glm::vec2(0.f); };
-
-    uint32_t (*mouseButtons)(int maxNumber) = [](int) { return uint32_t(0); };
-
     glm::ivec2 (*currentWindowSize)() = []() { return glm::ivec2(0); };
 
     glm::ivec2 (*currentSubwindowSize)() = []() { return glm::ivec2(0); };
 
-    glm::ivec2 (*currentWindowResolution)() = []() { return glm::ivec2(0); };
-
     glm::ivec2 (*currentDrawBufferResolution)() = []() { return glm::ivec2(0); };
 
     glm::ivec2 (*currentViewportSize)() = []() { return glm::ivec2(0); };
 
     glm::vec2 (*dpiScaling)() = []() { return glm::vec2(1.f); };
 
-    int (*currentNumberOfAaSamples)() = []() { return 1; };
-
     bool (*hasGuiWindow)() = []() { return false; };
 
     bool (*isGuiWindow)() = []() { return false; };
 
-    bool (*isMaster)() = []() { return false; };
-
-    int (*clusterId)() = []() { return 0; };
-
-    bool (*isUsingSwapGroups)() = []() { return false; };
-
-    bool (*isSwapGroupMaster)() = []() { return false; };
-
-    glm::mat4 (*viewProjectionMatrix)() = []() { return glm::mat4(1.f); };
+    bool (*isMaster)() = []() { return true; };
 
     glm::mat4 (*modelMatrix)() = []() { return glm::mat4(1.f); };
 
     void (*setNearFarClippingPlane)(float near, float far) = [](float, float) {};
 
-    void (*setEyeSeparationDistance)(float distance) = [](float) {};
-
-    glm::ivec4 (*viewportPixelCoordinates)() = []() { return glm::ivec4(0, 0, 0, 0); };
-
-    void (*sendMessageToExternalControl)(const std::vector<char>& message) =
-        [](const std::vector<char>&) {};
-
     bool (*isFisheyeRendering)() = []() { return false; };
 
-    unsigned int(*takeScreenshot)(bool applyWarping) = [](bool) { return 0u; };
+    unsigned int (*takeScreenshot)(bool applyWarping) = [](bool) { return 0u; };
 
     void (*swapBuffer)() = []() {};
 
@@ -112,9 +87,9 @@ struct WindowDelegate {
     double (*getHorizFieldOfView)() = []() { return 0.0; };
 
     void (*setHorizFieldOfView)(float hFovDeg) = [](float) { };
-    
-    void* (*getNativeWindowHandle)(size_t windowIndex) = [](size_t) -> void* { 
-        return nullptr; 
+
+    void* (*getNativeWindowHandle)(size_t windowIndex) = [](size_t) -> void* {
+        return nullptr;
     };
 
     using GLProcAddress = void(*)(void);