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

Fixed ShaderBuilder inserting unused varying 

Former-commit-id: bb61f7332c41440901560838f6cda8b071f7422b
This commit is contained in:
Lynix 2013-01-30 01:36:54 +01:00
parent 692c578673
commit ff9c61735c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,8 +98,8 @@ namespace
{ {
if (flags & nzShaderBuilder_NormalMapping) if (flags & nzShaderBuilder_NormalMapping)
sourceCode += inKW + " mat3 vLightToWorld;\n"; sourceCode += inKW + " mat3 vLightToWorld;\n";
else
sourceCode += inKW + " vec3 vNormal;\n"; sourceCode += inKW + " vec3 vNormal;\n";
} }
if (flags & nzShaderBuilder_DiffuseMapping || flags & nzShaderBuilder_NormalMapping) if (flags & nzShaderBuilder_DiffuseMapping || flags & nzShaderBuilder_NormalMapping)
@ -263,7 +263,7 @@ namespace
sourceCode += "}\n" sourceCode += "}\n"
"\n"; "\n";
sourceCode += fragmentColorKW + " = vec4(light, MaterialDiffuse.w)"; sourceCode += fragmentColorKW + " = vec4(light, MaterialDiffuse.w)";
if (flags & nzShaderBuilder_DiffuseMapping) if (flags & nzShaderBuilder_DiffuseMapping)
sourceCode += "*texture2D(MaterialDiffuseMap, vTexCoord)"; sourceCode += "*texture2D(MaterialDiffuseMap, vTexCoord)";
@ -328,9 +328,9 @@ namespace
if (flags & nzShaderBuilder_Lighting) if (flags & nzShaderBuilder_Lighting)
{ {
if (flags & nzShaderBuilder_NormalMapping) if (flags & nzShaderBuilder_NormalMapping)
sourceCode += outKW + " mat3 vLightToWorld;"; sourceCode += outKW + " mat3 vLightToWorld;\n";
else
sourceCode += outKW + " vec3 vNormal;\n"; sourceCode += outKW + " vec3 vNormal;\n";
} }
if (flags & nzShaderBuilder_DiffuseMapping || flags & nzShaderBuilder_NormalMapping) if (flags & nzShaderBuilder_DiffuseMapping || flags & nzShaderBuilder_NormalMapping)
@ -359,8 +359,8 @@ namespace
"vLightToWorld[2] = normalize(VertexNormal * RotationMatrix);\n" "vLightToWorld[2] = normalize(VertexNormal * RotationMatrix);\n"
"\n"; "\n";
} }
else
sourceCode += "vNormal = normalize(RotationMatrix * VertexNormal);\n"; sourceCode += "vNormal = normalize(RotationMatrix * VertexNormal);\n";
} }
if (flags & nzShaderBuilder_DiffuseMapping || flags & nzShaderBuilder_NormalMapping) if (flags & nzShaderBuilder_DiffuseMapping || flags & nzShaderBuilder_NormalMapping)