From d41007391bd053e5a443e2e59fe52678cdd413cb Mon Sep 17 00:00:00 2001
From: irondnb <m.szota@vasco-electronics.com>
Date: Fri, 27 Mar 2026 16:19:38 +0100
Subject: [PATCH] Fix AABB tree updates/removes

---
 lib/cyberarm_engine/trees/aabb_node.rb |  6 ++-
 lib/cyberarm_engine/trees/aabb_tree.rb |  3 +-
 test/aabb_tree_test.rb                 | 53 ++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 test/aabb_tree_test.rb

diff --git a/lib/cyberarm_engine/trees/aabb_node.rb b/lib/cyberarm_engine/trees/aabb_node.rb
index 1500a48..99d29f2 100644
--- a/lib/cyberarm_engine/trees/aabb_node.rb
+++ b/lib/cyberarm_engine/trees/aabb_node.rb
@@ -72,8 +72,10 @@ def search_subtree(collider, items = [])
       end
 
       def remove_subtree(leaf)
-        if leaf
-          self
+        return self unless leaf
+
+        if leaf == self
+          nil
         elsif leaf.parent == self
           other_child = other(leaf)
           other_child.parent = @parent
diff --git a/lib/cyberarm_engine/trees/aabb_tree.rb b/lib/cyberarm_engine/trees/aabb_tree.rb
index ddea8f6..6f59987 100644
--- a/lib/cyberarm_engine/trees/aabb_tree.rb
+++ b/lib/cyberarm_engine/trees/aabb_tree.rb
@@ -30,7 +30,8 @@ def insert_leaf(leaf)
 
     def update(object, bounding_box)
       leaf = remove(object)
-      leaf.bounding_box = bounding_box
+      leaf.bounding_box = bounding_box.dup
+      @objects[object] = leaf
       insert_leaf(leaf)
     end
 
diff --git a/test/aabb_tree_test.rb b/test/aabb_tree_test.rb
new file mode 100644
index 0000000..dfe3de9
--- /dev/null
+++ b/test/aabb_tree_test.rb
@@ -0,0 +1,53 @@
+require "minitest/autorun"
+
+require_relative "../lib/cyberarm_engine/vector"
+require_relative "../lib/cyberarm_engine/ray"
+require_relative "../lib/cyberarm_engine/bounding_box"
+require_relative "../lib/cyberarm_engine/trees/aabb_tree_debug"
+require_relative "../lib/cyberarm_engine/trees/aabb_node"
+require_relative "../lib/cyberarm_engine/trees/aabb_tree"
+
+class AABBTreeTest < Minitest::Test
+  def test_remove_clears_the_root_when_the_last_leaf_is_deleted
+    tree = CyberarmEngine::AABBTree.new
+    object = Object.new
+    box = CyberarmEngine::BoundingBox.new(0, 0, 0, 1, 1, 1)
+
+    tree.insert(object, box)
+    tree.remove(object)
+
+    assert_nil tree.root
+    assert_empty tree.objects
+    assert_empty tree.search(box)
+  end
+
+  def test_update_replaces_the_existing_leaf_instead_of_leaking_duplicates
+    tree = CyberarmEngine::AABBTree.new
+    object = Object.new
+    old_box = CyberarmEngine::BoundingBox.new(0, 0, 0, 1, 1, 1)
+    new_box = CyberarmEngine::BoundingBox.new(10, 10, 10, 11, 11, 11)
+
+    tree.insert(object, old_box)
+    tree.update(object, new_box)
+
+    assert_empty tree.search(old_box)
+    assert_equal [object], tree.search(new_box)
+  end
+
+  def test_update_can_be_called_multiple_times_for_the_same_object
+    tree = CyberarmEngine::AABBTree.new
+    object = Object.new
+    first_box = CyberarmEngine::BoundingBox.new(0, 0, 0, 1, 1, 1)
+    second_box = CyberarmEngine::BoundingBox.new(10, 10, 10, 11, 11, 11)
+    third_box = CyberarmEngine::BoundingBox.new(20, 20, 20, 21, 21, 21)
+
+    tree.insert(object, first_box)
+    tree.update(object, second_box)
+    tree.update(object, third_box)
+
+    assert_equal 1, tree.objects.size
+    assert_empty tree.search(first_box)
+    assert_empty tree.search(second_box)
+    assert_equal [object], tree.search(third_box)
+  end
+end