sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed MaterialDiffuse not used without lighting 

Former-commit-id: b60d410dcc04b1e9f4d5f55a03390c007539dcec
This commit is contained in:
Lynix 2013-06-26 20:15:55 +02:00
parent abe56631dd
commit 5b33a992ad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Renderer/ShaderBuilder.cpp
View File

@ -77,8 +77,7 @@ namespace
if (flags & nzShaderFlags_AlphaMapping) if (flags & nzShaderFlags_AlphaMapping)
sourceCode += "uniform sampler2D MaterialAlphaMap;\n"; 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) if (flags & nzShaderFlags_DiffuseMapping)
sourceCode += "uniform sampler2D MaterialDiffuseMap;\n"; sourceCode += "uniform sampler2D MaterialDiffuseMap;\n";
@ -298,10 +297,11 @@ namespace
} }
else if (flags & nzShaderFlags_DiffuseMapping) else if (flags & nzShaderFlags_DiffuseMapping)
{ {
sourceCode += fragmentColorKW + " = MaterialDiffuse*";
if (flags & nzShaderFlags_AlphaMapping) 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 else
sourceCode += fragmentColorKW + " = " + textureLookupKW + "(MaterialDiffuseMap, vTexCoord);\n"; sourceCode += textureLookupKW + "(MaterialDiffuseMap, vTexCoord);\n";
} }
else else
sourceCode += fragmentColorKW + " = MaterialDiffuse;\n"; sourceCode += fragmentColorKW + " = MaterialDiffuse;\n";