@threlte/xr 1.5.4 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/xr",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "author": "Micheal Parks <michealparks1989@gmail.com> (https://parks.lol)",
   "license": "MIT",
   "description": "Tools to more easily create VR and AR experiences with Threlte",
@@ -28,7 +28,8 @@
     "typescript-eslint": "^8.32.0",
     "vite": "^7.1.4",
     "vite-plugin-mkcert": "^1.17.5",
-    "@threlte/core": "8.5.9"
+    "@threlte/extras": "9.15.0",
+    "@threlte/core": "8.5.10"
   },
   "peerDependencies": {
     "svelte": ">=5",

package/dist/internal/setupControllers.d.ts

@@ -1,2 +0,0 @@
-import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js';
-export declare const setupControllers: (factory?: XRControllerModelFactory) => void;

package/dist/internal/setupControllers.js

@@ -1,68 +0,0 @@
-import { XRControllerModelFactory } from 'three/examples/jsm/webxr/XRControllerModelFactory.js';
-import { useThrelte } from '@threlte/core';
-import { onMount } from 'svelte';
-import { useHandTrackingState } from './useHandTrackingState.js';
-import { controllers } from '../hooks/useController.svelte.js';
-import { controllerEvents } from './state.svelte.js';
-export const setupControllers = (factory) => {
-    const { xr } = useThrelte().renderer;
-    const hasHands = useHandTrackingState();
-    const targetRaySpaces = [xr.getController(0), xr.getController(1)];
-    const indexMap = new Map();
-    targetRaySpaces.forEach((targetRay, index) => {
-        const model = (factory ?? new XRControllerModelFactory()).createControllerModel(targetRay);
-        indexMap.set(targetRay, {
-            targetRay,
-            grip: xr.getControllerGrip(index),
-            model
-        });
-    });
-    onMount(() => {
-        const dispatch = (event) => {
-            if (hasHands())
-                return;
-            const { data } = event;
-            controllerEvents[data.handedness]?.[`on${event.type}`]?.(event);
-        };
-        function handleConnected(event) {
-            const { model, targetRay, grip } = indexMap.get(this);
-            const { data: inputSource } = event;
-            controllers[event.data.handedness] = {
-                inputSource,
-                targetRay,
-                grip,
-                model
-            };
-            dispatch(event);
-        }
-        const handleDisconnected = (event) => {
-            dispatch(event);
-            controllers[event.data.handedness] = undefined;
-        };
-        for (const targetRay of targetRaySpaces) {
-            targetRay.addEventListener('connected', handleConnected);
-            targetRay.addEventListener('disconnected', handleDisconnected);
-            targetRay.addEventListener('select', dispatch);
-            targetRay.addEventListener('selectstart', dispatch);
-            targetRay.addEventListener('selectend', dispatch);
-            targetRay.addEventListener('squeeze', dispatch);
-            targetRay.addEventListener('squeezestart', dispatch);
-            targetRay.addEventListener('squeezeend', dispatch);
-        }
-        return () => {
-            for (const targetRay of targetRaySpaces) {
-                targetRay.removeEventListener('connected', handleConnected);
-                targetRay.removeEventListener('disconnected', handleDisconnected);
-                targetRay.removeEventListener('select', dispatch);
-                targetRay.removeEventListener('selectstart', dispatch);
-                targetRay.removeEventListener('selectend', dispatch);
-                targetRay.removeEventListener('squeeze', dispatch);
-                targetRay.removeEventListener('squeezestart', dispatch);
-                targetRay.removeEventListener('squeezeend', dispatch);
-            }
-            controllers.left = undefined;
-            controllers.right = undefined;
-            controllers.none = undefined;
-        };
-    });
-};

package/dist/internal/setupHands.d.ts

@@ -1,2 +0,0 @@
-import { XRHandModelFactory } from 'three/examples/jsm/webxr/XRHandModelFactory.js';
-export declare const setupHands: (factory?: XRHandModelFactory) => void;

package/dist/internal/setupHands.js

@@ -1,67 +0,0 @@
-import { XRHandModelFactory } from 'three/examples/jsm/webxr/XRHandModelFactory.js';
-import { useThrelte } from '@threlte/core';
-import { onMount } from 'svelte';
-import { hands } from '../hooks/useHand.svelte.js';
-import { useHandTrackingState } from './useHandTrackingState.js';
-import { handEvents } from './state.svelte.js';
-export const setupHands = (factory) => {
-    const { xr } = useThrelte().renderer;
-    const hasHands = useHandTrackingState();
-    const handSpaces = [xr.getHand(0), xr.getHand(1)];
-    const map = new Map();
-    handSpaces.forEach((handSpace, index) => {
-        const model = (factory ?? new XRHandModelFactory()).createHandModel(handSpace, 'mesh');
-        map.set(handSpace, {
-            hand: handSpace,
-            targetRay: xr.getController(index),
-            model
-        });
-    });
-    onMount(() => {
-        const dispatch = (event) => {
-            if (!hasHands())
-                return;
-            const handEvent = event;
-            const handedness = 'handedness' in handEvent ? handEvent.handedness : handEvent.data.handedness;
-            handEvents[handedness]?.[`on${event.type}`]?.(event);
-        };
-        function handleConnected(event) {
-            const { model, targetRay } = map.get(this);
-            const { data } = event;
-            const { handedness, hand: inputSource } = data;
-            if (handedness === 'none' || inputSource === undefined) {
-                return;
-            }
-            hands[handedness] = {
-                hand: this,
-                model,
-                inputSource,
-                targetRay
-            };
-            dispatch(event);
-        }
-        const handleDisconnected = (event) => {
-            dispatch(event);
-            const { handedness } = event.data;
-            if (handedness === 'left' || handedness === 'right') {
-                hands[handedness] = undefined;
-            }
-        };
-        for (const handSpace of handSpaces) {
-            handSpace.addEventListener('connected', handleConnected);
-            handSpace.addEventListener('disconnected', handleDisconnected);
-            handSpace.addEventListener('pinchstart', dispatch);
-            handSpace.addEventListener('pinchend', dispatch);
-        }
-        return () => {
-            for (const handSpace of handSpaces) {
-                handSpace.removeEventListener('connected', handleConnected);
-                handSpace.removeEventListener('disconnected', handleDisconnected);
-                handSpace.removeEventListener('pinchstart', dispatch);
-                handSpace.removeEventListener('pinchend', dispatch);
-            }
-            hands.left = undefined;
-            hands.right = undefined;
-        };
-    });
-};

package/dist/internal/useHandTrackingState.d.ts

@@ -1,5 +0,0 @@
-/**
- * There are some cases where we need to know if hand tracking is now active before an input source
- * connection or disconnection event. This is the way to do that.
- */
-export declare const useHandTrackingState: () => () => boolean;

package/dist/internal/useHandTrackingState.js

@@ -1,20 +0,0 @@
-import { useThrelte } from '@threlte/core';
-/**
- * There are some cases where we need to know if hand tracking is now active before an input source
- * connection or disconnection event. This is the way to do that.
- */
-export const useHandTrackingState = () => {
-    const { renderer } = useThrelte();
-    return () => {
-        const sources = renderer.xr.getSession()?.inputSources;
-        if (sources === undefined) {
-            return false;
-        }
-        for (const source of sources) {
-            if (source.hand !== undefined) {
-                return true;
-            }
-        }
-        return false;
-    };
-};