src: rework scenery updates

1 files changed, 20 insertions, 31 deletions

diff --git a/src/chunk.inl b/src/chunk.inl
index bdb4f8ae..6b01510a 100644
--- a/src/chunk.inl
+++ b/src/chunk.inl
@@ -3,40 +3,29 @@
 
 namespace floormat {
 
-template<typename F> void chunk::with_scenery_bbox_update(std::size_t i, F&& fun)
+template<typename F>
+requires requires(F fun) { fun(); }
+void chunk::with_scenery_update(std::size_t idx, F&& fun)
 {
-    static_assert(std::is_invocable_v<F>);
     static_assert(std::is_convertible_v<decltype(fun()), bool> || std::is_same_v<void, decltype(fun())>);
-    if (is_passability_modified())
-    {
-        auto& s = scenery_at(i);
-        auto r0 = s.r;
-        bool modified = true;
-        if constexpr(!std::is_same_v<void, std::decay_t<decltype(fun())>>)
-            modified = fun();
-        else
-            fun();
-        if (r0 != s.r)
-        {
-            fm_debug_assert(modified);
-            mark_scenery_modified();
-        }
-    }
+
+    const auto& s = scenery_at(idx), s0 = s;
+    bbox bb0; bool b0 = _bbox_for_scenery(idx, bb0);
+
+    bool modified = true;
+    if constexpr(!std::is_same_v<void, std::decay_t<decltype(fun())>>)
+        modified = fun();
     else
-    {
-        bbox x0, x;
-        bool b0 = _bbox_for_scenery(i, x0);
-        if constexpr(std::is_same_v<void, std::decay_t<decltype(fun())>>)
-        {
-            fun();
-            _replace_bbox(x0, x, b0, _bbox_for_scenery(i, x));
-        }
-        else
-        {
-            if (fun())
-                _replace_bbox(x0, x, b0, _bbox_for_scenery(i, x));
-        }
-    }
+        fun();
+    if (!modified)
+        return;
+
+    if (bbox bb; !is_passability_modified())
+        if (bool b = _bbox_for_scenery(idx, bb);
+            b != b0 || scenery::is_collision_modified(s0, s))
+            _replace_bbox(bb0, bb, b0, b);
+    if (!is_scenery_modified() && scenery::is_mesh_modified(s0, s))
+        mark_scenery_modified(false);
 }
 
 } // namespace floormat