From e705aa4550b433461f670868342b757b864d1013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A3=8E=E9=9D=92=E5=B1=B1?= Date: Thu, 28 Sep 2023 20:13:56 +0800 Subject: [PATCH] Fix not refitting upward from leaf nodes. Previously, the wrong node id (root node id) was used. Dirty leaf nodes do not actually recalculate aabb. Additionally, when requesting a new leaf, mark `dirty` as `false` in `clear()`. Make sure to only mark the leaf as **dirty** when shrinking the border of the leaf when removing items. In other cases, the leaf node's aabb will get the correct result immediately. 1. When adding an item, the leaf nodes will be calculated immediately. 2. Removing the item within the border of the leaf node has no effect on the original aabb. --- core/math/bvh_refit.inc | 2 +- core/math/bvh_structs.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/math/bvh_refit.inc b/core/math/bvh_refit.inc index 717a3438c7cb..b20b805bb0d9 100644 --- a/core/math/bvh_refit.inc +++ b/core/math/bvh_refit.inc @@ -134,7 +134,7 @@ void refit_branch(uint32_t p_node_id) { TLeaf &leaf = _node_get_leaf(tnode); if (leaf.is_dirty()) { leaf.set_dirty(false); - refit_upward(p_node_id); + refit_upward(rp.node_id); } } } // while more nodes to pop diff --git a/core/math/bvh_structs.inc b/core/math/bvh_structs.inc index 06f6e5d05dd2..d40c631ce22a 100644 --- a/core/math/bvh_structs.inc +++ b/core/math/bvh_structs.inc @@ -83,7 +83,7 @@ public: void clear() { num_items = 0; - set_dirty(true); + set_dirty(false); } bool is_full() const { return num_items >= MAX_ITEMS; }