@relu-interactives/spatial-ecs 0.2.8 → 0.2.10

package/dist/index.js

@@ -1,5 +1,5 @@
-import { MeshGeometrySystem, InstancedMeshSystem, EnvironmentSyncSystem, PostprocessingSyncSystem, LightSyncSystem, MaterialSyncSystem, PhysicsSyncSystem, AnimationSystem, AudioSystem, VideoSystem, CameraSyncSystem, TransformSyncSystem, ObjectVisibilitySystem, RenderSystem } from './chunk-TVBWYIGY.js';
-export { AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, ObjectVisibilitySystem, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, ScriptBehaviourSystem, TransformSyncSystem, VideoSystem } from './chunk-TVBWYIGY.js';
+import { MeshGeometrySystem, InstancedMeshSystem, EnvironmentSyncSystem, PostprocessingSyncSystem, LightSyncSystem, MaterialSyncSystem, PhysicsSyncSystem, AnimationSystem, AudioSystem, VideoSystem, CameraSyncSystem, TransformSyncSystem, ObjectVisibilitySystem, RenderSystem } from './chunk-Y7KXYSPD.js';
+export { AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, ObjectVisibilitySystem, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, ScriptBehaviourSystem, TransformSyncSystem, VideoSystem } from './chunk-Y7KXYSPD.js';
 import { registerDefaultFactories } from './chunk-LE6ARNYQ.js';
 export { createAnimationComponent, createAudioComponent, createCameraComponent, createEntityTypeComponent, createEnvironmentComponent, createImageComponent, createImageTargetAnchorComponent, createImageTargetComponent, createInstanceSlotComponent, createInstancedMeshComponent, createLightComponent, createMaterialComponent, createMeshComponent, createMeshGeometryComponent, createModelComponent, createNameComponent, createObject3DRefComponent, createParentIdComponent, createPhysicsComponent, createPostprocessingComponent, createScriptComponent, createSelectableComponent, createSelectionTransformStateComponent, createSpriteComponent, createTransformComponent, createVideoComponent, registerDefaultComponentFactories, registerDefaultFactories } from './chunk-LE6ARNYQ.js';
 import { ObjectManagementSystem, applyTransform } from './chunk-ODCWJHPS.js';
@@ -7,7 +7,7 @@ export { ObjectManagementSystem } from './chunk-ODCWJHPS.js';
 import { SelectionTransformState, Object3DRef, Name, EntityType, ScriptComponent, InstancedMeshComponent, InstanceSlotComponent, AnimationComponent, TransformComponent, ModelComponent, ImageComponent, SpriteComponent, VideoComponent, AudioComponent, CameraComponent, Environment, Postprocessing, ImageTarget, LightComponent, MaterialComponent, MeshGeometryComponent, Selectable, PhysicsComponent } from './chunk-AZR6SLQN.js';
 export { AnimationStateMachine, AnimationStateManager, components_exports as CoreComponents } from './chunk-AZR6SLQN.js';
 import './chunk-QHILSPT4.js';
-import { normalizeDebugValue, DEBUG_CHANGE_IGNORED_SYSTEMS, cloneHistoryValue } from './chunk-PHIEXEKJ.js';
+import { normalizeDebugValue, DEBUG_CHANGE_IGNORED_SYSTEMS, cloneHistoryValue } from './chunk-R2WMVXZZ.js';
 import { __name } from './chunk-OY7ZODZP.js';
 export { Component } from './chunk-OY7ZODZP.js';
 import * as THREE from 'three';

package/dist/systems/index.cjs

@@ -4236,6 +4236,15 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
     this.loadingSignatures = /* @__PURE__ */ new Map();
     /** Per-mesh data for model kind, populated after GLTF load. */
     this.modelMeshEntries = /* @__PURE__ */ new Map();
