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

Updated shader convention

Browse Source 
Vertex input are now prefixed by "Vertex" (VertexPosition, VertexNormal,
..)
Same for Material input (MaterialAmbientColor, MaterialShininess, ...)


Former-commit-id: 1fbf8b8b32546a21ee23ff83714c860a9a8fce4f
This commit is contained in:
Lynix
2013-01-05 23:52:41 +01:00
parent 492d01cc09
commit c93e8eb585
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,10 +35,10 @@ namespace
/********************Uniformes********************/
if ((flags & nzShaderBuilder_DiffuseMapping) == 0 || flags & nzShaderBuilder_Lighting)
sourceCode += "uniform vec3 DiffuseColor;\n";
sourceCode += "uniform vec3 MaterialDiffuseColor;\n";
if (flags & nzShaderBuilder_DiffuseMapping)
sourceCode += "uniform sampler2D DiffuseMap;\n";
sourceCode += "uniform sampler2D MaterialDiffuseMap;\n";
sourceCode += '\n';
@@ -63,9 +63,9 @@ namespace
sourceCode += '\t';
sourceCode += fragmentColorKW;
if (flags & nzShaderBuilder_DiffuseMapping)
sourceCode += " = texture2D(DiffuseMap, vTexCoord);\n";
sourceCode += " = texture2D(MaterialDiffuseMap, vTexCoord);\n";
else
sourceCode += " = vec4(DiffuseColor, 1.0);\n";
sourceCode += " = vec4(MaterialDiffuseColor, 1.0);\n";
sourceCode += '}';
@@ -100,24 +100,24 @@ namespace
/********************Entrant********************/
sourceCode += inKW;
sourceCode += " vec3 Position;\n";
sourceCode += " vec3 VertexPosition;\n";
if (flags & nzShaderBuilder_Lighting || flags & nzShaderBuilder_NormalMapping || flags & nzShaderBuilder_ParallaxMapping)
{
sourceCode += inKW;
sourceCode += " vec3 Normal;\n";
sourceCode += " vec3 VertexNormal;\n";
}
if (flags & nzShaderBuilder_Lighting)
{
sourceCode += inKW;
sourceCode += " vec3 Tangent;\n";
sourceCode += " vec3 VertexTangent;\n";
}
if (flags & nzShaderBuilder_DiffuseMapping || flags & nzShaderBuilder_Lighting || flags & nzShaderBuilder_NormalMapping || flags & nzShaderBuilder_ParallaxMapping)
{
sourceCode += inKW;
sourceCode += " vec2 TexCoord0;\n";
sourceCode += " vec2 VertexTexCoord0;\n";
}
sourceCode += '\n';
@@ -134,10 +134,10 @@ namespace
/********************Code********************/
sourceCode += "void main()\n{\n";
sourceCode += "\tgl_Position = WorldViewProjMatrix * vec4(Position, 1.0);\n";
sourceCode += "\tgl_Position = WorldViewProjMatrix * vec4(VertexPosition, 1.0);\n";
if (flags & nzShaderBuilder_DiffuseMapping)
sourceCode += "\tvTexCoord = TexCoord0;\n";
sourceCode += "\tvTexCoord = VertexTexCoord0;\n";
sourceCode += '}';