@threlte/xr 1.0.0-next.2 → 1.0.0-next.4

package/dist/plugins/teleportControls/index.js

@@ -1,25 +1,16 @@
-import { Raycaster } from 'three';
 import { currentWritable, watch } from '@threlte/core';
-import { setTeleportContext, getTeleportContext, getHandContext } from './context';
+import { createTeleportContext, useTeleportControls, getHandContext } from './context';
 import { injectTeleportControlsPlugin } from './plugin';
-import { defaultComputeFunction } from './compute';
 import { setHandContext } from './context';
 import { setupTeleportControls } from './setup';
 import { teleportState } from '../../internal/stores';
 let controlsCounter = 0;
 export const teleportControls = (handedness, options) => {
-    if (getTeleportContext() === undefined) {
+    if (useTeleportControls() === undefined) {
         injectTeleportControlsPlugin();
-        setTeleportContext({
-            interactiveObjects: [],
-            surfaces: new Map(),
-            blockers: new Map(),
-            dispatchers: new WeakMap(),
-            raycaster: new Raycaster(),
-            compute: options?.compute ?? defaultComputeFunction
-        });
+        createTeleportContext(options?.compute);
     }
-    const context = getTeleportContext();
+    const context = useTeleportControls();
     if (getHandContext(handedness) === undefined) {
         const enabled = options?.enabled ?? true;
         controlsCounter += enabled ? 1 : -1;

package/dist/plugins/teleportControls/plugin.js

@@ -1,7 +1,7 @@
 import { writable } from 'svelte/store';
 import { watch } from '@threlte/core';
 import { injectPlugin } from '@threlte/core';
-import { useTeleportControls } from './hook';
+import { useTeleportControls } from './context';
 /**
  * Registers T components with "teleportSurface" or "teleportBlocker" attributes.
  */
@@ -24,7 +24,7 @@ export const injectTeleportControlsPlugin = () => {
                     return noop;
                 }
                 else {
-                    addSurface($refStore, props.$$events ?? {});
+                    addSurface($refStore, props);
                     return () => removeSurface($refStore);
                 }
             }

package/dist/plugins/teleportControls/setup.js

@@ -49,7 +49,7 @@ export const setupTeleportControls = (context, handContext, fixedStep = 1 / 40)
         handContext.hovered.set(intersect);
     }, {
         fixedStep,
-        autostart: false
+        autoStart: false
     });
     watch([useXR().isPresenting, handContext.enabled], ([isPresenting, enabled]) => {
         if (isPresenting && enabled) {

package/dist/types.d.ts

@@ -4,16 +4,27 @@ import type { XRControllerModel } from 'three/examples/jsm/webxr/XRControllerMod
 import type { XRHandModel } from 'three/examples/jsm/webxr/XRHandModelFactory.js';
 export type XRSessionEventType = 'sessionstart' | 'sessionend' | 'visibilitychange' | 'frameratechange';
 export type XRControllerEventType = 'select' | 'selectstart' | 'selectend' | 'squeeze' | 'squeezeend' | 'squeezestart' | 'disconnected' | 'connected';
+export type XRControllerEvents = {
+    onconnected?: XRControllerEventCallback<'connected'>;
+    ondisconnected?: XRControllerEventCallback<'disconnected'>;
+    onselect?: XRControllerEventCallback<'select'>;
+    onselectstart?: XRControllerEventCallback<'selectstart'>;
+    onselectend?: XRControllerEventCallback<'selectend'>;
+    onsqueeze?: XRControllerEventCallback<'squeeze'>;
+    onsqueezeend?: XRControllerEventCallback<'squeezeend'>;
+    onsqueezestart?: XRControllerEventCallback<'squeezestart'>;
+};
 export type XRHandEventType = 'pinchstart' | 'pinchend' | 'connected' | 'disconnected';
-export type XRSessionEvent<Type = XRSessionEventType> = Event & {
+export type XRSessionEvent<Type = XRSessionEventType> = (event: Event & {
     type: Type;
     target: XRSession;
-};
+}) => void;
 export type XRControllerEvent<Type = XRControllerEventType> = Event & {
     type: Type;
     target: Group;
     data: XRInputSource;
 };
+export type XRControllerEventCallback<Type = XRControllerEventType> = (event: XRControllerEvent<Type>) => void;
 export type XRController = {
     targetRay: XRTargetRaySpace;
     grip: XRGripSpace;
@@ -35,3 +46,10 @@ export type XRHandEvent<Type = XRHandEventType> = Type extends 'connected' | 'di
     handedness: 'left' | 'right';
     target: null;
 } : never;
+export type XRHandEventCallback<Type> = (event: XRHandEvent<Type>) => void;
+export type XRHandEvents = {
+    onconnected?: XRHandEventCallback<'connected'>;
+    ondisconnected?: XRHandEventCallback<'disconnected'>;
+    onpinchstart?: XRHandEventCallback<'pinchstart'>;
+    onpinchend?: XRHandEventCallback<'pinchend'>;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/xr",
-  "version": "1.0.0-next.2",
+  "version": "1.0.0-next.4",
   "author": "Micheal Parks <michealparks1989@gmail.com> (https://parks.lol)",
   "license": "MIT",
   "devDependencies": {
@@ -23,11 +23,11 @@
     "tslib": "^2.6.2",
     "vite": "^5.2.8",
     "vite-plugin-mkcert": "^1.17.5",
-    "@threlte/core": "8.0.0-next.3"
+    "@threlte/core": "8.0.0-next.6"
   },
   "peerDependencies": {
     "svelte": ">=5",
-    "three": ">=0.152"
+    "three": ">=0.155"
   },
   "type": "module",
   "exports": {

package/dist/plugins/teleportControls/hook.d.ts

@@ -1,7 +0,0 @@
-import type { Mesh } from 'three';
-export declare const useTeleportControls: () => {
-    addSurface: (mesh: Mesh, events: Record<string, (arg: unknown) => void>) => void;
-    removeSurface: (mesh: Mesh) => void;
-    addBlocker: (mesh: Mesh) => void;
-    removeBlocker: (mesh: Mesh) => void;
-};

package/dist/plugins/teleportControls/hook.js

@@ -1,38 +0,0 @@
-import { getTeleportContext } from './context';
-export const useTeleportControls = () => {
-    const context = getTeleportContext();
-    const addSurface = (mesh, events) => {
-        // check if the object is already in the list
-        if (context.interactiveObjects.indexOf(mesh) > -1) {
-            return;
-        }
-        context.interactiveObjects.push(mesh);
-        context.surfaces.set(mesh.uuid, mesh);
-        context.dispatchers.set(mesh, events);
-    };
-    const removeSurface = (mesh) => {
-        const index = context.interactiveObjects.indexOf(mesh);
-        context.interactiveObjects.splice(index, 1);
-        context.surfaces.delete(mesh.uuid);
-        context.dispatchers.delete(mesh);
-    };
-    const addBlocker = (mesh) => {
-        // check if the object is already in the list
-        if (context.interactiveObjects.indexOf(mesh) > -1) {
-            return;
-        }
-        context.interactiveObjects.push(mesh);
-        context.blockers.set(mesh.uuid, mesh);
-    };
-    const removeBlocker = (mesh) => {
-        const index = context.interactiveObjects.indexOf(mesh);
-        context.interactiveObjects.splice(index, 1);
-        context.blockers.delete(mesh.uuid);
-    };
-    return {
-        addSurface,
-        removeSurface,
-        addBlocker,
-        removeBlocker
-    };
-};