From 1e67bfb103f7f49332fc23416576fa857ca840cb Mon Sep 17 00:00:00 2001 From: tleety Date: Thu, 10 Sep 2015 18:32:50 +0200 Subject: [PATCH] Sprite ACTUALLY rendered as unitquad now. --- src/game/Core/Renderer.cpp | 3 ++- src/game/Core/Shaders/Forward/Vertex.glsl | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/Core/Renderer.cpp b/src/game/Core/Renderer.cpp index e204763..c22530a 100755 --- a/src/game/Core/Renderer.cpp +++ b/src/game/Core/Renderer.cpp @@ -327,7 +327,8 @@ void dd::Renderer::DrawScene(RenderQueue &objects, ShaderProgram &program) auto spriteJob = std::dynamic_pointer_cast(job); if (spriteJob) { - glm::mat4 modelMatrix = glm::scale(glm::vec3(0.5f)) * spriteJob->ModelMatrix; + glm::mat4 modelMatrix = spriteJob->ModelMatrix; + modelMatrix = modelMatrix * glm::scale(glm::vec3(0.5f)); MVP = PV * modelMatrix; glUniformMatrix4fv(glGetUniformLocation(shaderProgramHandle, "MVP"), 1, GL_FALSE, glm::value_ptr(MVP)); glUniformMatrix4fv(glGetUniformLocation(shaderProgramHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelMatrix)); diff --git a/src/game/Core/Shaders/Forward/Vertex.glsl b/src/game/Core/Shaders/Forward/Vertex.glsl index 46ccf5a..64a9e26 100755 --- a/src/game/Core/Shaders/Forward/Vertex.glsl +++ b/src/game/Core/Shaders/Forward/Vertex.glsl @@ -68,6 +68,7 @@ void main() //gl_Position = MVP * boneTransform * vec4(Position, 1.0); gl_Position = MVP * vec4(Position, 1.0); + //TODO: Make sure that boneTransform works here. Output.Position = (V * M * boneTransform * vec4(Position, 1.0)).xyz; Output.Normal = (inverse(transpose(V * M)) * boneTransform * vec4(Normal, 0.0)).xyz; Output.Tangent = Tangent;