@relu-interactives/spatial-ecs 0.3.2 → 0.3.5

package/dist/systems/index.cjs

@@ -2082,7 +2082,8 @@ var _VRTeleportAreaComponent = class _VRTeleportAreaComponent extends Component
   constructor(options) {
     super();
     this.enabled = options?.enabled ?? true;
-    this.shape = options?.shape ?? "plane";
+    const shape = options?.shape;
+    this.shape = shape === "cylinder" ? "circle" : options?.shape ?? "plane";
     this.width = options?.width ?? 10;
     this.depth = options?.depth ?? 10;
   }
@@ -4903,6 +4904,15 @@ function buildComponentValueMaps(snapshot) {
       snapshot.components,
       "ScriptObjectComponent"
     ),
+    xrRigValues: readByComponent(snapshot.components, "XRRigComponent"),
+    vrTeleportAreaValues: readByComponent(
+      snapshot.components,
+      "VRTeleportAreaComponent"
+    ),
+    xrInteractableValues: readByComponent(
+      snapshot.components,
+      "XRInteractableComponent"
+    ),
     instancedMeshValues: readByComponent(snapshot.components, "InstancedMeshComponent"),
     instanceSlotValues: readByComponent(snapshot.components, "InstanceSlotComponent"),
     prefabNodeValues: readByComponent(snapshot.components, "PrefabNode"),
@@ -5028,6 +5038,67 @@ function restorePostCreateComponents(world, objectManagementSystem, targetEntity
       soc.data = remapEntityRefsInScriptData(data, idMap);
     }
   }
