@threlte/xr 1.0.0-next.10 → 1.0.0-next.11

package/dist/plugins/pointerControls/index.js

@@ -1,7 +1,7 @@
 import { Raycaster, Vector3 } from 'three';
 import { currentWritable, watch } from '@threlte/core';
 import { defaultComputeFunction } from './compute';
-import { injectPointerControlsPlugin } from './plugin';
+import { injectPointerControlsPlugin } from './plugin.svelte';
 import { setupPointerControls } from './setup';
 import { getControlsContext, getHandContext, setControlsContext, setHandContext, setInternalContext } from './context';
 import { pointerState } from '../../internal/stores';

package/dist/plugins/pointerControls/plugin.svelte.js

@@ -0,0 +1,22 @@
+import { injectPlugin, isInstanceOf, observe } from '@threlte/core';
+import { usePointerControls } from './hook';
+import { events } from './types';
+export const injectPointerControlsPlugin = () => {
+    injectPlugin('threlte-pointer-controls', (args) => {
+        if (!isInstanceOf(args.ref, 'Object3D'))
+            return;
+        const hasEventHandlers = Object.entries(args.props).some(([key, value]) => {
+            return value !== undefined && events.includes(key);
+        });
+        if (!hasEventHandlers)
+            return;
+        const { addInteractiveObject, removeInteractiveObject } = usePointerControls();
+        observe.pre(() => [args.ref], ([ref]) => {
+            addInteractiveObject(ref, args.props);
+            return () => removeInteractiveObject(ref);
+        });
+        return {
+            pluginProps: events
+        };
+    });
+};

package/dist/plugins/teleportControls/index.js

@@ -1,6 +1,6 @@
 import { currentWritable, watch } from '@threlte/core';
 import { createTeleportContext, useTeleportControls, getHandContext } from './context';
-import { injectTeleportControlsPlugin } from './plugin';
+import { injectTeleportControlsPlugin } from './plugin.svelte';
 import { setHandContext } from './context';
 import { setupTeleportControls } from './setup';
 import { teleportState } from '../../internal/stores';

package/dist/plugins/teleportControls/plugin.svelte.js

