@relu-interactives/spatial-ecs 0.3.5 → 0.3.6

package/dist/{chunk-G53MZVKQ.js → chunk-WRJ2K3LZ.js}

@@ -1,5 +1,5 @@
-import { resolveDracoDecoderPath, applyTransform, SHARED_MODEL_RESOURCE_FLAG } from './chunk-2LVFGVWI.js';
-import { AnimationComponent, ModelComponent, CameraComponent, Object3DRef, Environment, Postprocessing, TransformComponent, PhysicsComponent, setPhysicsLiveRef, LightComponent, MaterialComponent, DEFAULT_MESH_GEOMETRY_PARAMETERS, MeshGeometryComponent, InstancedMeshComponent, ParentId, ScriptComponent, ScriptObjectComponent, XRRigComponent, VRTeleportAreaComponent, XRInteractableComponent, InstanceSlotComponent, Name, ImageComponent, SpriteComponent, VideoComponent, AudioComponent, ImageTarget, Selectable, PrefabNode, PrefabInstance } from './chunk-6QC2PJLD.js';
+import { resolveDracoDecoderPath, applyTransform, SHARED_MODEL_RESOURCE_FLAG } from './chunk-JRJ3CL5H.js';
+import { AnimationComponent, ModelComponent, CameraComponent, Object3DRef, Environment, Postprocessing, TransformComponent, PhysicsComponent, setPhysicsLiveRef, LightComponent, MaterialComponent, DEFAULT_MESH_GEOMETRY_PARAMETERS, MeshGeometryComponent, InstancedMeshComponent, ParentId, ScriptComponent, ScriptObjectComponent, XRRigComponent, VRTeleportAreaComponent, XRInteractableComponent, XRInteractorComponent, XRInteractorSideComponent, InstanceSlotComponent, Name, ImageComponent, SpriteComponent, VideoComponent, AudioComponent, ImageTarget, Selectable, PrefabNode, PrefabInstance } from './chunk-N4GKZ7IV.js';
 import { __name } from './chunk-OY7ZODZP.js';
 import * as THREE7 from 'three';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
@@ -2791,6 +2791,14 @@ function buildComponentValueMaps(snapshot) {
       snapshot.components,
       "XRInteractableComponent"
     ),
+    xrInteractorValues: readByComponent(
+      snapshot.components,
+      "XRInteractorComponent"
+    ),
+    xrInteractorSideValues: readByComponent(
+      snapshot.components,
+      "XRInteractorSideComponent"
+    ),
     instancedMeshValues: readByComponent(snapshot.components, "InstancedMeshComponent"),
     instanceSlotValues: readByComponent(snapshot.components, "InstanceSlotComponent"),
     prefabNodeValues: readByComponent(snapshot.components, "PrefabNode"),
@@ -2977,6 +2985,60 @@ function restorePostCreateComponents(world, objectManagementSystem, targetEntity
       }
     }
   }
