From bcc528d6fdb68e14899ffeffc3f120e9483bc637 Mon Sep 17 00:00:00 2001 From: pkuzic Date: Fri, 25 Sep 2026 16:54:58 +0100 Subject: [PATCH] MONKEY (fix-post): sun shafts fall off radially; exact sky-depth test; one MSAA sample Review P1: the path mean lifted every clear sky pixel equally; it is now the occlusion ratio times an aspect-corrected radial falloff from the sun. Review P2: sky = depth <= 1e-7 (cleared / sky-pinned), no longer a nearclip- dependent ramp. Review P5 (partial): read one MSAA sample per tap. Co-Authored-By: Claude Opus 5.5 --- crates/benilla-app/src/post/sun_shafts.wgsl | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/crates/benilla-app/src/post/sun_shafts.wgsl b/crates/benilla-app/src/post/sun_shafts.wgsl index c511d20c..2ddc1834 100644 --- a/crates/benilla-app/src/post/sun_shafts.wgsl +++ b/crates/benilla-app/src/post/sun_shafts.wgsl @@ -20,12 +20,9 @@ fn scene_depth(uv: vec2) -> f32 { let dims = textureDimensions(depth); let p = vec2(clamp(uv, vec2(0.0), vec2(0.999999)) * vec2(dims)); #ifdef MULTISAMPLED - var d = 0.0; - for (var sample = 0u; sample < textureNumSamples(depth); sample++) { - // Reversed Z: any covered sample is enough to block the sky ray. - d = max(d, textureLoad(depth, p, i32(sample))); - } - return d; + // MONKEY (fix-post): one sample, not a max over all of them: the march is a blur, and the + // per-sample loop cost 28 x N loads per pixel (224 at 8x). + return textureLoad(depth, p, 0); #else return textureLoad(depth, p, 0); #endif @@ -44,10 +41,18 @@ fn fragment(in: FullscreenVertexOutput) -> @location(0) vec4 { if (i >= count) { break; } uv += step_uv; decay *= 0.965; - let sky = 1.0 - smoothstep(0.000002, 0.00008, scene_depth(uv)); + // MONKEY (fix-post): only the cleared / sky-pinned depth (exactly 0 on infinite reverse-Z) + // is sky. The old ramp read d = near / z, so it moved with the live `nearclip` cvar and + // let shafts pour through terrain beyond ~125 yd at nearclip 0.01. + let sky = select(0.0, 1.0, scene_depth(uv) <= 1.0e-7); light += sky * decay; norm += decay; } - let rays = light / max(norm, 0.0001); + // MONKEY (fix-post): the path mean is only the occlusion ratio; the shaft itself falls off + // radially from the sun (aspect-corrected), else every clear sky pixel got the same lift. + let dims = vec2(textureDimensions(scene)); + let to_sun = (in.uv - shafts.sun.xy) * vec2(dims.x / dims.y, 1.0); + let radial = 1.0 - clamp(length(to_sun) / 0.9, 0.0, 1.0); + let rays = light / max(norm, 0.0001) * radial * radial; return vec4(base.rgb + shafts.color.rgb * rays * shafts.sun.z * 0.16, base.a); }