@relu-interactives/spatial-ecs 0.2.6 → 0.2.8

package/dist/systems/index.cjs

@@ -1316,11 +1316,6 @@ __name(_MeshGeometryComponent, "MeshGeometryComponent");
 var MeshGeometryComponent = _MeshGeometryComponent;
 
 // core/components/InstancedMesh.ts
-var DEFAULT_INSTANCE_TRANSFORM = {
-  position: { x: 0, y: 0, z: 0 },
-  rotation: { x: 0, y: 0, z: 0 },
-  scale: { x: 1, y: 1, z: 1 }
-};
 var DEFAULT_INSTANCED_MESH_PARAMETERS = {
   capsule: DEFAULT_MESH_GEOMETRY_PARAMETERS.capsule,
   cube: DEFAULT_MESH_GEOMETRY_PARAMETERS.cube,
@@ -1340,7 +1335,7 @@ var _InstancedMeshComponent = class _InstancedMeshComponent extends Component {
     };
     this.castShadow = options?.castShadow ?? false;
     this.receiveShadow = options?.receiveShadow ?? false;
-    this.instances = options?.instances && options.instances.length > 0 ? options.instances : [{ ...DEFAULT_INSTANCE_TRANSFORM }];
+    this.instanceEntityIds = options?.instanceEntityIds ?? [];
     this.instancedMesh = null;
   }
   /** Sanitize and return a copy of the current mesh parameters with valid values. */
@@ -4197,14 +4192,14 @@ var _euler = new THREE13__namespace.Euler();
 var _scale = new THREE13__namespace.Vector3();
 var _matrix = new THREE13__namespace.Matrix4();
 var _modelMatrix = new THREE13__namespace.Matrix4();
