@relu-interactives/spatial-ecs 0.3.12 → 0.3.13

package/dist/factories/index.d.cts

@@ -1,4 +1,4 @@
-import { A as AnimationComponent, b as AudioComponent, c as CameraComponentOptions, C as CameraComponent, T as RigidbodyState, g as ColliderState, P as PhysicsComponent, o as EntityType, I as ImageComponent, q as ImageTargetAnchor, p as ImageTarget, L as LightComponent, M as MaterialComponent, B as MeshComponent, F as MeshGeometryComponent, J as ModelComponent, N as Name, O as Object3DRef, W as ScriptEntry, V as ScriptComponent, Y as ScriptObjectComponentInput, X as ScriptObjectComponent, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, w as InstancedMeshKind, G as MeshGeometryParameters, v as InstancedMeshComponent, t as InstanceSlotComponent, a6 as VideoComponent, af as XRRigComponent, a4 as VRTeleportAreaComponent, a8 as XRHandPoseComponent, aa as XRInteractableComponent, ac as XRInteractorComponent, ae as XRInteractorSideComponent } from '../XRHandPose-DawOR0uR.cjs';
+import { A as AnimationComponent, b as AudioComponent, c as CameraComponentOptions, C as CameraComponent, T as RigidbodyState, g as ColliderState, P as PhysicsComponent, o as EntityType, I as ImageComponent, q as ImageTargetAnchor, p as ImageTarget, L as LightComponent, M as MaterialComponent, B as MeshComponent, F as MeshGeometryComponent, J as ModelComponent, N as Name, O as Object3DRef, W as ScriptEntry, V as ScriptComponent, Y as ScriptObjectComponentInput, X as ScriptObjectComponent, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, w as InstancedMeshKind, G as MeshGeometryParameters, v as InstancedMeshComponent, t as InstanceSlotComponent, a6 as VideoComponent, af as XRRigComponent, a4 as VRTeleportAreaComponent, a8 as XRHandPoseComponent, aa as XRInteractableComponent, ac as XRInteractorComponent, ae as XRInteractorSideComponent } from '../XRHandPose-9mVZVU3K.cjs';
 import { l as World, g as EnvironmentState, E as Environment, P as ParentId, i as PostprocessingState, h as Postprocessing, T as TransformComponent, O as ObjectManagementSystem } from '../System-31wk-A0g.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, T as RigidbodyState, g as ColliderState, P as PhysicsComponent, o as EntityType, I as ImageComponent, q as ImageTargetAnchor, p as ImageTarget, L as LightComponent, M as MaterialComponent, B as MeshComponent, F as MeshGeometryComponent, J as ModelComponent, N as Name, O as Object3DRef, W as ScriptEntry, V as ScriptComponent, Y as ScriptObjectComponentInput, X as ScriptObjectComponent, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, w as InstancedMeshKind, G as MeshGeometryParameters, v as InstancedMeshComponent, t as InstanceSlotComponent, a6 as VideoComponent, af as XRRigComponent, a4 as VRTeleportAreaComponent, a8 as XRHandPoseComponent, aa as XRInteractableComponent, ac as XRInteractorComponent, ae as XRInteractorSideComponent } from '../XRHandPose-DhAd9Qi6.js';
+import { A as AnimationComponent, b as AudioComponent, c as CameraComponentOptions, C as CameraComponent, T as RigidbodyState, g as ColliderState, P as PhysicsComponent, o as EntityType, I as ImageComponent, q as ImageTargetAnchor, p as ImageTarget, L as LightComponent, M as MaterialComponent, B as MeshComponent, F as MeshGeometryComponent, J as ModelComponent, N as Name, O as Object3DRef, W as ScriptEntry, V as ScriptComponent, Y as ScriptObjectComponentInput, X as ScriptObjectComponent, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, w as InstancedMeshKind, G as MeshGeometryParameters, v as InstancedMeshComponent, t as InstanceSlotComponent, a6 as VideoComponent, af as XRRigComponent, a4 as VRTeleportAreaComponent, a8 as XRHandPoseComponent, aa as XRInteractableComponent, ac as XRInteractorComponent, ae as XRInteractorSideComponent } from '../XRHandPose-To0260Lc.js';
 import { l as World, g as EnvironmentState, E as Environment, P as ParentId, i as PostprocessingState, h as Postprocessing, T as TransformComponent, O as ObjectManagementSystem } from '../System-31wk-A0g.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, createInstanceSlotComponent, createInstancedMeshComponent, createLightComponent, createMaterialComponent, createMeshComponent, createMeshGeometryComponent, createModelComponent, createNameComponent, createObject3DRefComponent, createParentIdComponent, createPhysicsComponent, createPostprocessingComponent, createScriptComponent, createScriptObjectComponent, createSelectableComponent, createSelectionTransformStateComponent, createSpriteComponent, createTransformComponent, createVRTeleportAreaComponent, createVideoComponent, createXRHandPoseComponent, createXRInteractableComponent, createXRInteractorComponent, createXRInteractorSideComponent, createXRRigComponent, registerDefaultComponentFactories, registerDefaultFactories } from '../chunk-ID7U4FER.js';
