diff --git a/include/openspace/engine/wrapper/sgctwindowwrapper.h b/include/openspace/engine/wrapper/sgctwindowwrapper.h index 6a1c170dd0..3b19931658 100644 --- a/include/openspace/engine/wrapper/sgctwindowwrapper.h +++ b/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; glm::ivec4 viewportPixelCoordinates() const override; diff --git a/include/openspace/engine/wrapper/windowwrapper.h b/include/openspace/engine/wrapper/windowwrapper.h index d20f5339db..5cc4e430e9 100644 --- a/include/openspace/engine/wrapper/windowwrapper.h +++ b/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 diff --git a/src/engine/wrapper/sgctwindowwrapper.cpp b/src/engine/wrapper/sgctwindowwrapper.cpp index b3a3134a22..f566276a39 100644 --- a/src/engine/wrapper/sgctwindowwrapper.cpp +++ b/src/engine/wrapper/sgctwindowwrapper.cpp @@ -115,6 +115,10 @@ bool SGCTWindowWrapper::isRegularRendering() const { glm::mat4 SGCTWindowWrapper::viewProjectionMatrix() const { return sgct::Engine::instance()->getCurrentModelViewProjectionMatrix(); } + +glm::mat4 SGCTWindowWrapper::modelMatrix() const { + return sgct::Engine::instance()->getModelMatrix(); +} void SGCTWindowWrapper::setNearFarClippingPlane(float nearPlane, float farPlane) { sgct::Engine::instance()->setNearAndFarClippingPlanes(nearPlane, farPlane); diff --git a/src/engine/wrapper/windowwrapper.cpp b/src/engine/wrapper/windowwrapper.cpp index 8283edf577..17344d9f8a 100644 --- a/src/engine/wrapper/windowwrapper.cpp +++ b/src/engine/wrapper/windowwrapper.cpp @@ -75,6 +75,10 @@ bool WindowWrapper::isRegularRendering() const { glm::mat4 WindowWrapper::viewProjectionMatrix() const { return glm::mat4(1.f); } + +glm::mat4 WindowWrapper::modelMatrix() const { + return glm::mat4(1.f); +} void WindowWrapper::setNearFarClippingPlane(float near, float far) {}