@relu-interactives/spatial-ecs 0.2.5 → 0.2.6

package/dist/factories/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AnimationComponent, b as AudioComponent, c as CameraComponentOptions, C as CameraComponent, a0 as RigidbodyState, g as ColliderState, V as PhysicsComponent, w as EnvironmentState, q as Environment, p as EntityType, I as ImageComponent, y as ImageTargetAnchor, x as ImageTarget, L as LightComponent, M as MaterialComponent, O as MeshComponent, P as MeshGeometryComponent, S as ModelComponent, T as Name, U as Object3DRef, Z as PostprocessingState, Y as Postprocessing, a3 as ScriptEntry, a2 as ScriptComponent, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, H as InstancedMeshKind, Q as MeshGeometryParameters, F as InstanceTransform, G as InstancedMeshComponent, aa as VideoComponent } from '../Video-ChVFs9Tl.cjs';
+import { A as AnimationComponent, b as AudioComponent, c as CameraComponentOptions, C as CameraComponent, a0 as RigidbodyState, g as ColliderState, V as PhysicsComponent, w as EnvironmentState, q as Environment, p as EntityType, I as ImageComponent, y as ImageTargetAnchor, x as ImageTarget, L as LightComponent, M as MaterialComponent, O as MeshComponent, P as MeshGeometryComponent, S as ModelComponent, T as Name, U as Object3DRef, Z as PostprocessingState, Y as Postprocessing, a3 as ScriptEntry, a2 as ScriptComponent, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, H as InstancedMeshKind, Q as MeshGeometryParameters, F as InstanceTransform, G as InstancedMeshComponent, aa as VideoComponent } from '../Video-Dj4KBqQ1.cjs';
 import { b as World, P as ParentId, T as TransformComponent, O as ObjectManagementSystem } from '../System-CIiWteft.cjs';
 import * as THREE from 'three';
 import '@dimforge/rapier3d-compat';

package/dist/factories/index.d.ts

@@ -1,4 +1,4 @@
-import { A as AnimationComponent, b as AudioComponent, c as CameraComponentOptions, C as CameraComponent, a0 as RigidbodyState, g as ColliderState, V as PhysicsComponent, w as EnvironmentState, q as Environment, p as EntityType, I as ImageComponent, y as ImageTargetAnchor, x as ImageTarget, L as LightComponent, M as MaterialComponent, O as MeshComponent, P as MeshGeometryComponent, S as ModelComponent, T as Name, U as Object3DRef, Z as PostprocessingState, Y as Postprocessing, a3 as ScriptEntry, a2 as ScriptComponent, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, H as InstancedMeshKind, Q as MeshGeometryParameters, F as InstanceTransform, G as InstancedMeshComponent, aa as VideoComponent } from '../Video-DCMCLInA.js';
+import { A as AnimationComponent, b as AudioComponent, c as CameraComponentOptions, C as CameraComponent, a0 as RigidbodyState, g as ColliderState, V as PhysicsComponent, w as EnvironmentState, q as Environment, p as EntityType, I as ImageComponent, y as ImageTargetAnchor, x as ImageTarget, L as LightComponent, M as MaterialComponent, O as MeshComponent, P as MeshGeometryComponent, S as ModelComponent, T as Name, U as Object3DRef, Z as PostprocessingState, Y as Postprocessing, a3 as ScriptEntry, a2 as ScriptComponent, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, H as InstancedMeshKind, Q as MeshGeometryParameters, F as InstanceTransform, G as InstancedMeshComponent, aa as VideoComponent } from '../Video-B-qMljTn.js';
 import { b as World, P as ParentId, T as TransformComponent, O as ObjectManagementSystem } from '../System-CIiWteft.js';
 import * as THREE from 'three';
 import '@dimforge/rapier3d-compat';

package/dist/factories/index.js

@@ -1,6 +1,6 @@
-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-4A66FSFT.js';
-import '../chunk-CRP3W2GK.js';
-import '../chunk-KRZLEPRI.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 '../chunk-FDWNCXU3.js';
+import '../chunk-R5D5PWXV.js';
 import '../chunk-OY7ZODZP.js';
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/{index-D1I5L7bA.d.cts → index-B12sx9yF.d.cts}