@@ -0,0 +1,31 @@
+import { injectPlugin, isInstanceOf, observe } from '@threlte/core';
+import { useTeleportControls } from './context';
+/**
+ * Registers T components with "teleportSurface" or "teleportBlocker" attributes.
+ */
+export const injectTeleportControlsPlugin = () => {
+    injectPlugin('threlte-teleport-controls', (args) => {
+        if (!isInstanceOf(args.ref, 'Mesh'))
+            return;
+        const isSurface = $derived('teleportSurface' in args.props && !!args.props.teleportSurface);
+        const isBlocker = $derived('teleportBlocker' in args.props && !!args.props.teleportBlocker);
+        const surfaceRef = $derived(isSurface ? args.ref : undefined);
+        const blockerRef = $derived(isBlocker ? args.ref : undefined);
+        if (!isSurface && !isBlocker)
+            return;
+        const { addBlocker, addSurface, removeBlocker, removeSurface } = useTeleportControls();
+        observe.pre(() => [surfaceRef, blockerRef], ([surfaceRef, blockerRef]) => {
+            if (surfaceRef) {
+                addSurface(surfaceRef, args.props);
+                return removeSurface(surfaceRef);
+            }
+            else if (blockerRef) {
+                addBlocker(blockerRef);
+                return removeBlocker(blockerRef);
+            }
+        });
+        return {
+            pluginProps: ['teleportSurface', 'teleportBlocker']
+        };
+    });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/xr",
-  "version": "1.0.0-next.10",
+  "version": "1.0.0-next.11",
   "author": "Micheal Parks <michealparks1989@gmail.com> (https://parks.lol)",
   "license": "MIT",
   "description": "Tools to more easily create VR and AR experiences with Threlte",
@@ -9,22 +9,22 @@
     "@sveltejs/kit": "^2.7.2",
     "@sveltejs/package": "^2.3.1",
     "@sveltejs/vite-plugin-svelte": "^3.1.0",
+    "@types/three": "^0.169.0",
     "@typescript-eslint/eslint-plugin": "^7.6.0",
     "@typescript-eslint/parser": "^7.6.0",
+    "autoprefixer": "^10.4.19",
     "eslint": "^9.0.0",
     "eslint-plugin-svelte": "^2.36.0",
-    "svelte-check": "^3.6.9",
-    "typescript": "^5.4.5",
-    "@types/three": "^0.169.0",
-    "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
     "publint": "^0.2.7",
     "svelte": "^5.0.5",
+    "svelte-check": "^3.6.9",
     "three": "^0.169.0",
     "tslib": "^2.6.2",
+    "typescript": "^5.4.5",
     "vite": "^5.2.8",
     "vite-plugin-mkcert": "^1.17.5",
-    "@threlte/core": "8.0.0-next.21"
+    "@threlte/core": "8.0.0-next.22"
   },
   "peerDependencies": {
     "svelte": ">=5",

package/dist/plugins/pointerControls/plugin.js

@@ -1,26 +0,0 @@
-import { injectPlugin, watch } from '@threlte/core';
-import { writable } from 'svelte/store';
-import { usePointerControls } from './hook';
-import { events } from './types';
-export const injectPointerControlsPlugin = () => {
-    injectPlugin('threlte-pointer-controls', ({ ref, props }) => {
-        if (!ref.isObject3D)
-            return;
-        const { addInteractiveObject, removeInteractiveObject } = usePointerControls();
-        const refStore = writable(ref);
-        watch(refStore, ($refStore) => {
-            const hasEventHandlers = Object.entries(props).some(([key, value]) => {
-                return value !== undefined && events.includes(key);
-            });
-            if (!hasEventHandlers)
-                return;
-            addInteractiveObject($refStore, props);
-            return () => removeInteractiveObject($refStore);
-        });
-        return {
-            onRefChange(ref) {
-                refStore.set(ref);
-            }
-        };
-    });
-};

package/dist/plugins/teleportControls/plugin.js

@@ -1,54 +0,0 @@
-import { writable } from 'svelte/store';
-import { isInstanceOf, watch } from '@threlte/core';
-import { injectPlugin } from '@threlte/core';
-import { useTeleportControls } from './context';
-/**
- * Registers T components with "teleportSurface" or "teleportBlocker" attributes.
- */
-export const injectTeleportControlsPlugin = () => {
-    const noop = () => { };
-    injectPlugin('threlte-teleport-controls', ({ ref, props }) => {
-        if (!isInstanceOf(ref, 'Mesh'))
-            return;
-        const isSurface = 'teleportSurface' in props;
-        const isBlocker = 'teleportBlocker' in props;
-        if (!isSurface && !isBlocker)
-            return;
-        const { addBlocker, addSurface, removeBlocker, removeSurface } = useTeleportControls();
-        const refStore = writable(ref);
-        const propsStore = writable(props);
-        watch([refStore, propsStore], ([$refStore, $propsStore]) => {
-            if (isSurface) {
-                if ($propsStore.teleportSurface === false) {
-                    removeSurface($refStore);
-                    return noop;
-                }
-                else {
-                    addSurface($refStore, props);
-                    return () => removeSurface($refStore);
-                }
-            }
-            else if (isBlocker) {
-                if (props.teleportBlocker === false) {
-                    removeBlocker($refStore);
-                    return noop;
-                }
-                else {
-                    addBlocker($refStore);
-                    return () => removeBlocker($refStore);
-                }
-            }
-            else {
-                return noop;
-            }
-        });
-        return {
-            onRefChange(ref) {
-                refStore.set(ref);
-            },
-            onPropsChange(props) {
-                propsStore.set(props);
-            }
-        };
-    });
-};