Merge remote-tracking branch 'origin/feature/iSWA' into release/ips

include/openspace/engine/wrapper/sgctwindowwrapper.h

@@ -51,6 +51,7 @@ public:
     bool isRegularRendering() const override;
     
     glm::mat4 viewProjectionMatrix() const override;
+    glm::mat4 modelMatrix() const override;
     void setNearFarClippingPlane(float near, float far) override;
     void setEyeSeparationDistance(float distance) override;
     

include/openspace/engine/wrapper/windowwrapper.h

@@ -131,6 +131,13 @@ public:
      * \return The currently employed view-projection matrix
      */
     virtual glm::mat4 viewProjectionMatrix() const;
+
+    /**
+     * Returns the currently employed model matrix. On default, this method will return
+     * the identity matrix.
+     * \return The currently employed model matrix
+     */
+    virtual glm::mat4 modelMatrix() const;
     
     /**
      * Sets the near and far clipping planes of the rendering window. This method defaults