diff --git a/src/Nazara/Renderer/Material.cpp b/src/Nazara/Renderer/Material.cpp index abfd162e5..28bebf488 100644 --- a/src/Nazara/Renderer/Material.cpp +++ b/src/Nazara/Renderer/Material.cpp @@ -67,10 +67,10 @@ void NzMaterial::Apply() const } #endif - int ambientColorLocation = shader->GetUniformLocation("MaterialAmbientColor"); - int diffuseColorLocation = shader->GetUniformLocation("MaterialDiffuseColor"); + int ambientColorLocation = shader->GetUniformLocation("MaterialAmbient"); + int diffuseColorLocation = shader->GetUniformLocation("MaterialDiffuse"); int shininessLocation = shader->GetUniformLocation("MaterialShininess"); - int specularColorLocation = shader->GetUniformLocation("MaterialSpecularColor"); + int specularColorLocation = shader->GetUniformLocation("MaterialSpecular"); if (ambientColorLocation != -1) shader->SendColor(ambientColorLocation, m_ambientColor); diff --git a/src/Nazara/Renderer/ShaderBuilder.cpp b/src/Nazara/Renderer/ShaderBuilder.cpp index 16fb6ad09..6fdc37cc6 100644 --- a/src/Nazara/Renderer/ShaderBuilder.cpp +++ b/src/Nazara/Renderer/ShaderBuilder.cpp @@ -35,7 +35,7 @@ namespace /********************Uniformes********************/ if ((flags & nzShaderBuilder_DiffuseMapping) == 0 || flags & nzShaderBuilder_Lighting) - sourceCode += "uniform vec3 MaterialDiffuseColor;\n"; + sourceCode += "uniform vec3 MaterialDiffuse;\n"; if (flags & nzShaderBuilder_DiffuseMapping) sourceCode += "uniform sampler2D MaterialDiffuseMap;\n"; @@ -65,7 +65,7 @@ namespace if (flags & nzShaderBuilder_DiffuseMapping) sourceCode += " = texture2D(MaterialDiffuseMap, vTexCoord);\n"; else - sourceCode += " = vec4(MaterialDiffuseColor, 1.0);\n"; + sourceCode += " = vec4(MaterialDiffuse, 1.0);\n"; sourceCode += '}';