Skip to content
Snippets Groups Projects
Commit 01da5376 authored by Graham Linden's avatar Graham Linden
Browse files

Fix per-frag fullbright soft clip convenience funcs to include additive and atten args.

parent 30fc3860
No related branches found
No related tags found
No related merge requests found
...@@ -78,7 +78,7 @@ vec3 decode_normal (vec2 enc); ...@@ -78,7 +78,7 @@ vec3 decode_normal (vec2 enc);
void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten); void calcFragAtmospherics(vec3 inPositionEye, float ambFactor, out vec3 sunlit, out vec3 amblit, out vec3 additive, out vec3 atten);
vec3 atmosFragLighting(vec3 l, vec3 additive, vec3 atten); vec3 atmosFragLighting(vec3 l, vec3 additive, vec3 atten);
vec3 fullbrightScaleSoftClipFrag(vec3 l); vec3 fullbrightScaleSoftClipFrag(vec3 l, vec3 add, vec3 atten);
vec3 scaleSoftClipFrag(vec3 l); vec3 scaleSoftClipFrag(vec3 l);
vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten); vec3 atmosTransportFrag(vec3 light, vec3 additive, vec3 atten);
...@@ -166,7 +166,7 @@ void main() ...@@ -166,7 +166,7 @@ void main()
if (norm.w < 0.5) if (norm.w < 0.5)
{ {
col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a); col = mix(atmosFragLighting(col, additive, atten), fullbrightAtmosTransportFrag(col, additive, atten), diffuse.a);
col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col), diffuse.a); col = mix(scaleSoftClipFrag(col), fullbrightScaleSoftClipFrag(col, additive, atten), diffuse.a);
} }
#ifdef WATER_FOG #ifdef WATER_FOG
......
...@@ -47,7 +47,7 @@ vec3 scaleSoftClip(vec3 light) ...@@ -47,7 +47,7 @@ vec3 scaleSoftClip(vec3 light)
return scaleSoftClipFrag(light); return scaleSoftClipFrag(light);
} }
vec3 fullbrightScaleSoftClipFrag(vec3 light) { vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 add, vec3 atten) {
return scaleSoftClipFrag(light.rgb); return scaleSoftClipFrag(light.rgb);
} }
......
...@@ -77,7 +77,6 @@ vec3 GetSkyLuminance(vec3 camPos, vec3 view_dir, float shadow_length, vec3 dir, ...@@ -77,7 +77,6 @@ vec3 GetSkyLuminance(vec3 camPos, vec3 view_dir, float shadow_length, vec3 dir,
vec3 GetSkyLuminanceToPoint(vec3 camPos, vec3 pos, float shadow_length, vec3 dir, out vec3 transmittance); vec3 GetSkyLuminanceToPoint(vec3 camPos, vec3 pos, float shadow_length, vec3 dir, out vec3 transmittance);
vec3 scaleSoftClipFrag(vec3 c); vec3 scaleSoftClipFrag(vec3 c);
vec3 fullbrightScaleSoftClipFrag(vec3 c);
vec3 srgb_to_linear(vec3 cs); vec3 srgb_to_linear(vec3 cs);
vec3 linear_to_srgb(vec3 cl); vec3 linear_to_srgb(vec3 cl);
vec3 decode_normal (vec2 enc); vec3 decode_normal (vec2 enc);
......
...@@ -43,7 +43,7 @@ vec3 scaleSoftClip(vec3 light) { ...@@ -43,7 +43,7 @@ vec3 scaleSoftClip(vec3 light) {
return scaleSoftClipFrag(light); return scaleSoftClipFrag(light);
} }
vec3 fullbrightScaleSoftClipFrag(vec3 light) vec3 fullbrightScaleSoftClipFrag(vec3 light, vec3 add, vec3 atten)
{ {
return scaleSoftClipFrag(light.rgb); return scaleSoftClipFrag(light.rgb);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment