mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

Browse Source
This commit is contained in:
Sebastian Piwell
2016-06-15 10:33:08 -04:00
parent 78b827d9d6 573ebd34a7
commit fe28c9b0aa
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rendering/screenspacerenderable.cpp
View File

@@ -24,6 +24,7 @@
#include <openspace/engine/openspaceengine.h>
#include <openspace/rendering/screenspacerenderable.h>
#include <openspace/util/factorymanager.h>
#include <sgct.h>
namespace {
const std::string _loggerCat = "ScreenSpaceRenderable";
@@ -243,7 +244,8 @@ glm::mat4 ScreenSpaceRenderable::scaleMatrix(){
}
glm::mat4 ScreenSpaceRenderable::rotationMatrix(){
glm::mat4 rotation(1.0);
// Get the scene transform
glm::mat4 rotation = sgct::Engine::instance()->getModelMatrix();
if(!_useEuclideanCoordinates){
glm::vec2 position = _sphericalPosition.value();