- added objectcolor uniform. This will be used to hold the thingcolor for shader based rendering.

This commit is contained in:
Christoph Oelckers 2014-05-11 16:06:25 +02:00
commit 53f4cd0108
10 changed files with 43 additions and 15 deletions

View file

@ -234,14 +234,6 @@ bool gl_SetupLight(Plane & p, ADynamicLight * light, Vector & nearPt, Vector & u
{
gl_RenderState.BlendEquation(GL_FUNC_ADD);
}
if (desaturation>0)
{
float gray=(r*77 + g*143 + b*37)/257;
r= (r*(32-desaturation)+ gray*desaturation)/32;
g= (g*(32-desaturation)+ gray*desaturation)/32;
b= (b*(32-desaturation)+ gray*desaturation)/32;
}
glColor3f(r,g,b);
return true;
}