From 5b33a992ad398f29ca84640b7cf8206b518e7c09 Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 26 Jun 2013 20:15:55 +0200 Subject: [PATCH] Fixed MaterialDiffuse not used without lighting Former-commit-id: b60d410dcc04b1e9f4d5f55a03390c007539dcec --- src/Nazara/Renderer/ShaderBuilder.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Nazara/Renderer/ShaderBuilder.cpp b/src/Nazara/Renderer/ShaderBuilder.cpp index 753a64353..e381ad92a 100644 --- a/src/Nazara/Renderer/ShaderBuilder.cpp +++ b/src/Nazara/Renderer/ShaderBuilder.cpp @@ -77,8 +77,7 @@ namespace if (flags & nzShaderFlags_AlphaMapping) sourceCode += "uniform sampler2D MaterialAlphaMap;\n"; - if ((flags & nzShaderFlags_DiffuseMapping) == 0 || flags & nzShaderFlags_Lighting) - sourceCode += "uniform vec4 MaterialDiffuse;\n"; + sourceCode += "uniform vec4 MaterialDiffuse;\n"; if (flags & nzShaderFlags_DiffuseMapping) sourceCode += "uniform sampler2D MaterialDiffuseMap;\n"; @@ -298,10 +297,11 @@ namespace } else if (flags & nzShaderFlags_DiffuseMapping) { + sourceCode += fragmentColorKW + " = MaterialDiffuse*"; if (flags & nzShaderFlags_AlphaMapping) - sourceCode += fragmentColorKW + " = vec4(" + textureLookupKW + "(MaterialDiffuseMap, vTexCoord).rgb, " + textureLookupKW + "(MaterialAlphaMap, vTexCoord).r);\n"; + sourceCode += "vec4(" + textureLookupKW + "(MaterialDiffuseMap, vTexCoord).rgb, " + textureLookupKW + "(MaterialAlphaMap, vTexCoord).r);\n"; else - sourceCode += fragmentColorKW + " = " + textureLookupKW + "(MaterialDiffuseMap, vTexCoord);\n"; + sourceCode += textureLookupKW + "(MaterialDiffuseMap, vTexCoord);\n"; } else sourceCode += fragmentColorKW + " = MaterialDiffuse;\n";