@adatechnology/game-test-room 0.19.0 → 0.19.1

package/dist/index.js

@@ -472,6 +472,7 @@ function buildFromSpec(THREE, spec, options = {}) {
 }
 
 // src/explosives.ts
+import { releaseObject3D } from "@adatechnology/game-shapes-three";
 import { ExplosiveBody, backblastEffect, blastEffect, createExplosiveBody, tripwireSegment } from "@adatechnology/game-weapons";
 
 // src/segment-box.ts
@@ -514,9 +515,13 @@ function createExplosives(context) {
   const projectiles = [];
   const meshes = [];
   const up = new THREE.Vector3(0, 1, 0);
+  const drop = (objects) => {
+    for (const object of objects) object.removeFromParent();
+    releaseObject3D(objects, { keep: scene });
+  };
   const clear = () => {
     projectiles.length = 0;
-    for (const mesh of meshes) mesh.removeFromParent();
+    drop(meshes);
     meshes.length = 0;
   };
   const addMesh = (geometry, color, metalness, at) => {
@@ -540,13 +545,12 @@ function createExplosives(context) {
   };
   const remove = (projectile) => {
     for (const extra of projectile.attached ?? []) {
-      extra.removeFromParent();
       const extraAt = meshes.indexOf(extra);
       if (extraAt >= 0) meshes.splice(extraAt, 1);
     }
-    projectile.mesh.removeFromParent();
     const meshAt = meshes.indexOf(projectile.mesh);
     if (meshAt >= 0) meshes.splice(meshAt, 1);
+    drop([...projectile.attached ?? [], projectile.mesh]);
     const at = projectiles.indexOf(projectile);
     if (at >= 0) projectiles.splice(at, 1);
   };
@@ -2948,6 +2952,7 @@ function createRoomDoors(options) {
 }
 
 // src/room.ts
+import { releaseObject3D as releaseObject3D2 } from "@adatechnology/game-shapes-three";
 import { createTerrain, createTerrainImpl, DEFAULT_PROFILE } from "@adatechnology/game-terrain";
 import { createTerrainRenderer } from "@adatechnology/game-terrain-three";
 
@@ -5535,6 +5540,23 @@ function createTestRoom(options) {
     }
     return m;
   };
+  let releaseBatch = null;
+  const dropTree = (root) => {
+    if (!root) return;
+    if (releaseBatch) releaseBatch.push(root);
+    else releaseObject3D2(root, { keep: scene });
+  };
+  const releasingTogether = (fn) => {
+    if (releaseBatch) return fn();
+    releaseBatch = [];
+    try {
+      fn();
+    } finally {
+      const roots = releaseBatch;
+      releaseBatch = null;
+      releaseObject3D2(roots, { keep: scene });
+    }
+  };
   const removeEntry = (id) => {
     const e = entries.get(id);
     if (!e) return;
@@ -5551,7 +5573,10 @@ function createTestRoom(options) {
     e.follower?.dispose?.();
     if (world.has(id)) world.remove(id);
     e.so.root.removeFromParent();
+    const inner = wrapped.get(e.so.root);
     letGo(e.so.root);
+    dropTree(e.so.root);
+    dropTree(inner);
     entries.delete(id);
     doors.forget(id);
     rendererPieces.delete(id);
@@ -5567,12 +5592,14 @@ function createTestRoom(options) {
       }
       if (world.has(id)) world.remove(id);
       p?.root.removeFromParent();
+      dropTree(p?.root);
       rendererPieces.delete(id);
       splitOf.delete(id);
     }
     loose.length = 0;
   };
-  const clearEverything = () => {
+  const clearEverything = () => releasingTogether(clearEverythingNow);
+  const clearEverythingNow = () => {
     if (heldEntry || heldPiece) releaseHeld();
     useItemPlayer = null;
     playing.length = 0;
@@ -5621,8 +5648,10 @@ function createTestRoom(options) {
     seating.release();
     pushByKey = false;
     push.end();
-    clearEverything();
-    for (const id of [...entries.keys()]) removeEntry(id);
+    releasingTogether(() => {
+      clearEverythingNow();
+      for (const id of [...entries.keys()]) removeEntry(id);
+    });
     renderer.reset();
     for (const listener of [...resetListeners]) listener();
     tools.clear();
@@ -5775,11 +5804,11 @@ function createTestRoom(options) {
   };
   const reachAvatar = () => {
     const doorHand = doors.handTargets();
-    const targets = push.active ? null : heldPiece ? twistHand : handSource?.() ?? null;
+    const targets = push.active ? null : doorHand ?? (heldPiece ? twistHand : handSource?.() ?? null);
     lastHand = {
       stance: push.active || doorHand ? "hold" : handStances[toolId] ?? (targets ? "hold" : "relaxed"),
       triggerFinger: targets?.fingers?.index ?? null,
-      targets: push.handTargets() ?? doorHand ?? targets
+      targets: push.handTargets() ?? targets
     };
     if (!avatar?.reach) return;
     avatar.reach(targets, { camera, keepOutside: { contact: (origin, direction, maxDistance) => rayWorld(origin, direction, maxDistance)?.distance ?? null } });