mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

rotation instead of translation in polar coordinates mode

Browse Source
This commit is contained in:
Michael Nilsson
2016-03-15 09:20:29 -04:00
parent 09f00fe81a
commit 49aa80c859
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/screenspaceimage.cpp
+11 -3
View File
@@ -62,16 +62,24 @@ void ScreenSpaceImage::render(Camera* camera){
glm::vec3 position = _position.value();
float occlusionDepth = position.z;
glm::mat4 modelTransform;
if(!_isFlatScreen){
occlusionDepth = position.x;
position.x = _planeDepth;
position = toEuclidean(position);
glm::mat4 rotation = glm::rotate(glm::mat4(1.0f), position.z, glm::vec3(0.0f, 1.0f, 0.0f));
rotation = glm::rotate(rotation, position.y , glm::vec3(1.0f, 0.0f, 0.0f));
glm::mat4 translate = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, position.x));
modelTransform = rotation * translate;
} else {
position.z = _planeDepth;
modelTransform = glm::translate(glm::mat4(1.f), position);
modelTransform = glm::scale(modelTransform, glm::vec3(_scale.value()*scalingRatioY, _scale.value()*textureRatio*scalingRatioX, 1));
}
glm::mat4 modelTransform = glm::translate(glm::mat4(1.f), position);
modelTransform = glm::scale(modelTransform, glm::vec3(_scale.value()*scalingRatioY, _scale.value()*textureRatio*scalingRatioX, 1));
glEnable(GL_DEPTH_TEST);
_shader->activate();