@relu-interactives/spatial-ecs 0.3.11 → 0.3.13

package/dist/{chunk-KLU2M43M.js → chunk-N2634D4W.js}

@@ -1,5 +1,5 @@
-import { resolveDracoDecoderPath, applyTransform, SHARED_MODEL_RESOURCE_FLAG } from './chunk-Y3AC3VZ2.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, createAttachPoint, XRHandPoseComponent, createHandPoseEntry, XRInteractorComponent, XRInteractorSideComponent, InstanceSlotComponent, Name, ImageComponent, SpriteComponent, VideoComponent, AudioComponent, ImageTarget, Selectable, PrefabNode, PrefabInstance, handPoseDefinitionFor, getHandPosePreset } from './chunk-TXEGYR76.js';
+import { resolveDracoDecoderPath, applyTransform, SHARED_MODEL_RESOURCE_FLAG } from './chunk-CHZQ4NXP.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, createAttachPoint, XRHandPoseComponent, createHandPoseEntry, XRInteractorComponent, XRInteractorSideComponent, InstanceSlotComponent, Name, ImageComponent, SpriteComponent, VideoComponent, AudioComponent, ImageTarget, Selectable, PrefabNode, PrefabInstance, handPoseDefinitionFor, getHandPosePreset } from './chunk-3LDQ4GVZ.js';
 import { __name } from './chunk-OY7ZODZP.js';
 import * as THREE19 from 'three';
 import { DRACOLoader } from 'three/examples/jsm/loaders/DRACOLoader.js';
@@ -3051,11 +3051,15 @@ function restorePostCreateComponents(world, objectManagementSystem, targetEntity
           )
         );
       }
