@relu-interactives/spatial-ecs 0.2.22 → 0.2.24

package/dist/index.js

@@ -1,5 +1,5 @@
-import { MeshGeometrySystem, InstancedMeshSystem, EnvironmentSyncSystem, PostprocessingSyncSystem, LightSyncSystem, MaterialSyncSystem, PhysicsSyncSystem, AnimationSystem, AudioSystem, VideoSystem, CameraSyncSystem, TransformSyncSystem, ObjectVisibilitySystem, RenderSystem, spawnPrefab, despawnPrefab, buildNodeKeyMapsFromSnapshot, indexSnapshotByEntity, findTopLevelNestedRegions, collectSnapshotSubtreeIds, groupOverridePaths, OVERRIDE_DIFF_EXCLUDED_COMPONENTS, OVERRIDE_ROOT_EXCLUDED_COMPONENTS, canonicalizeComponentValue, mergeComponentValue, decanonicalizeComponentValue, computeInstanceOverrides, collectEntitySubtree, ADDED_NODE_MARKER_COMPONENT } from './chunk-GZ2NKSMV.js';
-export { ADDED_NODE_MARKER_COMPONENT, AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, HYDRATABLE_ENTITY_KINDS, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, NODE_KEY_SEPARATOR, OVERRIDE_DIFF_EXCLUDED_COMPONENTS, OVERRIDE_ROOT_EXCLUDED_COMPONENTS, ObjectVisibilitySystem, PREFAB_FILE_VERSION, PREFAB_FILE_VERSION_NESTED, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, SCRIPT_OBJECT_ROOT_FLAG, ScriptBehaviourSystem, ScriptObject, ScriptObjectSystem, TransformSyncSystem, VideoSystem, buildComponentValueMaps, buildNodeKeyMapsFromSnapshot, buildNodeMapsFromSnapshot, canonicalizeComponentValue, clearPrefabCache, collectDiffPaths, collectEntitySubtree, collectSnapshotSubtreeIds, computeInstanceOverrides, decanonicalizeComponentValue, despawnPrefab, encodeOverride, findSnapshotRootEntityIds, findTopLevelNestedRegions, groupOverridePaths, hydrateWorldFromSnapshot, hydrateWorldFromSnapshotDetailed, indexSnapshotByEntity, instantiateSubtree, loadPrefab, mergeComponentValue, parseOverride, parsePrefabAsset, prefabFileVersionFor, restoreComponentState, restorePostCreateComponents, setPrefabAssetUrlResolver, spawnPrefab } from './chunk-GZ2NKSMV.js';
+import { MeshGeometrySystem, InstancedMeshSystem, EnvironmentSyncSystem, PostprocessingSyncSystem, LightSyncSystem, MaterialSyncSystem, PhysicsSyncSystem, AnimationSystem, AudioSystem, VideoSystem, CameraSyncSystem, TransformSyncSystem, ObjectVisibilitySystem, RenderSystem, spawnPrefab, despawnPrefab, buildNodeKeyMapsFromSnapshot, indexSnapshotByEntity, findTopLevelNestedRegions, collectSnapshotSubtreeIds, groupOverridePaths, OVERRIDE_DIFF_EXCLUDED_COMPONENTS, OVERRIDE_ROOT_EXCLUDED_COMPONENTS, canonicalizeComponentValue, mergeComponentValue, decanonicalizeComponentValue, computeInstanceOverrides, collectEntitySubtree, ADDED_NODE_MARKER_COMPONENT } from './chunk-CCE5K2TU.js';
+export { ADDED_NODE_MARKER_COMPONENT, AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, HYDRATABLE_ENTITY_KINDS, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, NODE_KEY_SEPARATOR, OVERRIDE_DIFF_EXCLUDED_COMPONENTS, OVERRIDE_ROOT_EXCLUDED_COMPONENTS, ObjectVisibilitySystem, PREFAB_FILE_VERSION, PREFAB_FILE_VERSION_NESTED, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, SCRIPT_OBJECT_ROOT_FLAG, ScriptBehaviourSystem, ScriptObject, ScriptObjectSystem, TransformSyncSystem, VideoSystem, buildComponentValueMaps, buildNodeKeyMapsFromSnapshot, buildNodeMapsFromSnapshot, canonicalizeComponentValue, clearPrefabCache, collectDiffPaths, collectEntitySubtree, collectSnapshotSubtreeIds, computeInstanceOverrides, decanonicalizeComponentValue, despawnPrefab, encodeOverride, findSnapshotRootEntityIds, findTopLevelNestedRegions, groupOverridePaths, hydrateWorldFromSnapshot, hydrateWorldFromSnapshotDetailed, indexSnapshotByEntity, instantiateSubtree, loadPrefab, mergeComponentValue, parseOverride, parsePrefabAsset, prefabFileVersionFor, restoreComponentState, restorePostCreateComponents, setPrefabAssetUrlResolver, spawnPrefab } from './chunk-CCE5K2TU.js';
 import { registerDefaultFactories } from './chunk-52CHDPRQ.js';
 export { createAnimationComponent, createAudioComponent, createCameraComponent, createEntityTypeComponent, createEnvironmentComponent, createImageComponent, createImageTargetAnchorComponent, createImageTargetComponent, createInstanceSlotComponent, createInstancedMeshComponent, createLightComponent, createMaterialComponent, createMeshComponent, createMeshGeometryComponent, createModelComponent, createNameComponent, createObject3DRefComponent, createParentIdComponent, createPhysicsComponent, createPostprocessingComponent, createScriptComponent, createScriptObjectComponent, createSelectableComponent, createSelectionTransformStateComponent, createSpriteComponent, createTransformComponent, createVideoComponent, registerDefaultComponentFactories, registerDefaultFactories } from './chunk-52CHDPRQ.js';
 import { ObjectManagementSystem } from './chunk-WKGCC7YL.js';

