@onerjs/core 8.53.7 → 8.53.8

package/Physics/v2/Plugins/havokPlugin.js

@@ -350,17 +350,7 @@ export class HavokPlugin {
         // Update the region reference and world transform offset
         pluginData.worldRegion = newRegion;
         pluginData.worldTransformOffset = this._hknp.HP_Body_GetWorldTransformOffset(pluginData.hpBodyId)[1];
-        // Garbage-collect the old region if it has no bodies left and it's not the default world
-        if (currentRegion !== this._worldRegions[0]) {
-            const bodyCount = this._hknp.HP_World_GetNumBodies(currentRegion.world)[1];
-            if (bodyCount === 0) {
-                this._hknp.HP_World_Release(currentRegion.world);
-                const idx = this._worldRegions.indexOf(currentRegion);
-                if (idx > 0) {
-                    this._worldRegions.splice(idx, 1);
-                }
-            }
-        }
+        this._releaseWorldRegionIfEmpty(currentRegion);
     }
     /**
      * Searches existing world regions for one that contains the given position.
@@ -380,6 +370,28 @@ export class HavokPlugin {
         }
         return null;
     }
+    /**
+     * Releases a non-default world region when it no longer contains any bodies.
+     * @param worldRegion - The world region to release if empty
+     */
+    _releaseWorldRegionIfEmpty(worldRegion) {
+        const regionIndex = this._worldRegions.indexOf(worldRegion);
+        if (regionIndex <= 0 || this._hknp.HP_World_GetNumBodies(worldRegion.world)[1] !== 0) {
+            return;
+        }
+        this._hknp.HP_World_Release(worldRegion.world);
+        this._worldRegions.splice(regionIndex, 1);
+    }
+    /**
+     * Releases world regions that became candidates for removal while bodies were being removed.
+     * This must run after collision and trigger notifications to avoid releasing a world while its native events are being read.
+     */
+    _releasePendingWorldRegions() {
+        for (const worldRegion of this._worldRegionsPendingRelease) {
+            this._releaseWorldRegionIfEmpty(worldRegion);
+        }
+        this._worldRegionsPendingRelease.clear();
+    }
     constructor(_useDeltaForWorldStep = true, hpInjection = HK, parameters = {}) {
         this._useDeltaForWorldStep = _useDeltaForWorldStep;
         /**
@@ -409,6 +421,11 @@ export class HavokPlugin {
          * Additional regions are created as needed for floating origin mode.
          */
         this._worldRegions = [];
+        /**
+         * World regions that may have become empty while removing bodies.
+         * They are released after collision and trigger notifications have completed.
+         */
+        this._worldRegionsPendingRelease = new Set();
         /**
          * Stored gravity value to apply to new world regions.
          */
@@ -611,6 +628,7 @@ export class HavokPlugin {
             this._notifyCollisions(region.world);
             this._notifyTriggers(region.world);
         }
+        this._releasePendingWorldRegions();
     }
     /**
      * Returns the version of the physics engine plugin.
@@ -686,12 +704,14 @@ export class HavokPlugin {
                 this._bodyCollisionObservable.delete(instance.hpBodyId[0]);
                 this._hknp.HP_World_RemoveBody(instance.worldRegion.world, instance.hpBodyId);
                 this._bodies.delete(instance.hpBodyId[0]);
+                this._worldRegionsPendingRelease.add(instance.worldRegion);
             }
         }
         if (body._pluginData) {
             this._bodyCollisionObservable.delete(body._pluginData.hpBodyId[0]);
             this._hknp.HP_World_RemoveBody(body._pluginData.worldRegion.world, body._pluginData.hpBodyId);
             this._bodies.delete(body._pluginData.hpBodyId[0]);
+            this._worldRegionsPendingRelease.add(body._pluginData.worldRegion);
         }
     }
     /**
@@ -804,6 +824,7 @@ export class HavokPlugin {
                 const hkbody = body._pluginDataInstances.pop();
                 this._bodies.delete(hkbody.hpBodyId[0]);
                 this._hknp.HP_World_RemoveBody(hkbody.worldRegion.world, hkbody.hpBodyId);
+                this._worldRegionsPendingRelease.add(hkbody.worldRegion);
                 this._hknp.HP_Body_Release(hkbody.hpBodyId);
             }
             this._createOrUpdateBodyInstances(body, motionType, matrixData, 0, instancesCount, true);
@@ -1462,6 +1483,7 @@ export class HavokPlugin {
                             // Update region reference and cached world transform offset
                             pluginData.worldRegion = newRegion;
                             pluginData.worldTransformOffset = this._hknp.HP_Body_GetWorldTransformOffset(pluginData.hpBodyId)[1];
+                            this._releaseWorldRegionIfEmpty(currentRegion);
                         }
                     }
                 }
@@ -2815,6 +2837,7 @@ export class HavokPlugin {
             }
         }
         this._worldRegions.length = 0;
+        this._worldRegionsPendingRelease.clear();
         this.world = undefined;
     }
     _v3ToBvecRef(v, vec3) {