@relu-interactives/spatial-ecs 0.2.6 → 0.2.7

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-NRSUYDBA.js';
-export { AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, ObjectVisibilitySystem, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, ScriptBehaviourSystem, TransformSyncSystem, VideoSystem } from './chunk-NRSUYDBA.js';
+import { MeshGeometrySystem, InstancedMeshSystem, EnvironmentSyncSystem, PostprocessingSyncSystem, LightSyncSystem, MaterialSyncSystem, PhysicsSyncSystem, AnimationSystem, AudioSystem, VideoSystem, CameraSyncSystem, TransformSyncSystem, ObjectVisibilitySystem, RenderSystem } from './chunk-2F6T3BVO.js';
+export { AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, ObjectVisibilitySystem, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, ScriptBehaviourSystem, TransformSyncSystem, VideoSystem } from './chunk-2F6T3BVO.js';
 import { registerDefaultFactories } from './chunk-EIC5B3A7.js';
 export { createAnimationComponent, createAudioComponent, createCameraComponent, createEntityTypeComponent, createEnvironmentComponent, createImageComponent, createImageTargetAnchorComponent, createImageTargetComponent, createInstancedMeshComponent, createLightComponent, createMaterialComponent, createMeshComponent, createMeshGeometryComponent, createModelComponent, createNameComponent, createObject3DRefComponent, createParentIdComponent, createPhysicsComponent, createPostprocessingComponent, createScriptComponent, createSelectableComponent, createSelectionTransformStateComponent, createSpriteComponent, createTransformComponent, createVideoComponent, registerDefaultComponentFactories, registerDefaultFactories } from './chunk-EIC5B3A7.js';
 import { ObjectManagementSystem, applyTransform } from './chunk-FDWNCXU3.js';

package/dist/systems/index.cjs

@@ -4236,8 +4236,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 +4248,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);
@@ -4264,7 +4265,8 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
       if (!anchor) continue;
       const instanceCount = comp.instances.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 +4277,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,20 +4296,25 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
                 InstancedMeshComponent
               );
               if (!currentComp) {
-                this.loadingEntities.delete(targetEntityId);
+                this.loadingSignatures.delete(targetEntityId);
                 return;
               }
               const currentSig = `model:${currentComp.modelPath}:${currentComp.instances.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;
               }
+              if (currentComp.instancedMesh) {
+                currentAnchor.remove(currentComp.instancedMesh);
+                disposeModelGroup(currentComp.instancedMesh);
+                currentComp.instancedMesh = null;
+              }
               const count2 = Math.max(1, currentComp.instances.length);
               const entries = [];
               gltf.scene.updateWorldMatrix(true, true);
@@ -4337,7 +4346,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 +4357,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;