+    /**
+     * System-internal ref to the Three.js mesh/group most recently placed on
+     * the anchor by this system. Used for cleanup on rebuild instead of
+     * `comp.instancedMesh`, which can be stale (pointing to a disposed mesh)
+     * after an undo/redo restores a history snapshot captured at an earlier
+     * geometry configuration. Relying on the stale comp ref would skip removal
+     * of the current live mesh → ghost mesh in the scene.
+     */
+    this.trackedMeshes = /* @__PURE__ */ new Map();
   }
   update(world) {
     const entityIds = world.query(InstancedMeshComponent);
@@ -4249,6 +4258,9 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
     for (const trackedId of this.modelMeshEntries.keys()) {
       if (!alive.has(trackedId)) this.modelMeshEntries.delete(trackedId);
     }
+    for (const trackedId of this.trackedMeshes.keys()) {
+      if (!alive.has(trackedId)) this.trackedMeshes.delete(trackedId);
+    }
     for (const entityId of entityIds) {
       const comp = world.getComponent(
         entityId,
@@ -4260,22 +4272,34 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
       if (!anchor) continue;
       const instanceCount = comp.instanceEntityIds.length;
       const geometrySignature = comp.meshKind === "model" ? `model:${comp.modelPath}:${instanceCount}` : `${comp.meshKind}:${JSON.stringify(comp.meshParameters)}:${instanceCount}`;
+      if (comp.instancedMesh === null) {
+        const tracked = this.trackedMeshes.get(entityId);
+        if (tracked) {
+          comp.instancedMesh = tracked;
+        }
+      }
       const pendingLoadSignature = this.loadingSignatures.get(entityId);
-      const needsRebuild = (comp.instancedMesh === null || this.geometrySignatures.get(entityId) !== geometrySignature) && pendingLoadSignature !== geometrySignature;
+      const needsRebuild = (!this.trackedMeshes.has(entityId) || this.geometrySignatures.get(entityId) !== geometrySignature) && pendingLoadSignature !== geometrySignature;
       if (needsRebuild) {
-        if (comp.instancedMesh) {
-          anchor.remove(comp.instancedMesh);
-          if (comp.instancedMesh.isInstancedMesh) {
-            disposePrimitiveInstancedMesh(comp.instancedMesh);
+        const trackedMesh = this.trackedMeshes.get(entityId);
+        if (trackedMesh) {
+          anchor.remove(trackedMesh);
+          if (trackedMesh.isInstancedMesh) {
+            disposePrimitiveInstancedMesh(trackedMesh);
           } else {
-            disposeModelGroup(comp.instancedMesh);
+            disposeModelGroup(trackedMesh);
           }
-          comp.instancedMesh = null;
+          this.trackedMeshes.delete(entityId);
         }
+        comp.instancedMesh = null;
         if (pendingLoadSignature !== void 0 && pendingLoadSignature !== geometrySignature) {
           this.loadingSignatures.delete(entityId);
           this.modelMeshEntries.delete(entityId);
         }
+        if (instanceCount === 0) {
+          this.geometrySignatures.set(entityId, geometrySignature);
+          continue;
+        }
         if (comp.meshKind === "model") {
           if (comp.modelPath && !this.loadingSignatures.has(entityId)) {
             this.loadingSignatures.set(entityId, geometrySignature);
@@ -4353,6 +4377,7 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
               currentComp.instancedMesh = group;
               this.modelMeshEntries.set(targetEntityId, entries);
               this.geometrySignatures.set(targetEntityId, targetSignature);
+              this.trackedMeshes.set(targetEntityId, group);
               this.loadingSignatures.delete(targetEntityId);
             }).catch(() => {
               this.loadingSignatures.delete(targetEntityId);
@@ -4360,7 +4385,7 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
           }
           continue;
         }
-        const count = Math.max(1, instanceCount);
+        const count = instanceCount;
         const geometry = buildGeometry(comp);
         const material = new THREE13__namespace.MeshStandardMaterial({ color: "#ffffff" });
         const instancedMesh = new THREE13__namespace.InstancedMesh(geometry, material, count);
@@ -4379,6 +4404,7 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
         instancedMesh.instanceMatrix.needsUpdate = true;
         anchor.add(instancedMesh);
         comp.instancedMesh = instancedMesh;
+        this.trackedMeshes.set(entityId, instancedMesh);
         this.geometrySignatures.set(entityId, geometrySignature);
       } else {
         if (comp.meshKind === "model") {