@relu-interactives/spatial-ecs 0.3.12 → 0.3.14

package/dist/{chunk-LCJ6IH2O.js → chunk-XHMOFI3Q.js}

@@ -1,5 +1,5 @@
-import { resolveDracoDecoderPath, applyTransform, SHARED_MODEL_RESOURCE_FLAG } from './chunk-7ZIN6TGT.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-OMDYLFTN.js';
+import { resolveDracoDecoderPath, applyTransform, SHARED_MODEL_RESOURCE_FLAG } from './chunk-PNQ7HDQC.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,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;
@@ -3939,6 +3945,7 @@ function hydrateWorldFromSnapshotDetailed(snapshot, world, objectManagementSyste
         isDefault: true
       };
     }
+    payload.skipDefaultChildren = true;
     const createdEntityId = objectManagementSystem.createNow(kind, world, payload);
     idMap.set(sourceEntityId, createdEntityId);
   }
@@ -7115,8 +7122,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 },
@@ -7197,6 +7204,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()) {
@@ -7268,6 +7294,42 @@ function arcGroundCrossing(points, groundY) {
 }
 __name(arcGroundCrossing, "arcGroundCrossing");
 
+// core/xr/teleportAimGate.ts
+var _TeleportAimGate = class _TeleportAimGate {
+  constructor() {
+    this.aiming = /* @__PURE__ */ new WeakSet();
+  }
+  /**
+   * Feed one frame for one source.
+   *
+   * @returns whether the teleport should commit this frame.
+   */
+  update(source, aiming, releasing) {
+    const hadAim = this.aiming.has(source);
+    if (aiming) this.aiming.add(source);
+    if (!releasing) return false;
+    this.aiming.delete(source);
+    return hadAim;
+  }
+  /** True if this source currently has an aim engaged. */
+  isAiming(source) {
+    return this.aiming.has(source);
+  }
+  /**
+   * Drop a source's aim without committing.
+   *
+   * Called when a hand starts interacting, so the release that ends the grab
+   * cannot cash in an aim engaged before it.
+   *
+   * @returns whether an aim was actually discarded.
+   */
+  cancel(source) {
+    return this.aiming.delete(source);
+  }
+};
+__name(_TeleportAimGate, "TeleportAimGate");
+var TeleportAimGate = _TeleportAimGate;
+
 // core/systems/XRLocomotionSystem.ts
 var UP = new THREE19.Vector3(0, 1, 0);
 var AXIS_DEADZONE = 0.5;
@@ -7285,10 +7347,24 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
     this.aimValid = false;
     /** Sources currently aiming via thumbstick (hysteresis, so it doesn't chatter). */
     this.stickAiming = /* @__PURE__ */ new WeakSet();
+    /** Gates teleport commits on a prior aim. See {@link TeleportAimGate}. */
+    this.teleportAim = new TeleportAimGate();
     /** 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;
@@ -7407,9 +7483,18 @@ var _XRLocomotionSystem = class _XRLocomotionSystem {
     const targets = this.collectTeleportTargets(world);
     for (const input of inputs) {
       const source = input;
+      if (input.handedness !== "none" && this.interactionSystem?.isHandBusy(world, input.handedness)) {
+        if (this.teleportAim.cancel(source)) {
+          this.aimCurve = [];
+          this.landingPoint = null;
+          this.aimValid = false;
+        }
+        continue;
+      }
       const stick = this.readStickAim(input, source);
       const aiming = input.select || stick.aiming;
-      const commit = input.selectEnd || stick.released;
+      const releasing = input.selectEnd || stick.released;
+      const commit = this.teleportAim.update(source, aiming, releasing);
       if (!aiming && !commit) continue;
       const points = sampleTeleportArc(
         input.rayOrigin,
@@ -7882,9 +7967,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) {
@@ -8772,6 +8860,6 @@ var _XRHoverVisualSystem = class _XRHoverVisualSystem {
 __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-LCJ6IH2O.js.map
-//# sourceMappingURL=chunk-LCJ6IH2O.js.map
+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, TeleportAimGate, 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-XHMOFI3Q.js.map
+//# sourceMappingURL=chunk-XHMOFI3Q.js.map