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

Fixed color alpha not being sent

Browse Source 
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
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)
{
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)
glProgramUniform3fv(m_program, location, 1, vecColor);
if (glProgramUniform4fv)
glProgramUniform4fv(m_program, location, 1, vecColor);
else
{
if (!Lock())
@@ -320,7 +320,7 @@ bool NzGLSLShader::SendColor(int location, const NzColor& color)
return false;
}
glUniform3fv(location, 1, vecColor);
glUniform4fv(location, 1, vecColor);
Unlock();
}