+  {
+    const sourceXrRig = asRecord3(values.xrRigValues.get(sourceEntityId));
+    const rig = world.getComponent(targetEntityId, XRRigComponent);
+    if (sourceXrRig && rig) {
+      if (typeof sourceXrRig.locomotion === "string") {
+        rig.locomotion = sourceXrRig.locomotion;
+      }
+      if (typeof sourceXrRig.moveSpeed === "number") {
+        rig.moveSpeed = sourceXrRig.moveSpeed;
+      }
+      if (typeof sourceXrRig.snapTurn === "boolean") {
+        rig.snapTurn = sourceXrRig.snapTurn;
+      }
+      if (typeof sourceXrRig.snapTurnDegrees === "number") {
+        rig.snapTurnDegrees = sourceXrRig.snapTurnDegrees;
+      }
+      if (typeof sourceXrRig.fallbackEyeHeight === "number") {
+        rig.fallbackEyeHeight = sourceXrRig.fallbackEyeHeight;
+      }
+    }
+  }
+  {
+    const sourceArea = asRecord3(values.vrTeleportAreaValues.get(sourceEntityId));
+    const area = world.getComponent(targetEntityId, VRTeleportAreaComponent);
+    if (sourceArea && area) {
+      if (typeof sourceArea.enabled === "boolean") {
+        area.enabled = sourceArea.enabled;
+      }
+      if (typeof sourceArea.shape === "string") {
+        area.shape = sourceArea.shape === "cylinder" ? "circle" : sourceArea.shape;
+      }
+      if (typeof sourceArea.width === "number") area.width = sourceArea.width;
+      if (typeof sourceArea.depth === "number") area.depth = sourceArea.depth;
+    }
+  }
+  {
+    const sourceInteractable = asRecord3(
+      values.xrInteractableValues.get(sourceEntityId)
+    );
+    const interactable = world.getComponent(
+      targetEntityId,
+      XRInteractableComponent
+    );
+    if (sourceInteractable && interactable) {
+      if (typeof sourceInteractable.enabled === "boolean") {
+        interactable.enabled = sourceInteractable.enabled;
+      }
+      if (typeof sourceInteractable.grabbable === "boolean") {
+        interactable.grabbable = sourceInteractable.grabbable;
+      }
+      if (typeof sourceInteractable.pointable === "boolean") {
+        interactable.pointable = sourceInteractable.pointable;
+      }
+      if (typeof sourceInteractable.grabMode === "string") {
+        interactable.grabMode = sourceInteractable.grabMode;
+      }
+      if (typeof sourceInteractable.highlightOnHover === "boolean") {
+        interactable.highlightOnHover = sourceInteractable.highlightOnHover;
+      }
+    }
+  }
   {
     const imComponent = world.getComponent(targetEntityId, InstancedMeshComponent);
     if (imComponent && imComponent.instanceEntityIds.length > 0) {
@@ -7824,6 +7895,32 @@ var _XRInteractionSystem = class _XRInteractionSystem {
 };
 __name(_XRInteractionSystem, "XRInteractionSystem");
 var XRInteractionSystem = _XRInteractionSystem;
+var ARC_GRAVITY = 9.8;
+var ARC_SPEED = 7;
+var ARC_STEPS = 24;
+var ARC_MAX_TIME = 2;
+function sampleTeleportArc(origin, direction, out = [], options) {
+  const speed = options?.speed ?? ARC_SPEED;
+  const gravity = options?.gravity ?? ARC_GRAVITY;
+  const steps = Math.max(2, options?.steps ?? ARC_STEPS);
+  const maxTime = options?.maxTime ?? ARC_MAX_TIME;
+  out.length = 0;
+  const velocity = direction.clone().normalize().multiplyScalar(speed);
+  for (let i = 0; i < steps; i += 1) {
+    const t = i / (steps - 1) * maxTime;
+    out.push(
+      new THREE14__namespace.Vector3(
+        origin.x + velocity.x * t,
+        origin.y + velocity.y * t - 0.5 * gravity * t * t,
+        origin.z + velocity.z * t
+      )
+    );
+  }
+  return out;
+}
+__name(sampleTeleportArc, "sampleTeleportArc");
+
+// core/systems/XRLocomotionSystem.ts
 var UP = new THREE14__namespace.Vector3(0, 1, 0);
 var AXIS_DEADZONE = 0.5;
 var _XRLocomotionSystem = class _XRLocomotionSystem {
@@ -7831,13 +7928,26 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
     this.raycaster = new THREE14__namespace.Raycaster();
     /** Per-source latch so one stick push yields exactly one snap turn. */
     this.turnLatched = /* @__PURE__ */ new WeakSet();
-    /** Where the pointer currently lands, for the consumer to draw a marker. */
-    this.teleportPoint = null;
+    /** Reused arc buffer — aiming runs every frame. */
+    this.arcPoints = [];
+    /** Curve up to the landing point, for the visual system. Empty when not aiming. */
+    this.aimCurve = [];
+    this.landingPoint = null;
+    /** True once we've tried to self-heal camera parenting for this session. */
+    this.parentingChecked = false;
     this.inputSystem = inputSystem;
   }
   update(world, deltaTime) {
-    this.teleportPoint = null;
-    if (!world.isXrPresenting()) return;
+    this.aimCurve = [];
+    this.landingPoint = null;
+    if (!world.isXrPresenting()) {
+      this.parentingChecked = false;
+      return;
+    }
+    if (!this.parentingChecked) {
+      this.parentingChecked = true;
+      this.ensureCameraUnderRig(world);
+    }
     const rigEntityId = world.query(XRRigComponent, TransformComponent)[0];
     if (typeof rigEntityId !== "number") return;
     const rig = world.getComponent(rigEntityId, XRRigComponent);
@@ -7854,9 +7964,37 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
       this.applySmoothMove(world, rig, rigTransform, inputs, deltaTime);
     }
   }
+  /**
+   * Guarantee the render camera is a CHILD of the rig.
+   *
+   * Locomotion moves the rig, and three composes the head pose against
+   * `camera.parent` — so if the camera sits at the scene root instead, moving
+   * the rig does nothing at all and the player is frozen in place. Scenes
+   * authored before the rig existed (or with the camera re-parented by hand)
+   * would otherwise silently fail to move, which is exactly the symptom that is
+   * hardest to diagnose from inside a headset. Repairing it via `ParentId` lets
+   * `ObjectManagementSystem` reconcile the scene graph normally.
+   */
+  ensureCameraUnderRig(world) {
+    const rigEntityId = world.query(XRRigComponent)[0];
+    if (typeof rigEntityId !== "number") return;
+    const activeCamera = world.getCamera();
+    for (const entityId of world.query(CameraComponent, Object3DRef)) {
+      if (world.getComponent(entityId, Object3DRef)?.object !== activeCamera) {
+        continue;
+      }
+      const parent = world.getComponent(entityId, ParentId);
+      if (parent) {
+        if (parent.value !== rigEntityId) parent.value = rigEntityId;
+      } else {
+        world.addComponent(entityId, new ParentId(rigEntityId));
+      }
+      return;
+    }
+  }
   /**
    * Snap turning, not smooth turning — rotating the view continuously is the
-   * single biggest cause of VR nausea, so the comfort-safe option is the one
+   * single biggest cause of VR nausea, so the comfort-safe option is what's
    * wired to the stick.
    */
   applySnapTurn(rig, transform, inputs) {
@@ -7870,8 +8008,7 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
       }
       if (this.turnLatched.has(source)) continue;
       this.turnLatched.add(source);
-      const step = THREE14__namespace.MathUtils.degToRad(rig.snapTurnDegrees);
-      transform.rotation.y -= Math.sign(x) * step;
+      transform.rotation.y -= Math.sign(x) * THREE14__namespace.MathUtils.degToRad(rig.snapTurnDegrees);
     }
   }
   applySmoothMove(world, rig, transform, inputs, deltaTime) {
@@ -7896,16 +8033,41 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
     const targets = this.collectTeleportTargets(world);
     if (targets.length === 0) return;
     for (const input of inputs) {
-      this.raycaster.set(input.rayOrigin, input.rayDirection);
-      const hit = this.raycaster.intersectObjects(targets, true)[0];
+      if (!input.select && !input.selectEnd) continue;
+      const points = sampleTeleportArc(
+        input.rayOrigin,
+        input.rayDirection,
+        this.arcPoints
+      );
+      const hit = this.raycastArc(points, targets);
       if (!hit) continue;
-      this.teleportPoint = hit.point.clone();
+      this.landingPoint = hit.point;
+      this.aimCurve = points.slice(0, hit.segmentIndex + 1).concat(hit.point);
       if (input.selectEnd) {
         transform.position.x = hit.point.x;
         transform.position.y = hit.point.y;
         transform.position.z = hit.point.z;
+        this.aimCurve = [];
+        this.landingPoint = null;
+      }
+    }
+  }
+  /** Walk the arc segment-by-segment, returning the first surface hit. */
+  raycastArc(points, targets) {
+    for (let i = 1; i < points.length; i += 1) {
+      const from = points[i - 1];
+      const to = points[i];
+      const delta = new THREE14__namespace.Vector3().subVectors(to, from);
+      const distance = delta.length();
+      if (distance < 1e-6) continue;
+      this.raycaster.set(from, delta.divideScalar(distance));
+      this.raycaster.far = distance;
+      const hit = this.raycaster.intersectObjects(targets, true)[0];
+      if (hit) {
+        return { point: hit.point.clone(), segmentIndex: i - 1 };
       }
     }
+    return null;
   }
   collectTeleportTargets(world) {
     const objects = [];
@@ -7918,12 +8080,13 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
     }
     return objects;
   }