@@ -1,4 +1,4 @@
-import { A as AnimationComponent, a as AnimationComponentOptions, b as AudioComponent, C as CameraComponent, c as CameraComponentOptions, d as CameraProjection, e as CameraRuntimeType, f as ColliderShape, g as ColliderState, h as CubeMeshParameters, D as DEFAULT_COLLIDER_STATE, i as DEFAULT_ENVIRONMENT_STATE, j as DEFAULT_INSTANCED_MESH_PARAMETERS, k as DEFAULT_INSTANCE_TRANSFORM, l as DEFAULT_MESH_GEOMETRY_PARAMETERS, m as DEFAULT_PHYSICS_STATE, n as DEFAULT_POSTPROCESSING_STATE, o as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, p as EntityType, q as Environment, r as EnvironmentFogState, s as EnvironmentFogType, t as EnvironmentGradientEffect, u as EnvironmentSkyboxState, v as EnvironmentSkyboxType, w as EnvironmentState, I as ImageComponent, x as ImageTarget, y as ImageTargetAnchor, z as ImageTargetAnchorOptions, B as ImageTargetReference, F as InstanceTransform, G as InstancedMeshComponent, H as InstancedMeshKind, L as LightComponent, J as LightValueState, M as MaterialComponent, K as MaterialTypeValue, N as MaterialValueState, O as MeshComponent, P as MeshGeometryComponent, Q as MeshGeometryParameters, R as MeshGeometryParametersByKind, S as ModelComponent, T as Name, U as Object3DRef, V as PhysicsComponent, W as PhysicsState, X as PlaneMeshParameters, Y as Postprocessing, Z as PostprocessingState, _ as RadiusHeightMeshParameters, $ as RadiusMeshParameters, a0 as RigidbodyState, a1 as RigidbodyType, a2 as ScriptComponent, a3 as ScriptEntry, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, a7 as TextureFilteringValue, a8 as TransformModeValue, a9 as TransformSpaceValue, aa as VideoComponent, ab as normalizePhysicsState } from './Video-ChVFs9Tl.cjs';
+import { A as AnimationComponent, a as AnimationComponentOptions, b as AudioComponent, C as CameraComponent, c as CameraComponentOptions, d as CameraProjection, e as CameraRuntimeType, f as ColliderShape, g as ColliderState, h as CubeMeshParameters, D as DEFAULT_COLLIDER_STATE, i as DEFAULT_ENVIRONMENT_STATE, j as DEFAULT_INSTANCED_MESH_PARAMETERS, k as DEFAULT_INSTANCE_TRANSFORM, l as DEFAULT_MESH_GEOMETRY_PARAMETERS, m as DEFAULT_PHYSICS_STATE, n as DEFAULT_POSTPROCESSING_STATE, o as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, p as EntityType, q as Environment, r as EnvironmentFogState, s as EnvironmentFogType, t as EnvironmentGradientEffect, u as EnvironmentSkyboxState, v as EnvironmentSkyboxType, w as EnvironmentState, I as ImageComponent, x as ImageTarget, y as ImageTargetAnchor, z as ImageTargetAnchorOptions, B as ImageTargetReference, F as InstanceTransform, G as InstancedMeshComponent, H as InstancedMeshKind, L as LightComponent, J as LightValueState, M as MaterialComponent, K as MaterialTypeValue, N as MaterialValueState, O as MeshComponent, P as MeshGeometryComponent, Q as MeshGeometryParameters, R as MeshGeometryParametersByKind, S as ModelComponent, T as Name, U as Object3DRef, V as PhysicsComponent, W as PhysicsState, X as PlaneMeshParameters, Y as Postprocessing, Z as PostprocessingState, _ as RadiusHeightMeshParameters, $ as RadiusMeshParameters, a0 as RigidbodyState, a1 as RigidbodyType, a2 as ScriptComponent, a3 as ScriptEntry, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, a7 as TextureFilteringValue, a8 as TransformModeValue, a9 as TransformSpaceValue, aa as VideoComponent, ab as normalizePhysicsState } from './Video-Dj4KBqQ1.cjs';
 import { P as ParentId, T as TransformComponent, a as TransformData, V as Vec3 } from './System-CIiWteft.cjs';
 
 declare const index_AnimationComponent: typeof AnimationComponent;