-function instanceTransformToMatrix4(inst, out) {
-  _position.set(inst.position.x, inst.position.y, inst.position.z);
-  _euler.set(inst.rotation.x, inst.rotation.y, inst.rotation.z, "XYZ");
+function instanceTransformFromComponent(transform, out) {
+  _position.set(transform.position.x, transform.position.y, transform.position.z);
+  _euler.set(transform.rotation.x, transform.rotation.y, transform.rotation.z, "XYZ");
   _quaternion.setFromEuler(_euler);
-  _scale.set(inst.scale.x, inst.scale.y, inst.scale.z);
+  _scale.set(transform.scale.x, transform.scale.y, transform.scale.z);
   out.compose(_position, _quaternion, _scale);
 }
-__name(instanceTransformToMatrix4, "instanceTransformToMatrix4");
+__name(instanceTransformFromComponent, "instanceTransformFromComponent");
 function disposePrimitiveInstancedMesh(mesh) {
   mesh.geometry.dispose();
   if (Array.isArray(mesh.material)) {
@@ -4236,8 +4231,9 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
   constructor() {
     /** Signature tracking for geometry + instance count changes. */
     this.geometrySignatures = /* @__PURE__ */ new Map();
-    /** Entities whose GLTF model is currently loading. Prevents duplicate load triggers. */
-    this.loadingEntities = /* @__PURE__ */ new Set();
+    /** Signature being loaded per entity. Maps entityId → geometrySignature in-flight.
+     * Prevents re-dispatching a load every frame while comp.instancedMesh is still null. */
+    this.loadingSignatures = /* @__PURE__ */ new Map();
     /** Per-mesh data for model kind, populated after GLTF load. */
     this.modelMeshEntries = /* @__PURE__ */ new Map();
   }
@@ -4247,8 +4243,8 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
     for (const trackedId of this.geometrySignatures.keys()) {
       if (!alive.has(trackedId)) this.geometrySignatures.delete(trackedId);
     }
-    for (const trackedId of this.loadingEntities) {
-      if (!alive.has(trackedId)) this.loadingEntities.delete(trackedId);
+    for (const trackedId of this.loadingSignatures.keys()) {
+      if (!alive.has(trackedId)) this.loadingSignatures.delete(trackedId);
     }
     for (const trackedId of this.modelMeshEntries.keys()) {
       if (!alive.has(trackedId)) this.modelMeshEntries.delete(trackedId);
@@ -4262,9 +4258,10 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
       const objectRef = world.getComponent(entityId, Object3DRef);
       const anchor = objectRef?.object ?? null;
       if (!anchor) continue;
-      const instanceCount = comp.instances.length;
+      const instanceCount = comp.instanceEntityIds.length;
       const geometrySignature = comp.meshKind === "model" ? `model:${comp.modelPath}:${instanceCount}` : `${comp.meshKind}:${JSON.stringify(comp.meshParameters)}:${instanceCount}`;
-      const needsRebuild = comp.instancedMesh === null || this.geometrySignatures.get(entityId) !== geometrySignature;
+      const pendingLoadSignature = this.loadingSignatures.get(entityId);
+      const needsRebuild = (comp.instancedMesh === null || this.geometrySignatures.get(entityId) !== geometrySignature) && pendingLoadSignature !== geometrySignature;
       if (needsRebuild) {
         if (comp.instancedMesh) {
           anchor.remove(comp.instancedMesh);
@@ -4275,16 +4272,18 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
           }
           comp.instancedMesh = null;
         }
-        this.loadingEntities.delete(entityId);
-        this.modelMeshEntries.delete(entityId);
+        if (pendingLoadSignature !== void 0 && pendingLoadSignature !== geometrySignature) {
+          this.loadingSignatures.delete(entityId);
+          this.modelMeshEntries.delete(entityId);
+        }
         if (comp.meshKind === "model") {
-          if (comp.modelPath && !this.loadingEntities.has(entityId)) {
-            this.loadingEntities.add(entityId);
+          if (comp.modelPath && !this.loadingSignatures.has(entityId)) {
+            this.loadingSignatures.set(entityId, geometrySignature);
             const targetSignature = geometrySignature;
             const targetEntityId = entityId;
             loadGLTF(comp.modelPath).then((gltf) => {
               if (!world.hasEntity(targetEntityId)) {
-                this.loadingEntities.delete(targetEntityId);
+                this.loadingSignatures.delete(targetEntityId);
                 return;
               }
               const currentComp = world.getComponent(
@@ -4292,21 +4291,26 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
                 InstancedMeshComponent
               );
               if (!currentComp) {
-                this.loadingEntities.delete(targetEntityId);
+                this.loadingSignatures.delete(targetEntityId);
                 return;
               }
-              const currentSig = `model:${currentComp.modelPath}:${currentComp.instances.length}`;
+              const currentSig = `model:${currentComp.modelPath}:${currentComp.instanceEntityIds.length}`;
               if (currentSig !== targetSignature) {
-                this.loadingEntities.delete(targetEntityId);
+                this.loadingSignatures.delete(targetEntityId);
                 return;
               }
               const currentRef = world.getComponent(targetEntityId, Object3DRef);
               const currentAnchor = currentRef?.object ?? null;
               if (!currentAnchor) {
-                this.loadingEntities.delete(targetEntityId);
+                this.loadingSignatures.delete(targetEntityId);
                 return;
               }
-              const count2 = Math.max(1, currentComp.instances.length);
+              if (currentComp.instancedMesh) {
+                currentAnchor.remove(currentComp.instancedMesh);
+                disposeModelGroup(currentComp.instancedMesh);
+                currentComp.instancedMesh = null;
+              }
+              const count2 = Math.max(1, currentComp.instanceEntityIds.length);
               const entries = [];
               gltf.scene.updateWorldMatrix(true, true);
               gltf.scene.traverse((child) => {
@@ -4324,12 +4328,13 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
                 instancedMesh2.castShadow = currentComp.castShadow;
                 instancedMesh2.receiveShadow = currentComp.receiveShadow;
                 for (let i = 0; i < count2; i++) {
-                  const inst = currentComp.instances[i] ?? {
-                    position: { x: 0, y: 0, z: 0 },
-                    rotation: { x: 0, y: 0, z: 0 },
-                    scale: { x: 1, y: 1, z: 1 }
-                  };
-                  instanceTransformToMatrix4(inst, _matrix);
+                  const instanceEntityId = currentComp.instanceEntityIds[i];
+                  const instTransform = instanceEntityId !== void 0 ? world.getComponent(instanceEntityId, TransformComponent) ?? null : null;
+                  if (instTransform) {
+                    instanceTransformFromComponent(instTransform, _matrix);
+                  } else {
+                    _matrix.identity();
+                  }
                   _modelMatrix.multiplyMatrices(_matrix, localMatrix);
                   instancedMesh2.setMatrixAt(i, _modelMatrix);
                 }
@@ -4337,7 +4342,7 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
                 entries.push({ localMatrix, instancedMesh: instancedMesh2 });
               });
               if (entries.length === 0) {
-                this.loadingEntities.delete(targetEntityId);
+                this.loadingSignatures.delete(targetEntityId);
                 return;
               }
               const group = new THREE13__namespace.Group();
@@ -4348,9 +4353,9 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
               currentComp.instancedMesh = group;
               this.modelMeshEntries.set(targetEntityId, entries);
               this.geometrySignatures.set(targetEntityId, targetSignature);
-              this.loadingEntities.delete(targetEntityId);
+              this.loadingSignatures.delete(targetEntityId);
             }).catch(() => {
-              this.loadingEntities.delete(targetEntityId);
+              this.loadingSignatures.delete(targetEntityId);
             });
           }
           continue;
@@ -4362,12 +4367,13 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
         instancedMesh.castShadow = comp.castShadow;
         instancedMesh.receiveShadow = comp.receiveShadow;
         for (let i = 0; i < count; i++) {
-          const inst = comp.instances[i] ?? {
-            position: { x: 0, y: 0, z: 0 },
-            rotation: { x: 0, y: 0, z: 0 },
-            scale: { x: 1, y: 1, z: 1 }
-          };
-          instanceTransformToMatrix4(inst, _matrix);
+          const instanceEntityId = comp.instanceEntityIds[i];
+          const instTransform = instanceEntityId !== void 0 ? world.getComponent(instanceEntityId, TransformComponent) ?? null : null;
+          if (instTransform) {
+            instanceTransformFromComponent(instTransform, _matrix);
+          } else {
+            _matrix.identity();
+          }
           instancedMesh.setMatrixAt(i, _matrix);
         }
         instancedMesh.instanceMatrix.needsUpdate = true;
@@ -4378,10 +4384,16 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
         if (comp.meshKind === "model") {
           const entries = this.modelMeshEntries.get(entityId);
           if (entries) {
-            const count = comp.instances.length;
+            const count = comp.instanceEntityIds.length;
             for (const entry of entries) {
               for (let i = 0; i < count; i++) {
-                instanceTransformToMatrix4(comp.instances[i], _matrix);
+                const instanceEntityId = comp.instanceEntityIds[i];
+                const instTransform = instanceEntityId !== void 0 ? world.getComponent(instanceEntityId, TransformComponent) ?? null : null;
+                if (instTransform) {
+                  instanceTransformFromComponent(instTransform, _matrix);
+                } else {
+                  _matrix.identity();
+                }
                 _modelMatrix.multiplyMatrices(_matrix, entry.localMatrix);
                 entry.instancedMesh.setMatrixAt(i, _modelMatrix);
               }
@@ -4392,9 +4404,15 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
           }
         } else {
           const im = comp.instancedMesh;
-          const count = comp.instances.length;
+          const count = comp.instanceEntityIds.length;
           for (let i = 0; i < count; i++) {
-            instanceTransformToMatrix4(comp.instances[i], _matrix);
+            const instanceEntityId = comp.instanceEntityIds[i];
+            const instTransform = instanceEntityId !== void 0 ? world.getComponent(instanceEntityId, TransformComponent) ?? null : null;
+            if (instTransform) {
+              instanceTransformFromComponent(instTransform, _matrix);
+            } else {
+              _matrix.identity();
+            }
             im.setMatrixAt(i, _matrix);
           }
           im.instanceMatrix.needsUpdate = true;