-  /**
-   * Where the teleport pointer currently lands this frame, or null.
-   * Consumers use this to render an aim marker.
-   */
-  getTeleportPoint() {
-    return this.teleportPoint;
+  /** Arc points up to the landing spot this frame; empty when not aiming. */
+  getAimCurve() {
+    return this.aimCurve;
+  }
+  /** Where the arc currently lands, or null when not aiming at a valid area. */
+  getLandingPoint() {
+    return this.landingPoint;
   }
 };
 __name(_XRLocomotionSystem, "XRLocomotionSystem");
@@ -8046,7 +8209,7 @@ var _XRSessionSystem = class _XRSessionSystem {
 __name(_XRSessionSystem, "XRSessionSystem");
 var XRSessionSystem = _XRSessionSystem;
 function buildGeometry2(area) {
-  if (area.shape === "cylinder") {
+  if (area.shape === "circle") {
     const radius = Math.max(5e-3, area.width / 2);
     return new THREE14__namespace.CircleGeometry(radius, 48);
   }
@@ -8085,7 +8248,7 @@ var _VRTeleportAreaSystem = class _VRTeleportAreaSystem {
 __name(_VRTeleportAreaSystem, "VRTeleportAreaSystem");
 var VRTeleportAreaSystem = _VRTeleportAreaSystem;
 var _XRControllerVisualSystem = class _XRControllerVisualSystem {
-  constructor(slots = 2) {
+  constructor(options) {
     this.controllerModelFactory = new XRControllerModelFactory_js.XRControllerModelFactory();
     this.handModelFactory = new XRHandModelFactory_js.XRHandModelFactory();
     this.group = new THREE14__namespace.Group();
@@ -8093,7 +8256,9 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
     this.attachedTo = null;
     /** Index → whether we've already attached visuals for that slot. */
     this.ready = /* @__PURE__ */ new Set();
-    this.slots = slots;
+    this.rays = [];
+    this.slots = options?.slots ?? 2;
+    this.interactionSystem = options?.interactionSystem ?? null;
     this.group.name = "XRControllerVisuals";
     this.group.userData.ecsPreviewHidden = true;
   }
@@ -8101,6 +8266,7 @@ 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;
@@ -8108,7 +8274,9 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
       const grip = renderer.xr.getControllerGrip(index);
       const hand = renderer.xr.getHand(index);
       if (!controller || !grip || !hand) continue;
-      controller.add(this.createRay());
+      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);
@@ -8120,6 +8288,17 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
       this.built = true;
     }
   }
+  /**
+   * 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.
@@ -8145,6 +8324,7 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
     const line = new THREE14__namespace.Line(geometry, material);
     line.name = "XRPointerRay";
     line.renderOrder = 999;
+    line.visible = this.interactionSystem === null;
     return line;
   }
   dispose() {
@@ -8160,6 +8340,7 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
       }
     });
     this.group.clear();
+    this.rays.length = 0;
     this.ready.clear();
     this.built = false;
     this.attachedTo = null;
@@ -8167,6 +8348,121 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
 };
 __name(_XRControllerVisualSystem, "XRControllerVisualSystem");
 var XRControllerVisualSystem = _XRControllerVisualSystem;
+var MARKER_RADIUS = 0.28;
+var ACCENT = new THREE14__namespace.Color("#4da3ff");
+var _XRTeleportVisualSystem = class _XRTeleportVisualSystem {
+  constructor(locomotionSystem) {
+    this.group = new THREE14__namespace.Group();
+    this.arcGeometry = new THREE14__namespace.BufferGeometry();
+    this.marker = new THREE14__namespace.Group();
+    this.attached = false;
+    this.locomotionSystem = locomotionSystem;
+    this.group.name = "XRTeleportVisuals";
+    this.group.userData.ecsPreviewHidden = true;
+    const arcMaterial = new THREE14__namespace.LineBasicMaterial({
+      vertexColors: true,
+      transparent: true,
+      depthTest: false
+    });
+    this.arc = new THREE14__namespace.Line(this.arcGeometry, arcMaterial);
+    this.arc.frustumCulled = false;
+    this.arc.renderOrder = 998;
+    this.group.add(this.arc);
+    this.marker.add(this.createRing(), this.createDot());
+    this.marker.renderOrder = 999;
+    this.group.add(this.marker);
+    this.setVisible(false);
+  }
+  update(world) {
+    if (!this.attached) {
+      world.getScene().add(this.group);
+      this.attached = true;
+    }
+    const curve = this.locomotionSystem.getAimCurve();
+    const landing = this.locomotionSystem.getLandingPoint();
+    if (!landing || curve.length < 2) {
+      this.setVisible(false);
+      return;
+    }
+    this.updateArcGeometry(curve);
+    this.marker.position.copy(landing);
+    this.marker.position.y += 0.01;
+    this.setVisible(true);
+  }
+  updateArcGeometry(curve) {
+    const count = curve.length;
+    const positions = new Float32Array(count * 3);
+    const colors = new Float32Array(count * 3);
+    for (let i = 0; i < count; i += 1) {
+      const point = curve[i];
+      positions[i * 3] = point.x;
+      positions[i * 3 + 1] = point.y;
+      positions[i * 3 + 2] = point.z;
+      const t = count > 1 ? i / (count - 1) : 0;
+      const fade = 1 - t * 0.75;
+      colors[i * 3] = ACCENT.r * fade;
+      colors[i * 3 + 1] = ACCENT.g * fade;
+      colors[i * 3 + 2] = ACCENT.b * fade;
+    }
+    this.arcGeometry.setAttribute(
+      "position",
+      new THREE14__namespace.BufferAttribute(positions, 3)
+    );
+    this.arcGeometry.setAttribute("color", new THREE14__namespace.BufferAttribute(colors, 3));
+    this.arcGeometry.computeBoundingSphere();
+  }
+  createRing() {
+    const geometry = new THREE14__namespace.RingGeometry(
+      MARKER_RADIUS * 0.72,
+      MARKER_RADIUS,
+      48
+    );
+    geometry.rotateX(-Math.PI / 2);
+    return new THREE14__namespace.Mesh(
+      geometry,
+      new THREE14__namespace.MeshBasicMaterial({
+        color: ACCENT,
+        transparent: true,
+        opacity: 0.9,
+        side: THREE14__namespace.DoubleSide,
+        depthTest: false
+      })
+    );
+  }
+  createDot() {
+    const geometry = new THREE14__namespace.CircleGeometry(MARKER_RADIUS * 0.16, 24);
+    geometry.rotateX(-Math.PI / 2);
+    return new THREE14__namespace.Mesh(
+      geometry,
+      new THREE14__namespace.MeshBasicMaterial({
+        color: ACCENT,
+        transparent: true,
+        opacity: 0.55,
+        side: THREE14__namespace.DoubleSide,
+        depthTest: false
+      })
+    );
+  }
+  setVisible(visible) {
+    this.group.visible = visible;
+  }
+  dispose() {
+    this.group.removeFromParent();
+    this.group.traverse((child) => {
+      const mesh = child;
+      mesh.geometry?.dispose?.();
+      const material = mesh.material;
+      if (Array.isArray(material)) {
+        for (const entry of material) entry.dispose?.();
+      } else {
+        material?.dispose?.();
+      }
+    });
+    this.attached = false;
+  }
+};
+__name(_XRTeleportVisualSystem, "XRTeleportVisualSystem");
+var XRTeleportVisualSystem = _XRTeleportVisualSystem;
 
 exports.AnimationSystem = AnimationSystem;
 exports.AudioSystem = AudioSystem;
@@ -8194,5 +8490,6 @@ exports.XRInputSystem = XRInputSystem;
 exports.XRInteractionSystem = XRInteractionSystem;
 exports.XRLocomotionSystem = XRLocomotionSystem;
 exports.XRSessionSystem = XRSessionSystem;
+exports.XRTeleportVisualSystem = XRTeleportVisualSystem;
 //# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map