-import '../chunk-7ZIN6TGT.js';
-import '../chunk-OMDYLFTN.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, createVRTeleportAreaComponent, createVideoComponent, createXRHandPoseComponent, createXRInteractableComponent, createXRInteractorComponent, createXRInteractorSideComponent, createXRRigComponent, registerDefaultComponentFactories, registerDefaultFactories } from '../chunk-JHFBEMXM.js';
+import '../chunk-CHZQ4NXP.js';
+import '../chunk-3LDQ4GVZ.js';
 import '../chunk-OY7ZODZP.js';
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map

package/dist/{index-Xm3im4Pt.d.cts → index-BPKDsVF7.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_INSTANCED_MESH_PARAMETERS, j as DEFAULT_INSTANCE_TRANSFORM, k as DEFAULT_MESH_GEOMETRY_PARAMETERS, l as DEFAULT_PHYSICS_STATE, m as DEFAULT_POSE_CURLS, n as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, o as EntityType, I as ImageComponent, p as ImageTarget, q as ImageTargetAnchor, r as ImageTargetAnchorOptions, s as ImageTargetReference, t as InstanceSlotComponent, u as InstanceTransform, v as InstancedMeshComponent, w as InstancedMeshKind, L as LightComponent, x as LightValueState, M as MaterialComponent, y as MaterialTypeValue, z as MaterialValueState, B as MeshComponent, F as MeshGeometryComponent, G as MeshGeometryParameters, H as MeshGeometryParametersByKind, J as ModelComponent, N as Name, O as Object3DRef, P as PhysicsComponent, K as PhysicsState, Q as PlaneMeshParameters, R as RadiusHeightMeshParameters, S as RadiusMeshParameters, T as RigidbodyState, U as RigidbodyType, V as ScriptComponent, W as ScriptEntry, X as ScriptObjectComponent, Y as ScriptObjectComponentInput, Z as ScriptObjectRuntimeState, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, a1 as TextureFilteringValue, a2 as TransformModeValue, a3 as TransformSpaceValue, a4 as VRTeleportAreaComponent, a5 as VRTeleportAreaOptions, a6 as VideoComponent, a7 as VrTeleportShape, a8 as XRHandPoseComponent, a9 as XRHandPoseOptions, aa as XRInteractableComponent, ab as XRInteractableOptions, ac as XRInteractorComponent, ad as XRInteractorOptions, ae as XRInteractorSideComponent, af as XRRigComponent, ag as XRRigOptions, ah as XrAttachPoint, ai as XrDistanceGrabBehavior, aj as XrGrabGesture, ak as XrGrabHands, al as XrGrabReach, am as XrHandPoseEntry, an as XrHandPreset, ao as XrInteractorSide, ap as XrInteractorType, aq as XrLocomotionMode, ar as XrTrackingOrigin, as as XrTwoHandRotation, at as createAttachPoint, au as createHandPoseEntry, av as defaultMaterialValue, aw as handPoseDefinitionFor, ax as normalizePhysicsState, ay as setPhysicsLiveRef } from './XRHandPose-DawOR0uR.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_INSTANCED_MESH_PARAMETERS, j as DEFAULT_INSTANCE_TRANSFORM, k as DEFAULT_MESH_GEOMETRY_PARAMETERS, l as DEFAULT_PHYSICS_STATE, m as DEFAULT_POSE_CURLS, n as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, o as EntityType, I as ImageComponent, p as ImageTarget, q as ImageTargetAnchor, r as ImageTargetAnchorOptions, s as ImageTargetReference, t as InstanceSlotComponent, u as InstanceTransform, v as InstancedMeshComponent, w as InstancedMeshKind, L as LightComponent, x as LightValueState, M as MaterialComponent, y as MaterialTypeValue, z as MaterialValueState, B as MeshComponent, F as MeshGeometryComponent, G as MeshGeometryParameters, H as MeshGeometryParametersByKind, J as ModelComponent, N as Name, O as Object3DRef, P as PhysicsComponent, K as PhysicsState, Q as PlaneMeshParameters, R as RadiusHeightMeshParameters, S as RadiusMeshParameters, T as RigidbodyState, U as RigidbodyType, V as ScriptComponent, W as ScriptEntry, X as ScriptObjectComponent, Y as ScriptObjectComponentInput, Z as ScriptObjectRuntimeState, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, a1 as TextureFilteringValue, a2 as TransformModeValue, a3 as TransformSpaceValue, a4 as VRTeleportAreaComponent, a5 as VRTeleportAreaOptions, a6 as VideoComponent, a7 as VrTeleportShape, a8 as XRHandPoseComponent, a9 as XRHandPoseOptions, aa as XRInteractableComponent, ab as XRInteractableOptions, ac as XRInteractorComponent, ad as XRInteractorOptions, ae as XRInteractorSideComponent, af as XRRigComponent, ag as XRRigOptions, ah as XrAttachPoint, ai as XrDistanceGrabBehavior, aj as XrGrabGesture, ak as XrGrabHands, al as XrGrabReach, am as XrHandPoseEntry, an as XrHandPreset, ao as XrInteractorSide, ap as XrInteractorType, aq as XrLocomotionMode, ar as XrTrackingOrigin, as as XrTwoHandRotation, at as createAttachPoint, au as createHandPoseEntry, av as defaultMaterialValue, aw as handPoseDefinitionFor, ax as normalizePhysicsState, ay as setPhysicsLiveRef } from './XRHandPose-9mVZVU3K.cjs';
 import { C as Component, D as DEFAULT_ENVIRONMENT_STATE, a as DEFAULT_POSTPROCESSING_STATE, E as Environment, b as EnvironmentFogState, c as EnvironmentFogType, d as EnvironmentGradientEffect, e as EnvironmentSkyboxState, f as EnvironmentSkyboxType, g as EnvironmentState, P as ParentId, h as Postprocessing, i as PostprocessingState, T as TransformComponent, j as TransformData, V as Vec3 } from './System-31wk-A0g.cjs';
 
 /**

package/dist/{index-M0I5B3JA.d.ts → index-BbXqWyEZ.d.ts}

@@ -500,6 +500,16 @@ declare class XRInteractionSystem implements EcsSystem {
     getHeldEntityIds(): Set<number>;
     /** True when any source is holding something. */
     isGrabbing(): boolean;
