@threlte/xr 1.5.0 → 1.5.1

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

@@ -11,6 +11,17 @@ export const injectPointerControlsPlugin = () => {
         if (!hasEventHandlers)
             return;
         const { addInteractiveObject, removeInteractiveObject } = usePointerControls();
+        $effect.pre(() => {
+            const ref = args.ref;
+            const props = args.props;
+            const hasEventHandlers = events.some((eventName) => typeof props[eventName] === 'function');
+            if (!hasEventHandlers)
+                return;
+            addInteractiveObject(ref, props);
+            return () => {
+                removeInteractiveObject(ref);
+            };
+        });
         observe.pre(() => [args.ref], ([ref]) => {
             addInteractiveObject(ref, args.props);
             return () => removeInteractiveObject(ref);

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

@@ -6,7 +6,7 @@ import { useHand } from '../../hooks/useHand.svelte.js';
 import { useFixed } from '../../internal/useFixed.js';
 import { isPresenting, pointerIntersection } from '../../internal/state.svelte.js';
 const getIntersectionId = (intersection) => {
-    return `${(intersection.eventObject || intersection.object).uuid}/${intersection.index}${intersection.instanceId ?? ''}`;
+    return `${(intersection.eventObject || intersection.object).uuid}|${intersection.index}|${intersection.instanceId}`;
 };
 const EPSILON = 0.0001;
 export const setupPointerControls = (context, handContext, fixedStep = 1 / 40) => {
@@ -37,31 +37,49 @@ export const setupPointerControls = (context, handContext, fixedStep = 1 / 40) =
         handleEvent('onclick', event);
     };
     function cancelPointer(intersections) {
-        for (const [, hoveredObj] of handContext.hovered) {
-            // When no objects were hit or the the hovered object wasn't found underneath the cursor
+        if (handContext.hovered.size === 0)
+            return;
+        const toRemove = [];
+        for (const [id, hoveredObj] of handContext.hovered) {
+            // When no objects were hit or the hovered object wasn't found underneath the cursor
             // we call pointerout and delete the object from the hovered elements map
             if (intersections.length === 0 ||
                 !intersections.some((hit) => hit.object === hoveredObj.object &&
                     hit.index === hoveredObj.index &&
                     hit.instanceId === hoveredObj.instanceId)) {
-                const { eventObject } = hoveredObj;
-                handContext.hovered.delete(getIntersectionId(hoveredObj));
-                const events = dispatchers.get(eventObject);
-                if (events !== undefined) {
-                    // Clear out intersects, they are outdated by now
-                    const data = { ...hoveredObj, intersections };
-                    events.onpointerout?.(data);
-                    events.onpointerleave?.(data);
-                    // Deal with cancelation
-                    handContext.pointerOverTarget.set(false);
-                    cancelPointer([]);
-                }
+                toRemove.push([id, hoveredObj]);
             }
         }
+        for (const [id, hoveredObj] of toRemove) {
+            const { eventObject } = hoveredObj;
+            handContext.hovered.delete(id);
+            const events = dispatchers.get(eventObject);
+            if (events !== undefined) {
+                // Clear out intersects, they are outdated by now
+                const data = { ...hoveredObj, intersections };
+                events.onpointerout?.(data);
+                events.onpointerleave?.(data);
+            }
+        }
+        if (handContext.hovered.size === 0) {
+            handContext.pointerOverTarget.set(false);
+        }
     }
     const getHits = () => {
         const intersections = [];
-        const hits = context.raycaster.intersectObjects(context.interactiveObjects, true);
+        const rawHits = context.raycaster.intersectObjects(context.interactiveObjects, true);
+        const seen = new Set();
+        const hits = rawHits.filter((hit) => {
+            const key = hit.instanceId !== undefined
+                ? `${hit.object.uuid}|${hit.instanceId}`
+                : hit.index !== undefined
+                    ? `${hit.object.uuid}|${hit.index}`
+                    : hit.object.uuid;
+            if (seen.has(key))
+                return false;
+            seen.add(key);
+            return true;
+        });
         const filtered = context.filter === undefined ? hits : context.filter(hits, context, handContext);
         pointerIntersection[handedness] = filtered[0];
         // Bubble up the events, find the event source (eventObject)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threlte/xr",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "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,7 @@
     "typescript-eslint": "^8.32.0",
     "vite": "^7.1.4",
     "vite-plugin-mkcert": "^1.17.5",
-    "@threlte/core": "8.5.2"
+    "@threlte/core": "8.5.4"
   },
   "peerDependencies": {
     "svelte": ">=5",