Changed color values from floats to glm::vec4

2016-01-24 14:18:04 +01:00
parent b5b1140f5c
commit 8286d052b3
6 changed files with 18 additions and 8 deletions
@@ -45,6 +45,7 @@ void DrawFinalPass::Draw(RenderScene& scene)
            //TODO: Kolla upp "header/include/common" shader saken så man slipper skicka in asmycket uniforms
            glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
            glUniform4fv(glGetUniformLocation(shaderHandle, "Color"), 1, glm::value_ptr(modelJob->Color));
+            glUniform4fv(glGetUniformLocation(shaderHandle, "DiffuseColor"), 1, glm::value_ptr(modelJob->DiffuseColor));

            if(modelJob->DiffuseTexture != nullptr) {
                glActiveTexture(GL_TEXTURE0);