Fix fullbright fog failing

meow-7.2.2
Drake Arconis 2016-12-16 09:52:29 -05:00
parent 580e160940
commit 14a2127034
1 changed files with 6 additions and 21 deletions

View File

@ -40,6 +40,8 @@ VARYING vec3 vary_position;
VARYING vec4 vertex_color;
VARYING vec2 vary_texcoord0;
vec3 fullbrightAtmosTransport(vec3 light);
vec3 fullbrightScaleSoftClip(vec3 light);
vec3 srgb_to_linear(vec3 cs)
{
@ -78,17 +80,6 @@ vec3 linear_to_srgb(vec3 cl)
}
vec3 fullbrightAtmosTransportDeferred(vec3 light)
{
return light;
}
vec3 fullbrightScaleSoftClipDeferred(vec3 light)
{
//soft clip effect:
return light;
}
#ifdef HAS_ALPHA_MASK
uniform float minimum_alpha;
#endif
@ -157,22 +148,16 @@ void main()
#endif
color.rgb *= vertex_color.rgb;
color.rgb = srgb_to_linear(color.rgb);
color.rgb = fullbrightAtmosTransportDeferred(color.rgb);
color.rgb = fullbrightScaleSoftClipDeferred(color.rgb);
color.rgb = linear_to_srgb(color.rgb);
color.rgb = fullbrightAtmosTransport(color.rgb);
color.rgb = fullbrightScaleSoftClip(color.rgb);
#ifdef WATER_FOG
vec3 pos = vary_position;
vec4 fogged = applyWaterFogDeferred(pos, vec4(color.rgb, final_alpha));
color.rgb = fogged.rgb;
color.a = fogged.a;
color = applyWaterFogDeferred(pos, vec4(color.rgb, final_alpha));
#else
color.a = final_alpha;
#endif
frag_color.rgb = color.rgb;
frag_color.a = color.a;
frag_color = color;
}