package/dist/{index-DGZDgt3p.d.ts → index-Cf-PaKyN.d.ts}

@@ -1,4 +1,4 @@
-import { A as AnimationComponent, a as AnimationComponentOptions, b as AudioComponent, C as CameraComponent, c as CameraComponentOptions, d as CameraProjection, e as CameraRuntimeType, f as ColliderShape, g as ColliderState, h as CubeMeshParameters, D as DEFAULT_COLLIDER_STATE, i as DEFAULT_ENVIRONMENT_STATE, j as DEFAULT_INSTANCED_MESH_PARAMETERS, k as DEFAULT_INSTANCE_TRANSFORM, l as DEFAULT_MESH_GEOMETRY_PARAMETERS, m as DEFAULT_PHYSICS_STATE, n as DEFAULT_POSTPROCESSING_STATE, o as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, p as EntityType, q as Environment, r as EnvironmentFogState, s as EnvironmentFogType, t as EnvironmentGradientEffect, u as EnvironmentSkyboxState, v as EnvironmentSkyboxType, w as EnvironmentState, I as ImageComponent, x as ImageTarget, y as ImageTargetAnchor, z as ImageTargetAnchorOptions, B as ImageTargetReference, F as InstanceTransform, G as InstancedMeshComponent, H as InstancedMeshKind, L as LightComponent, J as LightValueState, M as MaterialComponent, K as MaterialTypeValue, N as MaterialValueState, O as MeshComponent, P as MeshGeometryComponent, Q as MeshGeometryParameters, R as MeshGeometryParametersByKind, S as ModelComponent, T as Name, U as Object3DRef, V as PhysicsComponent, W as PhysicsState, X as PlaneMeshParameters, Y as Postprocessing, Z as PostprocessingState, _ as RadiusHeightMeshParameters, $ as RadiusMeshParameters, a0 as RigidbodyState, a1 as RigidbodyType, a2 as ScriptComponent, a3 as ScriptEntry, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, a7 as TextureFilteringValue, a8 as TransformModeValue, a9 as TransformSpaceValue, aa as VideoComponent, ab as normalizePhysicsState } from './Video-DCMCLInA.js';
+import { A as AnimationComponent, a as AnimationComponentOptions, b as AudioComponent, C as CameraComponent, c as CameraComponentOptions, d as CameraProjection, e as CameraRuntimeType, f as ColliderShape, g as ColliderState, h as CubeMeshParameters, D as DEFAULT_COLLIDER_STATE, i as DEFAULT_ENVIRONMENT_STATE, j as DEFAULT_INSTANCED_MESH_PARAMETERS, k as DEFAULT_INSTANCE_TRANSFORM, l as DEFAULT_MESH_GEOMETRY_PARAMETERS, m as DEFAULT_PHYSICS_STATE, n as DEFAULT_POSTPROCESSING_STATE, o as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, p as EntityType, q as Environment, r as EnvironmentFogState, s as EnvironmentFogType, t as EnvironmentGradientEffect, u as EnvironmentSkyboxState, v as EnvironmentSkyboxType, w as EnvironmentState, I as ImageComponent, x as ImageTarget, y as ImageTargetAnchor, z as ImageTargetAnchorOptions, B as ImageTargetReference, F as InstanceTransform, G as InstancedMeshComponent, H as InstancedMeshKind, L as LightComponent, J as LightValueState, M as MaterialComponent, K as MaterialTypeValue, N as MaterialValueState, O as MeshComponent, P as MeshGeometryComponent, Q as MeshGeometryParameters, R as MeshGeometryParametersByKind, S as ModelComponent, T as Name, U as Object3DRef, V as PhysicsComponent, W as PhysicsState, X as PlaneMeshParameters, Y as Postprocessing, Z as PostprocessingState, _ as RadiusHeightMeshParameters, $ as RadiusMeshParameters, a0 as RigidbodyState, a1 as RigidbodyType, a2 as ScriptComponent, a3 as ScriptEntry, a4 as Selectable, a5 as SelectionTransformState, a6 as SpriteComponent, a7 as TextureFilteringValue, a8 as TransformModeValue, a9 as TransformSpaceValue, aa as VideoComponent, ab as normalizePhysicsState } from './Video-B-qMljTn.js';
 import { P as ParentId, T as TransformComponent, a as TransformData, V as Vec3 } from './System-CIiWteft.js';
 
 declare const index_AnimationComponent: typeof AnimationComponent;

