repair "focus on shadow casters" features

This broken recently because of a typo in refactoring.
google · Sep 15, 2023 · 9c0fb67 · 9c0fb67
1 parent 0b97de4
commit 9c0fb67
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/filament/src/ShadowMap.cpp b/filament/src/ShadowMap.cpp
@@ -343,8 +343,9 @@ ShadowMap::ShaderParameters ShadowMap::updateDirectional(FEngine& engine,
         // For directional lights, we further constraint the light frustum to the
         // intersection of the shadow casters & shadow receivers in light-space.
         // ** This relies on the 1-texel shadow map border **
+
         if (engine.debug.shadowmap.focus_shadowcasters) {
-            intersectWithShadowCasters(lsLightFrustumBounds, WLMpMv, wsShadowCastersVolume);
+            intersectWithShadowCasters(&lsLightFrustumBounds, WLMpMv, wsShadowCastersVolume);
         }
         if (UTILS_UNLIKELY((lsLightFrustumBounds.min.x >= lsLightFrustumBounds.max.x) ||
                            (lsLightFrustumBounds.min.y >= lsLightFrustumBounds.max.y))) {
@@ -356,8 +357,8 @@ ShadowMap::ShaderParameters ShadowMap::updateDirectional(FEngine& engine,
         assert_invariant(lsLightFrustumBounds.min.x < lsLightFrustumBounds.max.x);
         assert_invariant(lsLightFrustumBounds.min.y < lsLightFrustumBounds.max.y);
 
-        s = 2.0f / float2(bounds.max.xy - bounds.min.xy);
-        o = float2(bounds.max.xy + bounds.min.xy) * 0.5f;
+        s = 2.0f / float2(lsLightFrustumBounds.max.xy - lsLightFrustumBounds.min.xy);
+        o = float2(lsLightFrustumBounds.max.xy + lsLightFrustumBounds.min.xy) * 0.5f;
 
         // TODO: we could quantize `s` here to give some stability when lispsm is disabled,
         //       however, the quantization paramater should probably be user settable.
@@ -767,20 +768,12 @@ Aabb ShadowMap::compute2DBounds(const mat4f& lightView,
     return bounds;
 }
 
-Aabb ShadowMap::compute2DBounds(const mat4f& lightView, float4 const& sphere) noexcept {
-    // this assumes a rigid body transform
-    float4 s;
-    s.xyz = (lightView * float4{sphere.xyz, 1.0f}).xyz;
-    s.w = sphere.w;
-    return Aabb{s.xyz - s.w, s.xyz + s.w};
-}
-
-void ShadowMap::intersectWithShadowCasters(Aabb& UTILS_RESTRICT lightFrustum,
+void ShadowMap::intersectWithShadowCasters(Aabb* UTILS_RESTRICT lightFrustum,
         mat4f const& lightView, Aabb const& wsShadowCastersVolume) noexcept {
 
     // construct the Focus transform (scale + offset)
-    const float2 s = 2.0f / float2(lightFrustum.max.xy - lightFrustum.min.xy);
-    const float2 o =   -s * float2(lightFrustum.max.xy + lightFrustum.min.xy) * 0.5f;
+    const float2 s = 2.0f / float2(lightFrustum->max.xy - lightFrustum->min.xy);
+    const float2 o =   -s * float2(lightFrustum->max.xy + lightFrustum->min.xy) * 0.5f;
     const mat4f F(mat4f::row_major_init {
             s.x,  0.0f, 0.0f,    o.x,
             0.0f,  s.y, 0.0f,    o.y,
@@ -806,8 +799,8 @@ void ShadowMap::intersectWithShadowCasters(Aabb& UTILS_RESTRICT lightFrustum,
     Aabb const box = compute2DBounds(lightView, wsClippedShadowCasterVolumeVertices.data(), vertexCount);
 
     // intersect shadow-caster and current light frustum bounds
-    lightFrustum.min.xy = max(box.min.xy, lightFrustum.min.xy);
-    lightFrustum.max.xy = min(box.max.xy, lightFrustum.max.xy);
+    lightFrustum->min.xy = max(box.min.xy, lightFrustum->min.xy);
+    lightFrustum->max.xy = min(box.max.xy, lightFrustum->max.xy);
 }
 
 void ShadowMap::computeFrustumCorners(float3* UTILS_RESTRICT out,

diff --git a/filament/src/ShadowMap.h b/filament/src/ShadowMap.h
@@ -240,10 +240,8 @@ class ShadowMap {
     static inline Aabb compute2DBounds(const math::mat4f& lightView,
             math::float3 const* wsVertices, size_t count) noexcept;
 
-    static inline Aabb compute2DBounds(const math::mat4f& lightView,
-            math::float4 const& sphere) noexcept;
-
-    static inline void intersectWithShadowCasters(Aabb& lightFrustum, const math::mat4f& lightView,
+    static inline void intersectWithShadowCasters(Aabb* lightFrustum,
+            math::mat4f const& lightView,
             Aabb const& wsShadowCastersVolume) noexcept;
 
     static inline math::float2 computeNearFarOfWarpSpace(math::mat4f const& lightView,