Merge branch 'master' of git://gitorious.org/fg/fgdata
This commit is contained in:
commit
a7199e0cca
1 changed files with 1 additions and 1 deletions
|
@ -101,7 +101,7 @@ void main (void)
|
|||
ambient_light = constantColor + gl_LightSource[0].diffuse * shadow_factor * vec4(diffuse, 1.0);
|
||||
float emission_factor = (1.0 - smoothstep(0.15, 0.25, reflectance)) * emis;
|
||||
vec4 tc = texture2D(BaseTex, uv);
|
||||
emission_factor *= 0.5*pow(tc.r+0.8*tc.g+0.2*tc.b, 2) -0.2;
|
||||
emission_factor *= 0.5*pow(tc.r+0.8*tc.g+0.2*tc.b, 2.0) -0.2;
|
||||
ambient_light += (emission_factor * vec4(night_color, 0.0));
|
||||
|
||||
float fogFactor;
|
||||
|
|
Loading…
Reference in a new issue