package/dist/index.cjs

@@ -159,6 +159,7 @@ function normalizeDebugValue(value, ctx) {
     return {
       __type: "InstancedMeshComponent",
       meshKind: typeof objectValue.meshKind === "string" ? objectValue.meshKind : "cube",
+      modelPath: typeof objectValue.modelPath === "string" ? objectValue.modelPath : "",
       meshParameters: normalizeDebugValue(objectValue.meshParameters, imCtx),
       castShadow: Boolean(objectValue.castShadow),
       receiveShadow: Boolean(objectValue.receiveShadow),
@@ -2222,6 +2223,7 @@ var DEFAULT_INSTANCED_MESH_PARAMETERS = {
   capsule: DEFAULT_MESH_GEOMETRY_PARAMETERS.capsule,
   cube: DEFAULT_MESH_GEOMETRY_PARAMETERS.cube,
   cylinder: DEFAULT_MESH_GEOMETRY_PARAMETERS.cylinder,
+  model: DEFAULT_MESH_GEOMETRY_PARAMETERS.cube,
   plane: DEFAULT_MESH_GEOMETRY_PARAMETERS.plane,
   sphere: DEFAULT_MESH_GEOMETRY_PARAMETERS.sphere
 };
@@ -2229,6 +2231,7 @@ var _InstancedMeshComponent = class _InstancedMeshComponent extends Component {
   constructor(meshKind = "cube", meshParameters, options) {
     super();
     this.meshKind = meshKind;
+    this.modelPath = options?.modelPath ?? "";
     this.meshParameters = {
       ...DEFAULT_INSTANCED_MESH_PARAMETERS[meshKind],
       ...meshParameters ?? {}
@@ -2271,6 +2274,8 @@ var _InstancedMeshComponent = class _InstancedMeshComponent extends Component {
           height: sanitize(p.height, MIN_DIM)
         };
       }
+      case "model":
+        return DEFAULT_MESH_GEOMETRY_PARAMETERS.cube;
     }
   }
 };
@@ -5914,6 +5919,32 @@ var _MeshGeometrySystem = class _MeshGeometrySystem {
 };
 __name(_MeshGeometrySystem, "MeshGeometrySystem");
 var MeshGeometrySystem = _MeshGeometrySystem;
+var DRACO_DECODER_PATH = resolveDracoDecoderPath();
+var loadGLTF = /* @__PURE__ */ __name((path) => {
+  return new Promise((resolve, reject) => {
+    const loader = new GLTFLoader_js.GLTFLoader();
+    try {
+      const dracoLoader = new DRACOLoader_js.DRACOLoader();
+      dracoLoader.setDecoderPath(DRACO_DECODER_PATH);
+      loader.setDRACOLoader(dracoLoader);
+    } catch (error) {
+      console.debug("DRACOLoader setup failed or unavailable", error);
+    }
+    loader.load(
+      path,
+      (gltf) => {
+        resolve(gltf);
+      },
+      void 0,
+      (error) => {
+        console.debug("GLTFLoader failed to load", error);
+        reject(error);
+      }
+    );
+  });
+}, "loadGLTF");
+
+// core/systems/InstancedMeshSystem.ts
 function buildGeometry(component) {
   const p = component.getSanitizedParameters();
   switch (component.meshKind) {
@@ -5937,6 +5968,8 @@ function buildGeometry(component) {
       const params = p;
       return new THREE34__namespace.CapsuleGeometry(params.radius, params.height, 4, 8);
     }
+    default:
+      return new THREE34__namespace.BoxGeometry(1, 1, 1);
   }
 }
 __name(buildGeometry, "buildGeometry");
@@ -5945,6 +5978,7 @@ var _quaternion = new THREE34__namespace.Quaternion();
 var _euler = new THREE34__namespace.Euler();
 var _scale = new THREE34__namespace.Vector3();
 var _matrix = new THREE34__namespace.Matrix4();
+var _modelMatrix = new THREE34__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");
@@ -5953,51 +5987,156 @@ function instanceTransformToMatrix4(inst, out) {
   out.compose(_position, _quaternion, _scale);
 }
 __name(instanceTransformToMatrix4, "instanceTransformToMatrix4");
+function disposePrimitiveInstancedMesh(mesh) {
+  mesh.geometry.dispose();
+  if (Array.isArray(mesh.material)) {
+    for (const m of mesh.material) {
+      m.dispose();
+    }
+  } else {
+    mesh.material.dispose();
+  }
+}
+__name(disposePrimitiveInstancedMesh, "disposePrimitiveInstancedMesh");
+function disposeModelGroup(group) {
+  group.traverse((child) => {
+    const im = child;
+    if (im.isInstancedMesh) {
+      im.geometry.dispose();
+      if (Array.isArray(im.material)) {
+        for (const m of im.material) {
+          m.dispose();
+        }
+      } else {
+        im.material.dispose();
+      }
+    }
+  });
+}
+__name(disposeModelGroup, "disposeModelGroup");
 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();
+    /** Per-mesh data for model kind, populated after GLTF load. */
+    this.modelMeshEntries = /* @__PURE__ */ new Map();
   }
   update(world) {
     const entityIds = world.query(InstancedMeshComponent);
     const alive = new Set(entityIds);
     for (const trackedId of this.geometrySignatures.keys()) {
-      if (!alive.has(trackedId)) {
-        this.geometrySignatures.delete(trackedId);
-      }
+      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.modelMeshEntries.keys()) {
+      if (!alive.has(trackedId)) this.modelMeshEntries.delete(trackedId);
     }
     for (const entityId of entityIds) {
       const comp = world.getComponent(
         entityId,
         InstancedMeshComponent
       );
-      if (!comp) {
-        continue;
-      }
-      let anchor = null;
+      if (!comp) continue;
       const objectRef = world.getComponent(entityId, Object3DRef);
-      if (objectRef?.object) {
-        anchor = objectRef.object;
-      }
-      if (!anchor) {
-        continue;
-      }
+      const anchor = objectRef?.object ?? null;
+      if (!anchor) continue;
       const instanceCount = comp.instances.length;
-      const geometrySignature = `${comp.meshKind}:${JSON.stringify(comp.meshParameters)}:${instanceCount}`;
+      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;
       if (needsRebuild) {
         if (comp.instancedMesh) {
           anchor.remove(comp.instancedMesh);
-          comp.instancedMesh.geometry.dispose();
-          if (Array.isArray(comp.instancedMesh.material)) {
-            for (const m of comp.instancedMesh.material) {
-              m.dispose();
-            }
+          if (comp.instancedMesh.isInstancedMesh) {
+            disposePrimitiveInstancedMesh(comp.instancedMesh);
           } else {
-            comp.instancedMesh.material.dispose();
+            disposeModelGroup(comp.instancedMesh);
           }
           comp.instancedMesh = null;
         }
+        this.loadingEntities.delete(entityId);
+        this.modelMeshEntries.delete(entityId);
+        if (comp.meshKind === "model") {
+          if (comp.modelPath && !this.loadingEntities.has(entityId)) {
+            this.loadingEntities.add(entityId);
+            const targetSignature = geometrySignature;
+            const targetEntityId = entityId;
+            loadGLTF(comp.modelPath).then((gltf) => {
+              if (!world.hasEntity(targetEntityId)) {
+                this.loadingEntities.delete(targetEntityId);
+                return;
+              }
+              const currentComp = world.getComponent(
+                targetEntityId,
+                InstancedMeshComponent
+              );
+              if (!currentComp) {
+                this.loadingEntities.delete(targetEntityId);
+                return;
+              }
+              const currentSig = `model:${currentComp.modelPath}:${currentComp.instances.length}`;
+              if (currentSig !== targetSignature) {
+                this.loadingEntities.delete(targetEntityId);
+                return;
+              }
+              const currentRef = world.getComponent(targetEntityId, Object3DRef);
+              const currentAnchor = currentRef?.object ?? null;
+              if (!currentAnchor) {
+                this.loadingEntities.delete(targetEntityId);
+                return;
+              }
+              const count2 = Math.max(1, currentComp.instances.length);
+              const entries = [];
+              gltf.scene.updateWorldMatrix(true, true);
+              gltf.scene.traverse((child) => {
+                const meshChild = child;
+                if (!meshChild.isMesh) return;
+                const geometry2 = meshChild.geometry.clone();
+                const sourceMaterial = Array.isArray(meshChild.material) ? meshChild.material.map((m) => m.clone()) : meshChild.material.clone();
+                meshChild.updateWorldMatrix(true, false);
+                const localMatrix = meshChild.matrixWorld.clone();
+                const instancedMesh2 = new THREE34__namespace.InstancedMesh(
+                  geometry2,
+                  Array.isArray(sourceMaterial) ? sourceMaterial : sourceMaterial,
+                  count2
+                );
+                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);
+                  _modelMatrix.multiplyMatrices(_matrix, localMatrix);
+                  instancedMesh2.setMatrixAt(i, _modelMatrix);
+                }
+                instancedMesh2.instanceMatrix.needsUpdate = true;
+                entries.push({ localMatrix, instancedMesh: instancedMesh2 });
+              });
+              if (entries.length === 0) {
+                this.loadingEntities.delete(targetEntityId);
+                return;
+              }
+              const group = new THREE34__namespace.Group();
+              for (const entry of entries) {
+                group.add(entry.instancedMesh);
+              }
+              currentAnchor.add(group);
+              currentComp.instancedMesh = group;
+              this.modelMeshEntries.set(targetEntityId, entries);
+              this.geometrySignatures.set(targetEntityId, targetSignature);
+              this.loadingEntities.delete(targetEntityId);
+            }).catch(() => {
+              this.loadingEntities.delete(targetEntityId);
+            });
+          }
+          continue;
+        }
         const count = Math.max(1, instanceCount);
         const geometry = buildGeometry(comp);
         const material = new THREE34__namespace.MeshStandardMaterial({ color: "#ffffff" });
@@ -6018,15 +6157,32 @@ var _InstancedMeshSystem = class _InstancedMeshSystem {
         comp.instancedMesh = instancedMesh;
         this.geometrySignatures.set(entityId, geometrySignature);
       } else {
-        const im = comp.instancedMesh;
-        const count = comp.instances.length;
-        for (let i = 0; i < count; i++) {
-          instanceTransformToMatrix4(comp.instances[i], _matrix);
-          im.setMatrixAt(i, _matrix);
+        if (comp.meshKind === "model") {
+          const entries = this.modelMeshEntries.get(entityId);
+          if (entries) {
+            const count = comp.instances.length;
+            for (const entry of entries) {
+              for (let i = 0; i < count; i++) {
+                instanceTransformToMatrix4(comp.instances[i], _matrix);
+                _modelMatrix.multiplyMatrices(_matrix, entry.localMatrix);
+                entry.instancedMesh.setMatrixAt(i, _modelMatrix);
+              }
+              entry.instancedMesh.instanceMatrix.needsUpdate = true;
+              entry.instancedMesh.castShadow = comp.castShadow;
+              entry.instancedMesh.receiveShadow = comp.receiveShadow;
+            }
+          }
+        } else {
+          const im = comp.instancedMesh;
+          const count = comp.instances.length;
+          for (let i = 0; i < count; i++) {
+            instanceTransformToMatrix4(comp.instances[i], _matrix);
+            im.setMatrixAt(i, _matrix);
+          }
+          im.instanceMatrix.needsUpdate = true;
+          im.castShadow = comp.castShadow;
+          im.receiveShadow = comp.receiveShadow;
         }
-        im.instanceMatrix.needsUpdate = true;
-        im.castShadow = comp.castShadow;
-        im.receiveShadow = comp.receiveShadow;
       }
     }
   }
@@ -8586,6 +8742,9 @@ function restoreComponentState(world, objectManagementSystem, targetEntityId, so
       if (typeof sourceInstancedMesh.meshKind === "string") {
         imComponent.meshKind = sourceInstancedMesh.meshKind;
       }
+      if (typeof sourceInstancedMesh.modelPath === "string") {
+        imComponent.modelPath = sourceInstancedMesh.modelPath;
+      }
       const parameters = asRecord3(sourceInstancedMesh.meshParameters);
       if (parameters) {
         imComponent.meshParameters = parameters;