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

Fixed color alpha not being sent 

Former-commit-id: 0f7d355b22790aa5487ff69b325c41613a94961e
This commit is contained in:
Lynix 2013-01-06 02:47:46 +01:00
parent da341001ab
commit e194d11374
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,10 +308,10 @@ bool NzGLSLShader::SendBoolean(int location, bool value)
bool NzGLSLShader::SendColor(int location, const NzColor& color) bool NzGLSLShader::SendColor(int location, const NzColor& color)
{ {
NzVector3f vecColor(color.r/255.f, color.g/255.f, color.b/255.f); NzVector4f vecColor(color.r/255.f, color.g/255.f, color.b/255.f, color.a/255.f);
if (glProgramUniform3fv) if (glProgramUniform4fv)
glProgramUniform3fv(m_program, location, 1, vecColor); glProgramUniform4fv(m_program, location, 1, vecColor);
else else
{ {
if (!Lock()) if (!Lock())
@ -320,7 +320,7 @@ bool NzGLSLShader::SendColor(int location, const NzColor& color)
return false; return false;
} }
glUniform3fv(location, 1, vecColor); glUniform4fv(location, 1, vecColor);
Unlock(); Unlock();
} }

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 MaterialDiffuse;\n"; sourceCode += "uniform vec4 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(MaterialDiffuse, 1.0);\n"; sourceCode += " = MaterialDiffuse;\n";
sourceCode += '}'; sourceCode += '}';