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

Made shader uniforms less verbose 

Former-commit-id: aa77b9be3f84cad30b13ebe5d47bb9febd17631e
This commit is contained in:
Lynix 2013-01-06 01:06:55 +01:00
parent d177971810
commit da341001ab
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Renderer/Material.cpp
View File

@ -67,10 +67,10 @@ void NzMaterial::Apply() const
} }
#endif #endif
int ambientColorLocation = shader->GetUniformLocation("MaterialAmbientColor"); int ambientColorLocation = shader->GetUniformLocation("MaterialAmbient");
int diffuseColorLocation = shader->GetUniformLocation("MaterialDiffuseColor"); int diffuseColorLocation = shader->GetUniformLocation("MaterialDiffuse");
int shininessLocation = shader->GetUniformLocation("MaterialShininess"); int shininessLocation = shader->GetUniformLocation("MaterialShininess");
int specularColorLocation = shader->GetUniformLocation("MaterialSpecularColor"); int specularColorLocation = shader->GetUniformLocation("MaterialSpecular");
if (ambientColorLocation != -1) if (ambientColorLocation != -1)
shader->SendColor(ambientColorLocation, m_ambientColor); shader->SendColor(ambientColorLocation, m_ambientColor);

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

@ -35,7 +35,7 @@ namespace
/********************Uniformes********************/ /********************Uniformes********************/
if ((flags & nzShaderBuilder_DiffuseMapping) == 0 || flags & nzShaderBuilder_Lighting) if ((flags & nzShaderBuilder_DiffuseMapping) == 0 || flags & nzShaderBuilder_Lighting)
sourceCode += "uniform vec3 MaterialDiffuseColor;\n"; sourceCode += "uniform vec3 MaterialDiffuse;\n";
if (flags & nzShaderBuilder_DiffuseMapping) if (flags & nzShaderBuilder_DiffuseMapping)
sourceCode += "uniform sampler2D MaterialDiffuseMap;\n"; sourceCode += "uniform sampler2D MaterialDiffuseMap;\n";
@ -65,7 +65,7 @@ namespace
if (flags & nzShaderBuilder_DiffuseMapping) if (flags & nzShaderBuilder_DiffuseMapping)
sourceCode += " = texture2D(MaterialDiffuseMap, vTexCoord);\n"; sourceCode += " = texture2D(MaterialDiffuseMap, vTexCoord);\n";
else else
sourceCode += " = vec4(MaterialDiffuseColor, 1.0);\n"; sourceCode += " = vec4(MaterialDiffuse, 1.0);\n";
sourceCode += '}'; sourceCode += '}';