Skip to content

Clean up Volumetric Fog blending behavior #112494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −16
Open

Clean up Volumetric Fog blending behavior #112494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion servers/rendering/renderer_rd/shaders/environment/sky.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ void main() {

if (sky_scene_data.volumetric_fog_enabled) {
vec4 fog = volumetric_fog_process(uv);
frag_color.rgb = frag_color.rgb * (1.0 - fog.a * sky_scene_data.volumetric_fog_sky_affect) + fog.rgb * sky_scene_data.volumetric_fog_sky_affect;
fog.rgb = frag_color.rgb * fog.a + fog.rgb;
frag_color.rgb = mix(frag_color.rgb, fog.rgb, sky_scene_data.volumetric_fog_sky_affect);
}

if (custom_fog.a > 0.0) {
Expand Down
2 changes: 1 addition & 1 deletion servers/rendering/renderer_rd/shaders/environment/volumetric_fog_process.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ void main() {

prev_z = z;

imageStore(fog_map, fog_pos, vec4(fog_accum.rgb, 1.0 - fog_accum.a));
imageStore(fog_map, fog_pos, vec4(fog_accum.rgb, fog_accum.a));
}

#endif
Expand Down
28 changes: 14 additions & 14 deletions servers/rendering/renderer_rd/shaders/forward_clustered/scene_forward_clustered.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ void fragment_shader(in SceneData scene_data) {
vec2 anisotropy_flow = vec2(1.0, 0.0);
vec3 energy_compensation = vec3(1.0);
#ifndef FOG_DISABLED
vec4 fog = vec4(0.0);
vec4 fog = vec4(0.0, 0.0, 0.0, 1.0);
#endif // !FOG_DISABLED
#if defined(CUSTOM_RADIANCE_USED)
vec4 custom_radiance = vec4(0.0);
Expand Down Expand Up @@ -1435,6 +1435,9 @@ void fragment_shader(in SceneData scene_data) {

if (bool(scene_data.flags & SCENE_DATA_FLAGS_USE_FOG)) {
fog = fog_process(vertex);
// Premultiply by opacity and convert opacity to transmittance to match volumetric fog.
fog.rgb *= fog.a;
fog.a = 1.0 - fog.a;
}

if (implementation_data.volumetric_fog_enabled) {
Expand All @@ -1446,19 +1449,17 @@ void fragment_shader(in SceneData scene_data) {
vec4 res = vec4(0.0);
if (bool(scene_data.flags & SCENE_DATA_FLAGS_USE_FOG)) {
//must use the full blending equation here to blend fogs
float sa = 1.0 - volumetric_fog.a;
res.a = fog.a * sa + volumetric_fog.a;
if (res.a > 0.0) {
res.rgb = (fog.rgb * fog.a * sa + volumetric_fog.rgb) / res.a;
}
res.a = fog.a * volumetric_fog.a;
res.rgb = fog.rgb * volumetric_fog.a + volumetric_fog.rgb;
} else {
res.a = volumetric_fog.a;
if (res.a > 0.0) {
res.rgb = volumetric_fog.rgb / res.a;
}
res = volumetric_fog;
}
fog = res;
}
#else
// Premultiply by opacity and convert opacity to transmittance to match volumetric fog.
fog.rgb *= fog.a;
fog.a = 1.0 - fog.a;
#endif //!CUSTOM_FOG_USED

uint fog_rg = packHalf2x16(fog.rg);
Expand Down Expand Up @@ -2889,8 +2890,8 @@ void fragment_shader(in SceneData scene_data) {
#endif

#ifndef FOG_DISABLED
diffuse_buffer.rgb = mix(diffuse_buffer.rgb, fog.rgb, fog.a);
specular_buffer.rgb = mix(specular_buffer.rgb, vec3(0.0), fog.a);
diffuse_buffer.rgb = diffuse_buffer.rgb * fog.a + fog.rgb;
specular_buffer.rgb = specular_buffer.rgb * fog.a;
#endif //!FOG_DISABLED

#else //MODE_SEPARATE_SPECULAR
Expand All @@ -2905,8 +2906,7 @@ void fragment_shader(in SceneData scene_data) {
#endif //USE_NO_SHADING

#ifndef FOG_DISABLED
// Draw "fixed" fog before volumetric fog to ensure volumetric fog can appear in front of the sky.
frag_color.rgb = mix(frag_color.rgb, fog.rgb, fog.a);
frag_color.rgb = frag_color.rgb * fog.a + fog.rgb;
#endif //!FOG_DISABLED

#endif //MODE_SEPARATE_SPECULAR
Expand Down