+    /**
+     * 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: World, handedness: XrInputState["handedness"]): boolean;
     /** True when THIS hand is holding something. */
     isGrabbingWith(handedness: XrInputState["handedness"]): boolean;
     /**
@@ -537,6 +547,16 @@ declare class XRLocomotionSystem implements EcsSystem {
     private readonly stickAiming;
     /** True once we've tried to self-heal camera parenting for this session. */
     private parentingChecked;
+    /**
+     * 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.
+     */
+    private interactionSystem;
+    /** Wire the interaction system so grabs suppress teleport on that hand. */
+    setInteractionSystem(interactionSystem: XRInteractionSystem | null): void;
     constructor(inputSystem: XRInputSystem);
     update(world: World, deltaTime: number): void;
     /**

package/dist/{index-B49322Q3.d.ts → index-Wzs-8FYa.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_INSTANCED_MESH_PARAMETERS, j as DEFAULT_INSTANCE_TRANSFORM, k as DEFAULT_MESH_GEOMETRY_PARAMETERS, l as DEFAULT_PHYSICS_STATE, m as DEFAULT_POSE_CURLS, n as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, o as EntityType, I as ImageComponent, p as ImageTarget, q as ImageTargetAnchor, r as ImageTargetAnchorOptions, s as ImageTargetReference, t as InstanceSlotComponent, u as InstanceTransform, v as InstancedMeshComponent, w as InstancedMeshKind, L as LightComponent, x as LightValueState, M as MaterialComponent, y as MaterialTypeValue, z as MaterialValueState, B as MeshComponent, F as MeshGeometryComponent, G as MeshGeometryParameters, H as MeshGeometryParametersByKind, J as ModelComponent, N as Name, O as Object3DRef, P as PhysicsComponent, K as PhysicsState, Q as PlaneMeshParameters, R as RadiusHeightMeshParameters, S as RadiusMeshParameters, T as RigidbodyState, U as RigidbodyType, V as ScriptComponent, W as ScriptEntry, X as ScriptObjectComponent, Y as ScriptObjectComponentInput, Z as ScriptObjectRuntimeState, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, a1 as TextureFilteringValue, a2 as TransformModeValue, a3 as TransformSpaceValue, a4 as VRTeleportAreaComponent, a5 as VRTeleportAreaOptions, a6 as VideoComponent, a7 as VrTeleportShape, a8 as XRHandPoseComponent, a9 as XRHandPoseOptions, aa as XRInteractableComponent, ab as XRInteractableOptions, ac as XRInteractorComponent, ad as XRInteractorOptions, ae as XRInteractorSideComponent, af as XRRigComponent, ag as XRRigOptions, ah as XrAttachPoint, ai as XrDistanceGrabBehavior, aj as XrGrabGesture, ak as XrGrabHands, al as XrGrabReach, am as XrHandPoseEntry, an as XrHandPreset, ao as XrInteractorSide, ap as XrInteractorType, aq as XrLocomotionMode, ar as XrTrackingOrigin, as as XrTwoHandRotation, at as createAttachPoint, au as createHandPoseEntry, av as defaultMaterialValue, aw as handPoseDefinitionFor, ax as normalizePhysicsState, ay as setPhysicsLiveRef } from './XRHandPose-DhAd9Qi6.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_INSTANCED_MESH_PARAMETERS, j as DEFAULT_INSTANCE_TRANSFORM, k as DEFAULT_MESH_GEOMETRY_PARAMETERS, l as DEFAULT_PHYSICS_STATE, m as DEFAULT_POSE_CURLS, n as DEFAULT_RIGIDBODY_STATE, E as EditableMeshObjectKind, o as EntityType, I as ImageComponent, p as ImageTarget, q as ImageTargetAnchor, r as ImageTargetAnchorOptions, s as ImageTargetReference, t as InstanceSlotComponent, u as InstanceTransform, v as InstancedMeshComponent, w as InstancedMeshKind, L as LightComponent, x as LightValueState, M as MaterialComponent, y as MaterialTypeValue, z as MaterialValueState, B as MeshComponent, F as MeshGeometryComponent, G as MeshGeometryParameters, H as MeshGeometryParametersByKind, J as ModelComponent, N as Name, O as Object3DRef, P as PhysicsComponent, K as PhysicsState, Q as PlaneMeshParameters, R as RadiusHeightMeshParameters, S as RadiusMeshParameters, T as RigidbodyState, U as RigidbodyType, V as ScriptComponent, W as ScriptEntry, X as ScriptObjectComponent, Y as ScriptObjectComponentInput, Z as ScriptObjectRuntimeState, _ as Selectable, $ as SelectionTransformState, a0 as SpriteComponent, a1 as TextureFilteringValue, a2 as TransformModeValue, a3 as TransformSpaceValue, a4 as VRTeleportAreaComponent, a5 as VRTeleportAreaOptions, a6 as VideoComponent, a7 as VrTeleportShape, a8 as XRHandPoseComponent, a9 as XRHandPoseOptions, aa as XRInteractableComponent, ab as XRInteractableOptions, ac as XRInteractorComponent, ad as XRInteractorOptions, ae as XRInteractorSideComponent, af as XRRigComponent, ag as XRRigOptions, ah as XrAttachPoint, ai as XrDistanceGrabBehavior, aj as XrGrabGesture, ak as XrGrabHands, al as XrGrabReach, am as XrHandPoseEntry, an as XrHandPreset, ao as XrInteractorSide, ap as XrInteractorType, aq as XrLocomotionMode, ar as XrTrackingOrigin, as as XrTwoHandRotation, at as createAttachPoint, au as createHandPoseEntry, av as defaultMaterialValue, aw as handPoseDefinitionFor, ax as normalizePhysicsState, ay as setPhysicsLiveRef } from './XRHandPose-To0260Lc.js';
 import { C as Component, D as DEFAULT_ENVIRONMENT_STATE, a as DEFAULT_POSTPROCESSING_STATE, E as Environment, b as EnvironmentFogState, c as EnvironmentFogType, d as EnvironmentGradientEffect, e as EnvironmentSkyboxState, f as EnvironmentSkyboxType, g as EnvironmentState, P as ParentId, h as Postprocessing, i as PostprocessingState, T as TransformComponent, j as TransformData, V as Vec3 } from './System-31wk-A0g.js';
 
 /**

package/dist/{index-DJ9bn9SF.d.cts → index-lqw8BM6E.d.cts}

@@ -500,6 +500,16 @@ declare class XRInteractionSystem implements EcsSystem {
     getHeldEntityIds(): Set<number>;
     /** True when any source is holding something. */
     isGrabbing(): boolean;
