From a48cdcab8a483ac9c8524cc7fd1613f0d90cf4d4 Mon Sep 17 00:00:00 2001
From: iamcheeseman <[hidden email]>
Date: Sat, 17 Jan 2026 18:26:55 -0500
Subject: this is also better

---
 src/phys/world.odin | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/phys/world.odin')

diff --git a/src/phys/world.odin b/src/phys/world.odin
index 3dbd052..0f1451c 100644
--- a/src/phys/world.odin
+++ b/src/phys/world.odin
@@ -84,13 +84,10 @@ _remove_from_bins :: proc(b: Body) {
   assert(len(bin) > 0)
   assert(bin[b.bin_idx] == b.handle)
 
-  last := pop(bin)
-  if last != b.handle {
-    // log.debug(last, b.handle)
-    bin[b.bin_idx] = last
-
-    last_body := _get_body(last)
-    last_body.bin_idx = b.bin_idx
+  unordered_remove(bin, b.bin_idx)
+  if int(b.bin_idx) != len(bin) {
+    swapped_body := _get_body(bin[b.bin_idx])
+    swapped_body.bin_idx = b.bin_idx
   }
 }
 
-- 
cgit v1.3-2-g0d8e