From 66a5399fba9eb077d5349cb31efa86a9702f5780 Mon Sep 17 00:00:00 2001 From: Anselme Date: Fri, 22 Jul 2016 12:10:40 +0200 Subject: [PATCH] fixed 2D texturing --- shaders/gui.vert.glsl | 2 +- src/deferredpipeline.cpp | 2 ++ src/trackballcamera.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/shaders/gui.vert.glsl b/shaders/gui.vert.glsl index dbcd148..d0edea0 100644 --- a/shaders/gui.vert.glsl +++ b/shaders/gui.vert.glsl @@ -1,7 +1,7 @@ layout(location = 0)in vec2 inPosition; #ifdef TEXTURABLE -layout(location = 0)in vec2 inTexCoord; +layout(location = 2)in vec2 inTexCoord; out vec2 texCoord; #endif diff --git a/src/deferredpipeline.cpp b/src/deferredpipeline.cpp index 55e279c..6da7973 100644 --- a/src/deferredpipeline.cpp +++ b/src/deferredpipeline.cpp @@ -189,6 +189,8 @@ void DeferredPipeline::renderGL(Scene *scene) // 2D GUI PASS glClear(GL_DEPTH_BUFFER_BIT); + glEnable(GL_BLEND); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); for(GeometryNode* node : mesh2D) { Shader *shader = m_mesh2DShaders[node->mesh->getFlags()]; diff --git a/src/trackballcamera.cpp b/src/trackballcamera.cpp index 0409b42..f0eefb1 100644 --- a/src/trackballcamera.cpp +++ b/src/trackballcamera.cpp @@ -44,7 +44,7 @@ void TrackBallCamera::moveCamera(const glm::vec3 &diff) void TrackBallCamera::lookAt(const glm::vec3 &pos) { - m_dist = glm::length(target); + //m_dist = glm::length(target); m_center = pos; computeView(); }