+    /**
+     * 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: World, handedness: XrInputState["handedness"]): boolean;
     /** True when THIS hand is holding something. */
     isGrabbingWith(handedness: XrInputState["handedness"]): boolean;
     /**
@@ -537,6 +547,16 @@ declare class XRLocomotionSystem implements EcsSystem {
     private readonly stickAiming;
     /** True once we've tried to self-heal camera parenting for this session. */
     private parentingChecked;
+    /**
+     * 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.
+     */
+    private interactionSystem;
+    /** Wire the interaction system so grabs suppress teleport on that hand. */
+    setInteractionSystem(interactionSystem: XRInteractionSystem | null): void;
     constructor(inputSystem: XRInputSystem);
     update(world: World, deltaTime: number): void;
     /**

package/dist/index.cjs

@@ -2852,8 +2852,8 @@ var _XRInteractableComponent = class _XRInteractableComponent extends Component
     this.attachPoints = (options?.attachPoints ?? []).map(
       (point) => createAttachPoint(point)
     );
-    this.throwOnRelease = options?.throwOnRelease ?? true;
-    this.throwStrength = options?.throwStrength ?? 1;
+    this.applyVelocityOnRelease = options?.applyVelocityOnRelease ?? true;
+    this.velocityScale = options?.velocityScale ?? 1;
     this.hoverBehavior = options?.hoverBehavior ?? "color";
     this.hoverColor = options?.hoverColor ?? "#4da3ff";
     this.hoverScale = options?.hoverScale ?? 1.06;
@@ -2890,7 +2890,7 @@ var _XRInteractorComponent = class _XRInteractorComponent extends Component {
     this.handColor = options?.handColor ?? "#e8b48a";
     this.handOpacity = options?.handOpacity ?? 1;
     this.handEmissiveIntensity = options?.handEmissiveIntensity ?? 0;
-    this.showRay = options?.showRay ?? true;
+    this.rayVisibility = options?.rayVisibility ?? "interacting";
     this.rayColor = options?.rayColor ?? "#4da3ff";
     this.rayThickness = options?.rayThickness ?? 6e-3;
   }
@@ -4905,11 +4905,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 = asRecord3(sourceInteractable.grabOffsetPosition);
       if (grabPos) {
@@ -4985,8 +4989,10 @@ 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;
@@ -11635,8 +11641,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 },
@@ -11717,6 +11723,25 @@ 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()) {
@@ -11807,8 +11832,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;
@@ -11926,6 +11963,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;
@@ -12402,9 +12442,12 @@ var _XRControllerVisualSystem = class _XRControllerVisualSystem {
    * clutter implying the whole scene is clickable.
    */
   shouldShowRay(interactor, side) {
-    if (interactor && !interactor.showRay) return false;
+    const visibility = interactor?.rayVisibility ?? "interacting";
+    if (visibility === "never") return false;
+    if (visibility === "always") return true;
     if (!this.interactionSystem) return true;
-    return this.interactionSystem.getHoverFor(side) !== null || this.interactionSystem.isGrabbingWith(side);
+    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) {