-      if (typeof sourceInteractable.throwOnRelease === "boolean") {
-        interactable.throwOnRelease = sourceInteractable.throwOnRelease;
+      if (typeof sourceInteractable.applyVelocityOnRelease === "boolean") {
+        interactable.applyVelocityOnRelease = sourceInteractable.applyVelocityOnRelease;
+      } else if (typeof sourceInteractable.throwOnRelease === "boolean") {
+        interactable.applyVelocityOnRelease = sourceInteractable.throwOnRelease;
       }
-      if (typeof sourceInteractable.throwStrength === "number") {
-        interactable.throwStrength = sourceInteractable.throwStrength;
+      if (typeof sourceInteractable.velocityScale === "number") {
+        interactable.velocityScale = sourceInteractable.velocityScale;
+      } else if (typeof sourceInteractable.throwStrength === "number") {
+        interactable.velocityScale = sourceInteractable.throwStrength;
       }
       const grabPos = asRecord(sourceInteractable.grabOffsetPosition);
       if (grabPos) {
@@ -3131,8 +3135,16 @@ function restorePostCreateComponents(world, objectManagementSystem, targetEntity
       if (typeof sourceInteractor.handEmissiveIntensity === "number") {
         interactor.handEmissiveIntensity = sourceInteractor.handEmissiveIntensity;
       }
-      if (typeof sourceInteractor.showRay === "boolean") {
-        interactor.showRay = sourceInteractor.showRay;
+      if (typeof sourceInteractor.rayVisibility === "string") {
+        interactor.rayVisibility = sourceInteractor.rayVisibility;
+      } else if (typeof sourceInteractor.showRay === "boolean") {
+        interactor.rayVisibility = sourceInteractor.showRay ? "interacting" : "never";
+      }
+      if (typeof sourceInteractor.rayColor === "string") {
+        interactor.rayColor = sourceInteractor.rayColor;
+      }
+      if (typeof sourceInteractor.rayThickness === "number") {
+        interactor.rayThickness = sourceInteractor.rayThickness;
       }
     }
   }
@@ -7109,8 +7121,8 @@ var _XRInteractionSystem = class _XRInteractionSystem {
     if (held.restoreBodyType !== null && physics) {
       physics.values.rigidbody.type = held.restoreBodyType;
       const dynamic = held.restoreBodyType === "dynamic";
-      if (dynamic && interactable?.throwOnRelease) {
-        const velocity = held.tracker.computeVelocity(this.elapsed).multiplyScalar(interactable.throwStrength);
+      if (dynamic && interactable?.applyVelocityOnRelease) {
+        const velocity = held.tracker.computeVelocity(this.elapsed).multiplyScalar(interactable.velocityScale);
         const spin = held.angularVelocity;
         setPhysicsLiveRef(physics, "pendingVelocity", {
           linear: { x: velocity.x, y: velocity.y, z: velocity.z },
@@ -7191,6 +7203,32 @@ var _XRInteractionSystem = class _XRInteractionSystem {
   isGrabbing() {
     return this.grabs.size > 0;
   }
+  /**
+   * Whether this hand's primary action is committed to interaction.
+   *
+   * True while the hand holds something, and also while it merely HOVERS a
+   * grabbable — because the pinch that is about to grab must not be read as a
+   * teleport by the locomotion system. Without the hover half, the first pinch
+   * of a grab teleports the player, and so does the pinch that takes an object
+   * from the other hand.
+   */
+  isHandBusy(world, handedness) {
+    if (this.isGrabbingWith(handedness)) return true;
+    const hover = this.getHoverFor(handedness);
+    if (!hover) return false;
+    const interactable = world.getComponent(
+      hover.entityId,
+      XRInteractableComponent
+    );
+    return Boolean(interactable?.enabled && interactable.grabbable);
+  }
+  /** True when THIS hand is holding something. */
+  isGrabbingWith(handedness) {
+    for (const input of this.grabs.keys()) {
+      if (input.handedness === handedness) return true;
+    }
+    return false;
+  }
   /**
    * How an entity is currently held.
    *
@@ -7274,8 +7312,20 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
     this.stickAiming = /* @__PURE__ */ new WeakSet();
     /** True once we've tried to self-heal camera parenting for this session. */
     this.parentingChecked = false;
+    /**
+     * Optional; when wired, hands busy grabbing are excluded from teleport.
+     *
+     * On hand tracking the SAME pinch drives both grabbing and teleport aiming,
+     * so without this a user who picks something up is teleported at the same
+     * moment.
+     */
+    this.interactionSystem = null;
     this.inputSystem = inputSystem;
   }
+  /** Wire the interaction system so grabs suppress teleport on that hand. */
+  setInteractionSystem(interactionSystem) {
+    this.interactionSystem = interactionSystem;
+  }
   update(world, deltaTime) {
     this.aimCurve = [];
     this.landingPoint = null;
@@ -7393,6 +7443,9 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
   applyTeleport(world, transform, inputs) {
     const targets = this.collectTeleportTargets(world);
     for (const input of inputs) {
+      if (input.handedness !== "none" && this.interactionSystem?.isHandBusy(world, input.handedness)) {
+        continue;
+      }
       const source = input;
       const stick = this.readStickAim(input, source);
       const aiming = input.select || stick.aiming;
@@ -7750,6 +7803,7 @@ __name(applyHandMaterial, "applyHandMaterial");
 
 // core/systems/XRControllerVisualSystem.ts
 var RAY_LENGTH = 5;
+var RAY_RADIUS = 3e-3;
 var SLOTS = [
   { index: 0, side: "left" },
   { index: 1, side: "right" }
@@ -7759,6 +7813,8 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
     this.controllerModelFactory = new XRControllerModelFactory();
     this.handModelFactory = new XRHandModelFactory();
     this.group = new THREE19.Group();
+    /** Reused so a per-frame colour compare allocates nothing. */
+    this.rayColorScratch = new THREE19.Color();
     this.slots = /* @__PURE__ */ new Map();
     this.attachedTo = null;
     /** Last applied preset signature, so materials rebuild only on real change. */
@@ -7787,8 +7843,9 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
       const hasHand = liveKind === null || liveKind === "hand";
       visuals.controllerModel.visible = showControllers && hasController;
       visuals.handModel.visible = showHands && hasHand;
-      visuals.ray.visible = this.shouldShowRay(interactor);
+      visuals.ray.visible = this.shouldShowRay(interactor, side);
       this.fitRayToHover(visuals.ray, side);
+      this.applyRayStyle(visuals.ray, interactor);
       if (showHands && this.handMaterial) {
         applyHandMaterial(visuals.handModel, this.handMaterial);
       }
@@ -7864,10 +7921,26 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
    * 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;
+  shouldShowRay(interactor, side) {
+    const visibility = interactor?.rayVisibility ?? "interacting";
+    if (visibility === "never") return false;
+    if (visibility === "always") return true;
     if (!this.interactionSystem) return true;
-    return this.interactionSystem.getHoveredEntityId() !== null || this.interactionSystem.isGrabbing();
+    if (this.interactionSystem.isGrabbingWith(side)) return false;
+    return this.interactionSystem.getHoverFor(side) !== null;
+  }
+  /** Push the author's ray colour and thickness onto the mesh. */
+  applyRayStyle(ray, interactor) {
+    if (!interactor) return;
+    const material = ray.material;
+    if (material?.color && !material.color.equals(this.rayColorScratch.set(interactor.rayColor))) {
+      material.color.copy(this.rayColorScratch);
+    }
+    const radius = Math.max(5e-4, interactor.rayThickness / 2) / RAY_RADIUS;
+    if (ray.scale.x !== radius) {
+      ray.scale.x = radius;
+      ray.scale.y = radius;
+    }
   }
   /**
    * Stop the ray at whatever it is pointing at.
@@ -7879,7 +7952,7 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
   fitRayToHover(ray, side) {
     const hover = this.interactionSystem?.getHoverFor(side) ?? null;
     const length = hover && Number.isFinite(hover.distance) && hover.distance > 0 ? Math.min(hover.distance, RAY_LENGTH) : RAY_LENGTH;
-    ray.scale.z = length / RAY_LENGTH;
+    ray.scale.z = length;
   }
   /** Lazily build per-slot visuals; the device reports profiles late. */
   ensureSlots(world) {
@@ -7919,22 +7992,32 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
     target.add(this.group);
     this.attachedTo = target;
   }
+  /**
+   * The pointer ray.
+   *
+   * A cylinder rather than a `THREE.Line`, because WebGL ignores `linewidth` —
+   * every line renders one pixel wide regardless, which is nearly invisible on a
+   * headset. A thin mesh is the only way to get a ray with real thickness
+   * without pulling in a line-rendering extension.
+   */
   createRay() {
-    const geometry = new THREE19.BufferGeometry().setFromPoints([
-      new THREE19.Vector3(0, 0, 0),
-      new THREE19.Vector3(0, 0, -RAY_LENGTH)
-    ]);
-    const material = new THREE19.LineBasicMaterial({
+    const geometry = new THREE19.CylinderGeometry(RAY_RADIUS, RAY_RADIUS, 1, 8, 1);
+    geometry.rotateX(-Math.PI / 2);
+    geometry.translate(0, 0, -0.5);
+    const material = new THREE19.MeshBasicMaterial({
       color: "#4da3ff",
       transparent: true,
-      opacity: 0.6,
-      depthTest: false
+      opacity: 0.75,
+      depthTest: false,
+      depthWrite: false
     });
-    const line = new THREE19.Line(geometry, material);
-    line.name = "XRPointerRay";
-    line.renderOrder = 999;
-    line.visible = false;
-    return line;
+    const mesh = new THREE19.Mesh(geometry, material);
+    mesh.name = "XRPointerRay";
+    mesh.renderOrder = 999;
+    mesh.visible = false;
+    mesh.raycast = () => {
+    };
+    return mesh;
   }
   dispose() {
     this.group.removeFromParent();
@@ -8733,5 +8816,5 @@ __name(_XRHoverVisualSystem, "XRHoverVisualSystem");
 var XRHoverVisualSystem = _XRHoverVisualSystem;
 
 export { ADDED_NODE_MARKER_COMPONENT, ARC_GRAVITY, ARC_MAX_TIME, ARC_SPEED, ARC_STEPS, AnimationSystem, AudioSystem, Behaviour, CURLED_COS, CameraSyncSystem, DEFAULT_ENTER_CONFIDENCE, DEFAULT_EXIT_CONFIDENCE, DEFAULT_LOST_GRACE_SECONDS, DEFAULT_MIN_HOLD_SECONDS, EnvironmentSyncSystem, FALLBACK_HAND_SCALE, HYDRATABLE_ENTITY_KINDS, HandPoseTracker, InputSystem, InstancedMeshSystem, KeyboardKeys, LightSyncSystem, MATCH_FALLOFF, MAX_PLAUSIBLE_SPEED, MAX_SAMPLE_AGE_SECONDS, MaterialSyncSystem, MeshGeometrySystem, NODE_KEY_SEPARATOR, NO_XR_CAPABILITIES, OVERRIDE_DIFF_EXCLUDED_COMPONENTS, OVERRIDE_ROOT_EXCLUDED_COMPONENTS, ObjectVisibilitySystem, PINCH_FINGERS, PREFAB_FILE_VERSION, PREFAB_FILE_VERSION_NESTED, PhysicsSyncSystem, PostprocessingSyncSystem, RenderSystem, SCRIPT_OBJECT_ROOT_FLAG, STRAIGHT_COS, ScriptBehaviourSystem, ScriptObject, ScriptObjectSystem, ThrowVelocityTracker, TransformSyncSystem, VELOCITY_SAMPLES, VRTeleportAreaSystem, VideoSystem, XRControllerVisualSystem, XRHandPoseSystem, XRHoverVisualSystem, XRInputSystem, XRInteractionSystem, XRLocomotionSystem, XRSessionSystem, XRTeleportVisualSystem, XR_FINGERS, XR_HOVER_SHELL_FLAG, angularVelocityFrom, applyHandMaterial, arcGroundCrossing, buildComponentValueMaps, buildNodeKeyMapsFromSnapshot, buildNodeMapsFromSnapshot, canonicalizeComponentValue, clearPrefabCache, collectDiffPaths, collectEntitySubtree, collectSnapshotSubtreeIds, computeFingerCurl, computeHandShape, computeInstanceOverrides, computePalmPose, computePalmWidth, computePinch, computeSpread, createHandMaterial, decanonicalizeComponentValue, despawnPrefab, encodeOverride, estimateHandScale, findSnapshotRootEntityIds, findTopLevelNestedRegions, groupOverridePaths, hydrateWorldFromSnapshot, hydrateWorldFromSnapshotDetailed, indexSnapshotByEntity, instantiateSubtree, loadPrefab, matchHandPose, mergeComponentValue, parseOverride, parsePrefabAsset, prefabFileVersionFor, readXrCapabilities, restoreComponentState, restorePostCreateComponents, sampleTeleportArc, setPrefabAssetUrlResolver, spawnPrefab };
-//# sourceMappingURL=chunk-KLU2M43M.js.map
-//# sourceMappingURL=chunk-KLU2M43M.js.map
+//# sourceMappingURL=chunk-N2634D4W.js.map
+//# sourceMappingURL=chunk-N2634D4W.js.map