+  {
+    const sourceInteractor = asRecord(
+      values.xrInteractorValues.get(sourceEntityId)
+    );
+    const interactor = world.getComponent(targetEntityId, XRInteractorComponent);
+    if (sourceInteractor && interactor) {
+      if (typeof sourceInteractor.interactorType === "string") {
+        interactor.interactorType = sourceInteractor.interactorType;
+      }
+      if (typeof sourceInteractor.handPreset === "string") {
+        interactor.handPreset = sourceInteractor.handPreset;
+      }
+      if (typeof sourceInteractor.handColor === "string") {
+        interactor.handColor = sourceInteractor.handColor;
+      }
+      if (typeof sourceInteractor.handOpacity === "number") {
+        interactor.handOpacity = sourceInteractor.handOpacity;
+      }
+      if (typeof sourceInteractor.handEmissiveIntensity === "number") {
+        interactor.handEmissiveIntensity = sourceInteractor.handEmissiveIntensity;
+      }
+      if (typeof sourceInteractor.showRay === "boolean") {
+        interactor.showRay = sourceInteractor.showRay;
+      }
+    }
+  }
+  {
+    const sourceSide = asRecord(
+      values.xrInteractorSideValues.get(sourceEntityId)
+    );
+    if (sourceSide && typeof sourceSide.side === "string") {
+      const existing = world.getComponent(
+        targetEntityId,
+        XRInteractorSideComponent
+      );
+      if (existing) {
+        existing.side = sourceSide.side;
+      } else {
+        world.addComponent(
+          targetEntityId,
+          new XRInteractorSideComponent({
+            side: sourceSide.side
+          })
+        );
+      }
+    }
+  }
+  {
+    const sourceRigOrigin = asRecord(values.xrRigValues.get(sourceEntityId));
+    const rigForOrigin = world.getComponent(targetEntityId, XRRigComponent);
+    if (sourceRigOrigin && rigForOrigin && typeof sourceRigOrigin.trackingOrigin === "string") {
+      rigForOrigin.trackingOrigin = sourceRigOrigin.trackingOrigin;
+    }
+  }
   {
     const imComponent = world.getComponent(targetEntityId, InstancedMeshComponent);
     if (imComponent && imComponent.instanceEntityIds.length > 0) {
@@ -3566,6 +3628,7 @@ var HYDRATABLE_ENTITY_KINDS = /* @__PURE__ */ new Set([
   "instanceSlot",
   "scriptObject",
   "xrRig",
+  "xrInteractor",
   "teleportArea"
 ]);
 
@@ -6119,6 +6182,9 @@ var _XRInputSystem = class _XRInputSystem {
         state.hasAxes = false;
         state.buttons = [];
       }
+    }
+    for (const record of this.records.values()) {
+      const state = record.state;
       if (record.pendingSelectStart) {
         state.select = true;
         state.selectStart = true;
@@ -6560,6 +6626,8 @@ var _XRSessionSystem = class _XRSessionSystem {
   constructor(inputSystem) {
     this.presenting = false;
     this.capabilities = NO_XR_CAPABILITIES;
+    /** Y compensation applied when a floor-relative space was requested but not granted. */
+    this.appliedOriginOffset = 0;
     this.inputSystem = inputSystem ?? null;
   }
   update(world) {
@@ -6583,11 +6651,59 @@ var _XRSessionSystem = class _XRSessionSystem {
     if (session && this.inputSystem) {
       this.inputSystem.attachSession(session);
     }
+    this.applyTrackingOrigin(world, session ?? null);
     this.forEachBehaviour(world, (behaviour) => {
       behaviour.onXRSessionStart(this.capabilities);
     });
   }
+  /**
+   * Apply the rig's authored tracking origin, and compensate when the device
+   * cannot honour it.
+   *
+   * `floor` (`local-floor`) puts Y=0 on the user's real floor, which is what a
+   * scene authored standing on the ground expects. `eye` (`local`) puts Y=0 at
+   * the headset, for seated experiences.
+   *
+   * The compensation matters: `local-floor` is only ever REQUESTED as an
+   * optional feature (requiring it would make `requestSession` reject outright
+   * on devices that lack it). When it isn't granted, the runtime silently falls
+   * back to `local` — the origin jumps to head height and a floor-authored
+   * scene swallows the user, which is exactly the "I'm standing under the
+   * building" symptom. Offsetting the rig down by the eye height restores the
+   * intended floor relationship instead of leaving it broken.
+   */
+  applyTrackingOrigin(world, session) {
+    const rigEntityId = world.query(XRRigComponent, TransformComponent)[0];
+    if (typeof rigEntityId !== "number") return;
+    const rig = world.getComponent(rigEntityId, XRRigComponent);
+    const transform = world.getComponent(rigEntityId, TransformComponent);
+    if (!rig || !transform) return;
+    const renderer = world.getRenderer();
+    const wantsFloor = rig.trackingOrigin === "floor";
+    try {
+      renderer.xr.setReferenceSpaceType(wantsFloor ? "local-floor" : "local");
+    } catch {
+    }
+    const granted = session?.enabledFeatures;
+    const floorGranted = Array.isArray(granted) ? granted.includes("local-floor") : (
+      // No report at all: trust the request, since a wrong offset is worse
+      // than none on devices that did honour it.
+      true
+    );
+    this.appliedOriginOffset = wantsFloor && !floorGranted ? rig.fallbackEyeHeight : 0;
+    if (this.appliedOriginOffset !== 0) {
+      transform.position.y -= this.appliedOriginOffset;
+    }
+  }
   handleSessionEnd(world) {
+    if (this.appliedOriginOffset !== 0) {
+      const rigEntityId = world.query(XRRigComponent, TransformComponent)[0];
+      if (typeof rigEntityId === "number") {
+        const transform = world.getComponent(rigEntityId, TransformComponent);
+        if (transform) transform.position.y += this.appliedOriginOffset;
+      }
+      this.appliedOriginOffset = 0;
+    }
     this.capabilities = NO_XR_CAPABILITIES;
     this.inputSystem?.detachSession();
     this.forEachBehaviour(world, (behaviour) => {
@@ -6681,17 +6797,74 @@ var _VRTeleportAreaSystem = class _VRTeleportAreaSystem {
 };
 __name(_VRTeleportAreaSystem, "VRTeleportAreaSystem");
 var VRTeleportAreaSystem = _VRTeleportAreaSystem;
+function createHandMaterial(preset, options) {
+  const color = new THREE7.Color(options.color);
+  switch (preset) {
+    case "ghost":
+      return new THREE7.MeshBasicMaterial({
+        color,
+        transparent: true,
+        opacity: Math.min(1, Math.max(0.05, options.opacity * 0.45)),
+        depthWrite: false,
+        side: THREE7.DoubleSide
+      });
+    case "neon":
+      return new THREE7.MeshStandardMaterial({
+        color,
+        emissive: color,
+        emissiveIntensity: Math.max(0.5, options.emissiveIntensity || 2),
+        roughness: 0.35,
+        metalness: 0,
+        transparent: options.opacity < 1,
+        opacity: options.opacity
+      });
+    case "skeleton":
+      return new THREE7.MeshBasicMaterial({
+        color,
+        wireframe: true,
+        transparent: true,
+        opacity: options.opacity
+      });
+    case "custom":
+    case "default":
+      return new THREE7.MeshStandardMaterial({
+        color,
+        roughness: 0.85,
+        metalness: 0,
+        emissive: color,
+        emissiveIntensity: Math.max(0, options.emissiveIntensity),
+        transparent: options.opacity < 1,
+        opacity: options.opacity,
+        side: THREE7.DoubleSide
+      });
+    default: {
+      return new THREE7.MeshStandardMaterial({ color });
+    }
+  }
+}
+__name(createHandMaterial, "createHandMaterial");
+function applyHandMaterial(root, material) {
+  root.traverse((child) => {
+    const mesh = child;
+    if (!mesh.isMesh) return;
+    mesh.material = material;
+  });
+}
+__name(applyHandMaterial, "applyHandMaterial");
+var SLOTS = [
+  { index: 0, side: "left" },
+  { index: 1, side: "right" }
+];
 var _XRControllerVisualSystem = class _XRControllerVisualSystem {
   constructor(options) {
     this.controllerModelFactory = new XRControllerModelFactory();
     this.handModelFactory = new XRHandModelFactory();
     this.group = new THREE7.Group();
-    this.built = false;
+    this.slots = /* @__PURE__ */ new Map();
     this.attachedTo = null;
-    /** Index → whether we've already attached visuals for that slot. */
-    this.ready = /* @__PURE__ */ new Set();
-    this.rays = [];
-    this.slots = options?.slots ?? 2;
+    /** Last applied preset signature, so materials rebuild only on real change. */
+    this.handStyleSignature = "";
+    this.handMaterial = null;
     this.interactionSystem = options?.interactionSystem ?? null;
     this.group.name = "XRControllerVisuals";
     this.group.userData.ecsPreviewHidden = true;
@@ -6700,39 +6873,111 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
     const renderer = world.getRenderer();
     if (!renderer.xr?.enabled) return;
     this.ensureAttached(world);
-    this.updateRayVisibility();
-    if (this.built) return;
-    for (let index = 0; index < this.slots; index += 1) {
-      if (this.ready.has(index)) continue;
+    this.ensureSlots(world);
+    const interactor = this.resolveInteractor(world);
+    const type = interactor?.interactorType ?? "both";
+    const showControllers = type === "controllers" || type === "both";
+    const showHands = type === "hands" || type === "both";
+    this.syncHandMaterial(interactor);
+    for (const { index, side } of SLOTS) {
+      const visuals = this.slots.get(index);
+      if (!visuals) continue;
+      visuals.controllerModel.visible = showControllers;
+      visuals.handModel.visible = showHands;
+      visuals.ray.visible = this.shouldShowRay(interactor);
+      if (showHands && this.handMaterial) {
+        applyHandMaterial(visuals.handModel, this.handMaterial);
+      }
+      this.syncCustomContent(world, visuals, side);
+    }
+  }
+  /** The scene's interactor config, if one was authored. */
+  resolveInteractor(world) {
+    const entityId = world.query(XRInteractorComponent)[0];
+    if (typeof entityId !== "number") return null;
+    return world.getComponent(entityId, XRInteractorComponent) ?? null;
+  }
+  /**
+   * Re-parent the author's left/right interactor content onto the tracked grip
+   * space so it follows the hand.
+   *
+   * `ObjectManagementSystem` reconciles ECS objects back under their ParentId
+   * every frame, so this re-attach has to be re-asserted — the same coexistence
+   * dance the AR anchor system performs.
+   */
+  syncCustomContent(world, visuals, side) {
+    let content = null;
+    for (const entityId of world.query(
+      XRInteractorSideComponent,
+      Object3DRef
+    )) {
+      const slot = world.getComponent(entityId, XRInteractorSideComponent);
+      if (slot?.side !== side) continue;
+      content = world.getComponent(entityId, Object3DRef)?.object ?? null;
+      break;
+    }
+    if (!content) {
+      visuals.attachedCustom = null;
+      return;
+    }
+    if (content.parent !== visuals.grip) {
+      visuals.grip.add(content);
+    }
+    visuals.attachedCustom = content;
+  }
+  /** Rebuild the hand material only when the authored style actually changes. */
+  syncHandMaterial(interactor) {
+    const preset = interactor?.handPreset ?? "default";
+    const color = interactor?.handColor ?? "#e8b48a";
+    const opacity = interactor?.handOpacity ?? 1;
+    const emissive = interactor?.handEmissiveIntensity ?? 0;
+    const signature = `${preset}:${color}:${opacity}:${emissive}`;
+    if (signature === this.handStyleSignature && this.handMaterial) return;
+    this.handStyleSignature = signature;
+    this.handMaterial?.dispose();
+    this.handMaterial = createHandMaterial(preset, {
+      color,
+      opacity,
+      emissiveIntensity: emissive
+    });
+  }
+  /**
+   * The ray is meaningful only when it points at something. Authors can turn it
+   * off entirely; otherwise it appears on hover/grab so it isn't permanent
+   * clutter implying the whole scene is clickable.
+   */
+  shouldShowRay(interactor) {
+    if (interactor && !interactor.showRay) return false;
+    if (!this.interactionSystem) return true;
+    return this.interactionSystem.getHoveredEntityId() !== null || this.interactionSystem.isGrabbing();
+  }
+  /** Lazily build per-slot visuals; the device reports profiles late. */
+  ensureSlots(world) {
+    const renderer = world.getRenderer();
+    for (const { index } of SLOTS) {
+      if (this.slots.has(index)) continue;
       const controller = renderer.xr.getController(index);
       const grip = renderer.xr.getControllerGrip(index);
       const hand = renderer.xr.getHand(index);
       if (!controller || !grip || !hand) continue;
       const ray = this.createRay();
-      this.rays.push(ray);
       controller.add(ray);
-      this.group.add(controller);
-      grip.add(this.controllerModelFactory.createControllerModel(grip));
-      this.group.add(grip);
-      hand.add(this.handModelFactory.createHandModel(hand, "mesh"));
-      this.group.add(hand);
-      this.ready.add(index);
-    }
-    if (this.ready.size >= this.slots) {
-      this.built = true;
+      const controllerModel = this.controllerModelFactory.createControllerModel(grip);
+      grip.add(controllerModel);
+      const handModel = this.handModelFactory.createHandModel(hand, "mesh");
+      hand.add(handModel);
+      this.group.add(controller, grip, hand);
+      this.slots.set(index, {
+        controller,
+        grip,
+        hand,
+        ray,
+        controllerModel,
+        handModel,
+        attachedCustom: null
+      });
     }
   }
-  /**
-   * Show the aim ray only when it is meaningful: hovering something
-   * interactive, or mid-grab. A permanently-drawn ray is visual noise, and it
-   * implies everything is clickable when most of the scene is not. Teleport
-   * aiming has its own arc, so the straight ray stays hidden for that.
-   */
-  updateRayVisibility() {
-    if (!this.interactionSystem) return;
-    const active = this.interactionSystem.getHoveredEntityId() !== null || this.interactionSystem.isGrabbing();
-    for (const ray of this.rays) ray.visible = active;
-  }
   /**
    * Parent the visuals to the XR rig when there is one, so locomotion moves the
    * hands with the player. Falls back to the scene root.
@@ -6758,7 +7003,7 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
     const line = new THREE7.Line(geometry, material);
     line.name = "XRPointerRay";
     line.renderOrder = 999;
-    line.visible = this.interactionSystem === null;
+    line.visible = false;
     return line;
   }
   dispose() {
@@ -6774,9 +7019,10 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
       }
     });
     this.group.clear();
-    this.rays.length = 0;
-    this.ready.clear();
-    this.built = false;
+    this.slots.clear();
+    this.handMaterial?.dispose();
+    this.handMaterial = null;
+    this.handStyleSignature = "";
     this.attachedTo = null;
   }
 };
@@ -6898,6 +7144,6 @@ var _XRTeleportVisualSystem = class _XRTeleportVisualSystem {
 __name(_XRTeleportVisualSystem, "XRTeleportVisualSystem");
 var XRTeleportVisualSystem = _XRTeleportVisualSystem;
 
-export { ADDED_NODE_MARKER_COMPONENT, ARC_GRAVITY, ARC_MAX_TIME, ARC_SPEED, ARC_STEPS, AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, HYDRATABLE_ENTITY_KINDS, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, NODE_KEY_SEPARATOR, NO_XR_CAPABILITIES, 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, VRTeleportAreaSystem, VideoSystem, XRControllerVisualSystem, XRInputSystem, XRInteractionSystem, XRLocomotionSystem, XRSessionSystem, XRTeleportVisualSystem, arcGroundCrossing, buildComponentValueMaps, buildNodeKeyMapsFromSnapshot, buildNodeMapsFromSnapshot, canonicalizeComponentValue, clearPrefabCache, collectDiffPaths, collectEntitySubtree, collectSnapshotSubtreeIds, computeInstanceOverrides, decanonicalizeComponentValue, despawnPrefab, encodeOverride, findSnapshotRootEntityIds, findTopLevelNestedRegions, groupOverridePaths, hydrateWorldFromSnapshot, hydrateWorldFromSnapshotDetailed, indexSnapshotByEntity, instantiateSubtree, loadPrefab, mergeComponentValue, parseOverride, parsePrefabAsset, prefabFileVersionFor, readXrCapabilities, restoreComponentState, restorePostCreateComponents, sampleTeleportArc, setPrefabAssetUrlResolver, spawnPrefab };
-//# sourceMappingURL=chunk-G53MZVKQ.js.map
-//# sourceMappingURL=chunk-G53MZVKQ.js.map
+export { ADDED_NODE_MARKER_COMPONENT, ARC_GRAVITY, ARC_MAX_TIME, ARC_SPEED, ARC_STEPS, AnimationSystem, AudioSystem, Behaviour, CameraSyncSystem, EnvironmentSyncSystem, HYDRATABLE_ENTITY_KINDS, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MaterialSyncSystem, MeshGeometrySystem, NODE_KEY_SEPARATOR, NO_XR_CAPABILITIES, 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, VRTeleportAreaSystem, VideoSystem, XRControllerVisualSystem, XRInputSystem, XRInteractionSystem, XRLocomotionSystem, XRSessionSystem, XRTeleportVisualSystem, applyHandMaterial, arcGroundCrossing, buildComponentValueMaps, buildNodeKeyMapsFromSnapshot, buildNodeMapsFromSnapshot, canonicalizeComponentValue, clearPrefabCache, collectDiffPaths, collectEntitySubtree, collectSnapshotSubtreeIds, computeInstanceOverrides, createHandMaterial, decanonicalizeComponentValue, despawnPrefab, encodeOverride, findSnapshotRootEntityIds, findTopLevelNestedRegions, groupOverridePaths, hydrateWorldFromSnapshot, hydrateWorldFromSnapshotDetailed, indexSnapshotByEntity, instantiateSubtree, loadPrefab, mergeComponentValue, parseOverride, parsePrefabAsset, prefabFileVersionFor, readXrCapabilities, restoreComponentState, restorePostCreateComponents, sampleTeleportArc, setPrefabAssetUrlResolver, spawnPrefab };
+//# sourceMappingURL=chunk-WRJ2K3LZ.js.map
+//# sourceMappingURL=chunk-WRJ2K3LZ.js.map