@relu-interactives/spatial-ecs 0.2.8 → 0.2.10

package/dist/index.cjs

@@ -306,10 +306,19 @@ function cloneHistoryValue(value, seen = /* @__PURE__ */ new WeakMap()) {
     return cloneArray;
   }
   const prototype = Object.getPrototypeOf(objectValue);
+  const constructorName = objectValue.constructor?.name;
   const shouldCloneWithPrototype = objectValue instanceof Component || prototype === Object.prototype || prototype === null;
   if (!shouldCloneWithPrototype) {
     return value;
   }
+  if (constructorName === "InstancedMeshComponent") {
+    const cloneObject2 = Object.create(prototype);
+    seen.set(objectValue, cloneObject2);
+    for (const key of Object.keys(objectValue)) {
+      cloneObject2[key] = key === "instancedMesh" ? null : cloneHistoryValue(objectValue[key], seen);
+    }
+    return cloneObject2;
+  }
   const cloneObject = Object.create(prototype);
   seen.set(objectValue, cloneObject);
   for (const key of Object.keys(objectValue)) {
@@ -6113,6 +6122,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);
@@ -6126,6 +6144,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,
@@ -6137,22 +6158,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);
@@ -6230,6 +6263,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);
@@ -6237,7 +6271,7 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
           }
           continue;
         }
-        const count = Math.max(1, instanceCount);
+        const count = instanceCount;
         const geometry = buildGeometry(comp);
         const material = new THREE34__namespace.MeshStandardMaterial({ color: "#ffffff" });
         const instancedMesh = new THREE34__namespace.InstancedMesh(geometry, material, count);
@@ -6256,6 +6290,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") {