mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-09 06:48:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

added viewprojection matrix to screenspaceimage shaderprogram

Browse Source
This commit is contained in:
Michael Nilsson
2016-03-11 09:36:49 -05:00
parent fe2d90eb8f
commit c746338553
6 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/base/rendering/screenspaceimage.cpp
View File

@@ -47,11 +47,10 @@ namespace openspace {
ScreenSpaceImage::~ScreenSpaceImage(){}
void ScreenSpaceImage::render(){
void ScreenSpaceImage::render(Camera* camera){
GLint m_viewport[4];
glGetIntegerv(GL_VIEWPORT, m_viewport);
float height = (float(m_viewport[2])/m_viewport[3])*
(float(_texture->height())/float(_texture->width()));
float height = (float(_texture->height())/float(_texture->width()));
glm::mat4 transform = glm::translate(glm::mat4(1.f), _position.value());
transform = glm::scale(transform, glm::vec3(_scale.value(),_scale.value()*height,1));
@@ -59,6 +58,7 @@ void ScreenSpaceImage::render(){
_shader->activate();
_shader->setUniform("ModelTransform",transform);
_shader->setUniform("ViewProjectionMatrix", camera->viewProjectionMatrix());
ghoul::opengl::TextureUnit unit;
unit.activate();