From bd90a0c44cc05a86efd1191b232b62a359378569 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 17 May 2016 19:25:59 +0200 Subject: [PATCH] Fix the image flipping on RenderableModelProjection --- modules/newhorizons/rendering/renderablemodelprojection.cpp | 2 ++ modules/newhorizons/shaders/projectionPass_fs.glsl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/newhorizons/rendering/renderablemodelprojection.cpp b/modules/newhorizons/rendering/renderablemodelprojection.cpp index 375e507d46..5959dbe7c8 100644 --- a/modules/newhorizons/rendering/renderablemodelprojection.cpp +++ b/modules/newhorizons/rendering/renderablemodelprojection.cpp @@ -403,6 +403,8 @@ void RenderableModelProjection::imageProjectGPU() { _fboProgramObject->setUniform("_scaling", _camScaling); _fboProgramObject->setUniform("boresight", _boresight); + _geometry->setUniforms(*_fboProgramObject); + glBindVertexArray(_vaoID); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _ibo); glDrawElements(GL_TRIANGLES, static_cast(_geometryIndeces.size()), GL_UNSIGNED_INT, 0); diff --git a/modules/newhorizons/shaders/projectionPass_fs.glsl b/modules/newhorizons/shaders/projectionPass_fs.glsl index bc3ce2fc38..383b4ca854 100644 --- a/modules/newhorizons/shaders/projectionPass_fs.glsl +++ b/modules/newhorizons/shaders/projectionPass_fs.glsl @@ -57,7 +57,7 @@ void main() { projected.y /= projected.w; //invert gl coordinates projected.x = 1 - projected.x; - projected.y = 1 - projected.y; + // projected.y = 1 - projected.y; if((inRange(projected.x, 0, 1) && inRange(projected.y, 0, 1)) && (dot(n, boresight) < 0)) { color = texture(projectTexture, projected.xy);