package/dist/systems/index.cjs

@@ -3013,82 +3013,108 @@ function createColliderDesc(RAPIER, values, triMeshData) {
   return desc;
 }
 __name(createColliderDesc, "createColliderDesc");
-function findFirstMeshWithGeometry(object) {
-  if (object instanceof THREE14__namespace.Mesh && object.geometry) {
-    return object;
+function collectTriMeshParts(object) {
+  if (!object) {
+    return null;
   }
-  let found = null;
+  object.updateWorldMatrix(true, true);
+  const worldScale = new THREE14__namespace.Vector3();
+  object.getWorldScale(worldScale);
+  const scale = {
+    x: Math.abs(worldScale.x) || 1,
+    y: Math.abs(worldScale.y) || 1,
+    z: Math.abs(worldScale.z) || 1
+  };
+  const worldToObject = new THREE14__namespace.Matrix4().copy(object.matrixWorld).invert();
+  const parts = [];
   object.traverse((child) => {
-    if (found) {
+    if (!(child instanceof THREE14__namespace.Mesh) || !child.geometry) {
       return;
     }
-    if (child instanceof THREE14__namespace.Mesh && child.geometry) {
-      found = child;
+    const geometry = child.geometry;
+    const positionAttribute = geometry.getAttribute("position");
+    if (!positionAttribute || positionAttribute.itemSize < 3) {
+      return;
     }
+    const positionCount = positionAttribute.count;
+    if (positionCount < 3) {
+      return;
+    }
+    const indexAttribute = geometry.getIndex();
+    const indexCount = indexAttribute ? indexAttribute.count : Math.floor(positionCount / 3) * 3;
+    if (indexCount < 3) {
+      return;
+    }
+    const relativeMatrix = new THREE14__namespace.Matrix4().multiplyMatrices(
+      worldToObject,
+      child.matrixWorld
+    );
+    const matrixSignature = relativeMatrix.elements.map((value) => value.toFixed(5)).join(",");
+    parts.push({
+      positionAttribute,
+      indexAttribute,
+      positionCount,
+      indexCount,
+      relativeMatrix,
+      signature: `${child.uuid}:${geometry.uuid}:${positionCount}:${indexCount}:${matrixSignature}`
+    });
   });
-  return found;
-}
-__name(findFirstMeshWithGeometry, "findFirstMeshWithGeometry");
-function createTriMeshData(object) {
-  if (!object) {
+  if (parts.length === 0) {
     return null;
   }
-  const mesh = findFirstMeshWithGeometry(object);
-  if (!mesh) {
+  const scaleSignature = `${scale.x.toFixed(5)},${scale.y.toFixed(5)},${scale.z.toFixed(5)}`;
+  return {
+    parts,
+    scale,
+    signature: `${scaleSignature}|${parts.map((p) => p.signature).join("|")}`
+  };
+}
+__name(collectTriMeshParts, "collectTriMeshParts");
+function createTriMeshData(collected) {
+  if (!collected) {
     return null;
   }
-  const geometry = mesh.geometry;
-  const positionAttribute = geometry.getAttribute("position");
-  if (!positionAttribute || positionAttribute.itemSize < 3) {
-    return null;
+  const { parts, scale } = collected;
+  let vertexTotal = 0;
+  let indexTotal = 0;
+  for (const part of parts) {
+    vertexTotal += part.positionCount;
+    indexTotal += part.indexCount;
   }
-  const positionCount = positionAttribute.count;
-  if (positionCount < 3) {
+  if (vertexTotal < 3 || indexTotal < 3) {
     return null;
   }
-  object.updateWorldMatrix(true, true);
-  mesh.updateWorldMatrix(true, true);
-  const worldToObject = new THREE14__namespace.Matrix4().copy(object.matrixWorld).invert();
-  const relativeMatrix = new THREE14__namespace.Matrix4().multiplyMatrices(
-    worldToObject,
-    mesh.matrixWorld
-  );
-  const vertices = new Float32Array(positionCount * 3);
+  const vertices = new Float32Array(vertexTotal * 3);
+  const indices = new Uint32Array(indexTotal);
   const point = new THREE14__namespace.Vector3();
-  for (let index = 0; index < positionCount; index += 1) {
-    point.set(
-      positionAttribute.getX(index),
-      positionAttribute.getY(index),
-      positionAttribute.getZ(index)
-    ).applyMatrix4(relativeMatrix);
-    const outputIndex = index * 3;
-    vertices[outputIndex] = point.x;
-    vertices[outputIndex + 1] = point.y;
-    vertices[outputIndex + 2] = point.z;
-  }
-  const indexAttribute = geometry.getIndex();
-  let indices;
-  if (indexAttribute) {
-    indices = new Uint32Array(indexAttribute.count);
-    for (let index = 0; index < indexAttribute.count; index += 1) {
-      indices[index] = indexAttribute.getX(index);
-    }
-  } else {
-    const triangleIndexCount = Math.floor(positionCount / 3) * 3;
-    if (triangleIndexCount < 3) {
-      return null;
-    }
-    indices = new Uint32Array(triangleIndexCount);
-    for (let index = 0; index < triangleIndexCount; index += 1) {
-      indices[index] = index;
+  let vertexOffset = 0;
+  let indexOffset = 0;
+  for (const part of parts) {
+    const { positionAttribute, indexAttribute, relativeMatrix } = part;
+    for (let index = 0; index < part.positionCount; index += 1) {
+      point.set(
+        positionAttribute.getX(index),
+        positionAttribute.getY(index),
+        positionAttribute.getZ(index)
+      ).applyMatrix4(relativeMatrix);
+      const outputIndex = (vertexOffset + index) * 3;
+      vertices[outputIndex] = point.x * scale.x;
+      vertices[outputIndex + 1] = point.y * scale.y;
+      vertices[outputIndex + 2] = point.z * scale.z;
+    }
+    if (indexAttribute) {
+      for (let index = 0; index < part.indexCount; index += 1) {
+        indices[indexOffset + index] = vertexOffset + indexAttribute.getX(index);
+      }
+    } else {
+      for (let index = 0; index < part.indexCount; index += 1) {
+        indices[indexOffset + index] = vertexOffset + index;
+      }
     }
+    vertexOffset += part.positionCount;
+    indexOffset += part.indexCount;
   }
-  const matrixSignature = relativeMatrix.elements.map((value) => value.toFixed(5)).join(",");
-  return {
-    vertices,
-    indices,
-    signature: `${mesh.uuid}:${geometry.uuid}:${positionCount}:${indices.length}:${matrixSignature}`
-  };
+  return { vertices, indices, signature: collected.signature };
 }
 __name(createTriMeshData, "createTriMeshData");
 function syncBodyFromTransform(body, transform) {
@@ -3265,7 +3291,7 @@ var _PhysicsSyncSystem = class _PhysicsSyncSystem {
         syncBodyFromTransform(body, transform);
       }
       const effectiveCollider = computeColliderState(physics.values.collider, object);
-      const triMeshData = effectiveCollider.shape === "trimesh" ? createTriMeshData(object) : null;
+      const triMeshParts = effectiveCollider.shape === "trimesh" ? collectTriMeshParts(object) : null;
       if (!effectiveCollider || !effectiveCollider.enabled) {
         const colliderHandle = this.colliderHandles.get(entityId);
         if (typeof colliderHandle === "number") {
@@ -3279,7 +3305,7 @@ var _PhysicsSyncSystem = class _PhysicsSyncSystem {
         physics.collider = null;
         continue;
       }
-      const colliderSignature = `${JSON.stringify(effectiveCollider)}:${triMeshData?.signature ?? ""}`;
+      const colliderSignature = `${JSON.stringify(effectiveCollider)}:${triMeshParts?.signature ?? ""}`;
       const previousColliderSignature = this.colliderSignatures.get(entityId);
       if (!this.colliderHandles.has(entityId) || previousColliderSignature !== colliderSignature) {
         const previousColliderHandle = this.colliderHandles.get(entityId);
@@ -3292,7 +3318,7 @@ var _PhysicsSyncSystem = class _PhysicsSyncSystem {
         const colliderDesc = createColliderDesc(
           this.rapier,
           effectiveCollider,
-          triMeshData
+          createTriMeshData(triMeshParts)
         );
         const createdCollider = physicsWorld.createCollider(colliderDesc, body);
         this.colliderHandles.set(entityId, createdCollider.handle);
@@ -6906,9 +6932,9 @@ var _ScriptObjectSystem = class _ScriptObjectSystem {
     } catch {
       instance = new ctor(world, entityId, currentData);
     }
-    const defaults = normalizeScriptData(instance.data);
-    const merged = mergeDataByCurrentDefaults(defaults, currentData);
-    instance.data = resolveInputData(world, merged);
+    const literalDefaults = normalizeScriptData(instance.data);
+    const seed = Object.keys(literalDefaults).length > 0 ? mergeDataByCurrentDefaults(literalDefaults, currentData) : { ...currentData };
+    instance.data = resolveInputData(world, seed);
     const parent = world.getComponent(entityId, Object3DRef)?.object;
     if (!parent) {
       throw new Error("Script object entity has no Object3D to attach to.");
@@ -6938,6 +6964,13 @@ var _ScriptObjectSystem = class _ScriptObjectSystem {
     built.userData[SCRIPT_OBJECT_ROOT_FLAG] = true;
     parent.add(built);
     instance.root = built;
+    const postBuildData = normalizeScriptData(instance.data);
+    const schemaDefaults = { ...literalDefaults };
+    for (const [key2, value] of Object.entries(postBuildData)) {
+      if (!(key2 in schemaDefaults)) schemaDefaults[key2] = value;
+    }
+    const merged = mergeDataByCurrentDefaults(schemaDefaults, currentData);
+    instance.data = resolveInputData(world, merged);
     const stored = serializeDataForStorage(merged, merged);
     component.data = stored;
     component.runtimeState = "ready";