@viamrobotics/motion-tools 1.15.2 → 1.15.4

package/dist/components/KeyboardControls.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
 	import type { CameraControlsRef } from '@threlte/extras'
 
-	import { useTask } from '@threlte/core'
+	import { isInstanceOf, useTask } from '@threlte/core'
 	import { PressedKeys } from 'runed'
-	import { MathUtils } from 'three'
+	import { MathUtils, Vector3 } from 'three'
 
 	import { useFocusedEntity, useSelectedEntity } from '../hooks/useSelection.svelte'
 	import { useSettings } from '../hooks/useSettings.svelte'
@@ -35,7 +35,36 @@
 	const left = $derived(keys.has('arrowleft'))
 	const down = $derived(keys.has('arrowdown'))
 	const right = $derived(keys.has('arrowright'))
-	const any = $derived(w || s || a || d || r || f || up || left || down || right)
+	const anyKeysPressed = $derived(w || s || a || d || r || f || up || left || down || right)
+
+	const target = new Vector3()
+
+	const PERSPECTIVE_DISTANCE_FACTOR = 0.0001
+	const PERSPECTIVE_MIN_SPEED = 0.00001
+
+	const ORTHOGRAPHIC_ZOOM_FACTOR = 0.1
+	const ORTHOGRAPHIC_MIN_SPEED = 0.00005
+
+	const FALLBACK_SPEED = 0.001
+
+	const getMovementScale = () => {
+		const camera = cameraControls.camera
+
+		if (isInstanceOf(camera, 'PerspectiveCamera')) {
+			cameraControls.getTarget(target)
+
+			const distance = camera.position.distanceTo(target)
+			const scaled = distance * PERSPECTIVE_DISTANCE_FACTOR
+			return Math.max(scaled, PERSPECTIVE_MIN_SPEED)
+		}
+
+		if (isInstanceOf(camera, 'OrthographicCamera')) {
+			const scaled = ORTHOGRAPHIC_ZOOM_FACTOR / camera.zoom
+			return Math.max(scaled, ORTHOGRAPHIC_MIN_SPEED)
+		}
+
+		return FALLBACK_SPEED
+	}
 
 	const { start, stop } = useTask(
 		(delta) => {
@@ -46,44 +75,58 @@
 				return
 			}
 
+			const moveSpeed = getMovementScale() * dt
+			const rotateSpeed = 0.1 * MathUtils.DEG2RAD * dt
+			const tiltSpeed = 0.05 * MathUtils.DEG2RAD * dt
+			const dollySpeed = 0.005 * dt
+			const zoomSpeed = 0.5 * dt
+
 			if (a) {
-				cameraControls.truck(-0.01 * dt, 0, true)
+				cameraControls.truck(-moveSpeed * dt, 0, true)
 			}
 
 			if (d) {
-				cameraControls.truck(0.01 * dt, 0, true)
+				cameraControls.truck(moveSpeed * dt, 0, true)
 			}
 
 			if (w) {
-				cameraControls.forward(0.01 * dt, true)
+				cameraControls.forward(moveSpeed * dt, true)
 			}
 
 			if (s) {
-				cameraControls.forward(-0.01 * dt, true)
+				cameraControls.forward(-moveSpeed * dt, true)
 			}
 
 			if (r) {
-				cameraControls.dolly(0.01 * dt, true)
+				if (isInstanceOf(cameraControls.camera, 'PerspectiveCamera')) {
+					cameraControls.dolly(dollySpeed, true)
+				} else {
+					cameraControls.zoom(zoomSpeed, true)
+				}
 			}
 
 			if (f) {
-				cameraControls.dolly(-0.01 * dt, true)
+				if (isInstanceOf(cameraControls.camera, 'PerspectiveCamera')) {
+					cameraControls.dolly(-dollySpeed, true)
+				} else {
+					cameraControls.zoom(-zoomSpeed, true)
+				}
 			}
 
 			if (left) {
-				cameraControls.rotate(-0.1 * MathUtils.DEG2RAD * dt, 0, true)
+				cameraControls.rotate(-rotateSpeed, 0, true)
 			}
 
 			if (right) {
-				cameraControls.rotate(0.1 * MathUtils.DEG2RAD * dt, 0, true)
+				cameraControls.rotate(rotateSpeed, 0, true)
 			}
 
 			if (up) {
-				cameraControls.rotate(0, -0.05 * MathUtils.DEG2RAD * dt, true)
+				cameraControls.rotate(0, -tiltSpeed, true)
 			}
 
 			if (down) {
-				cameraControls.rotate(0, 0.05 * MathUtils.DEG2RAD * dt, true)
+				cameraControls.rotate(0, tiltSpeed, true)
 			}
 		},
 		{
@@ -93,7 +136,7 @@
 	)
 
 	$effect.pre(() => {
-		if (any) {
+		if (anyKeysPressed) {
 			start()
 		} else {
 			stop()

package/dist/components/MeasureTool/MeasureTool.svelte

@@ -35,7 +35,7 @@
 		intersection = event.intersections[0]
 
 		// Only handle axis restrictions if a first point has been placed
-		if (!p1) {
+		if (!p1 || !intersection) {
 			return
 		}
 
@@ -127,7 +127,7 @@
 {#if enabled}
 	{#if intersection && step !== 'p2'}
 		<MeasurePoint
-			position={intersection?.point.toArray()}
+			position={intersection.point.toArray()}
 			opacity={0.5}
 		/>
 	{/if}

package/dist/components/StaticGeometries.svelte

@@ -51,8 +51,9 @@
 
 	keys.onKeys('-', () => {
 		if (selectedCustomGeometry) {
-			selectedCustomGeometry.destroy()
-			entities.delete(selectedCustomGeometry)
+			const entity = selectedCustomGeometry
+			entity.destroy()
+			entities.delete(entity)
 			selectedEntity.set()
 		}
 	})

package/dist/components/xr/useAnchors.svelte.js

@@ -6,7 +6,7 @@ const key = Symbol('anchors-context');
 export const provideAnchors = () => {
     const matrix4 = new Matrix4();
     const { renderer } = useThrelte();
-    const { xrFrame, isPresenting } = useXR();
+    const { isPresenting } = useXR();
     const map = new WeakMap();
     let space = renderer.xr.getReferenceSpace();
     const createAnchor = (position, orientation) => {
@@ -14,14 +14,14 @@ export const provideAnchors = () => {
         if (space === null)
             return;
         const pose = new XRRigidTransform(position, orientation);
-        return xrFrame.current.createAnchor?.(pose, space);
+        return renderer.xr.getFrame().createAnchor?.(pose, space);
     };
     const { start, stop } = useTask(() => {
         space ??= renderer.xr.getReferenceSpace();
         if (!space) {
             return;
         }
-        const frame = xrFrame.current;
+        const frame = renderer.xr.getFrame();
         if (!frame.trackedAnchors) {
             return;
         }

package/dist/ecs/useQuery.svelte.d.ts

@@ -1,4 +1,4 @@
 import { type QueryParameter, type QueryResult } from 'koota';
-export declare function useQuery<T extends QueryParameter[]>(...parameters: T): {
+export declare const useQuery: <T extends QueryParameter[]>(...parameters: T) => {
     current: QueryResult<T>;
 };

package/dist/ecs/useQuery.svelte.js

@@ -1,49 +1,56 @@
-import { createQuery, $internal as internal } from 'koota';
-import { untrack } from 'svelte';
+import { createQuery, $internal as internalKey } from 'koota';
+import { createSubscriber } from 'svelte/reactivity';
 import { useWorld } from './useWorld';
-export function useQuery(...parameters) {
+export const useQuery = (...parameters) => {
     const world = useWorld();
-    const createdQuery = createQuery(...parameters);
-    // Using internals to get the query data.
-    const query = world[internal].queriesHashMap.get(createdQuery.hash);
-    const initialQueryVersion = query?.version;
-    let version = $state.raw(0);
-    let entities = $state.raw(world.query(createdQuery));
-    $effect(() => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        version;
-        // Compare the initial version to the current version to
-        // see it the query has changed.
-        const query = world[internal].queriesHashMap.get(createdQuery.hash);
-        if (query?.version !== initialQueryVersion) {
-            entities = world.query(createdQuery);
-        }
-        return untrack(() => {
-            const unsubAdd = world.onQueryAdd(createdQuery, () => {
-                entities = world.query(createdQuery);
-            });
-            const unsubRemove = world.onQueryRemove(createdQuery, () => {
-                entities = world.query(createdQuery);
-            });
-            return () => {
-                unsubAdd();
-                unsubRemove();
-            };
-        });
-    });
-    const handler = () => {
-        version += 1;
-    };
-    // Force reattaching event listeners when the world is reset.
-    $effect(() => {
-        world[internal].resetSubscriptions.add(handler);
+    const queryRef = createQuery(...parameters);
+    let cache = null;
+    const subscribe = createSubscriber((update) => {
+        let unsubAdd = () => { };
+        let unsubRemove = () => { };
+        const subscribe = () => {
+            unsubAdd = world.onQueryAdd(queryRef, update);
+            unsubRemove = world.onQueryRemove(queryRef, update);
+            // Check if query changed before subscriptions were attached
+            const query = world[internalKey].queriesHashMap.get(queryRef.hash);
+            if (query && cache && query.version !== cache.version) {
+                update();
+            }
+        };
+        const handleReset = () => {
+            cache = null;
+            unsubAdd();
+            unsubRemove();
+            subscribe();
+            update();
+        };
+        subscribe();
+        world[internalKey].resetSubscriptions.add(handleReset);
         return () => {
-            world[internal].resetSubscriptions.delete(handler);
+            world[internalKey].resetSubscriptions.delete(handleReset);
+            unsubAdd();
+            unsubRemove();
         };
     });
+    const getResult = () => {
+        const query = world[internalKey].queriesHashMap.get(queryRef.hash);
+        if (query && cache?.hash === queryRef.hash && cache.version === query.version) {
+            return cache.result;
+        }
+        // eslint-disable-next-line unicorn/no-array-sort
+        const result = world.query(queryRef).sort();
+        const registeredQuery = world[internalKey].queriesHashMap.get(queryRef.hash);
+        cache = {
+            hash: queryRef.hash,
+            version: registeredQuery.version,
+            result,
+        };
+        return result;
+    };
     return {
         get current() {
-            return entities;
+            subscribe();
+            return getResult();
         },
     };
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viamrobotics/motion-tools",
-  "version": "1.15.2",
+  "version": "1.15.4",
   "description": "Motion visualization with Viam",
   "license": "Apache-2.0",
   "type": "module",
@@ -25,10 +25,10 @@
     "@testing-library/jest-dom": "6.8.0",
     "@testing-library/svelte": "5.2.8",
     "@testing-library/user-event": "^14.6.1",
-    "@threlte/core": "8.3.0",
-    "@threlte/extras": "9.7.0",
-    "@threlte/rapier": "3.2.0",
-    "@threlte/xr": "1.0.8",
+    "@threlte/core": "8.5.0",
+    "@threlte/extras": "9.9.0",
+    "@threlte/rapier": "3.4.0",
+    "@threlte/xr": "1.4.0",
     "@types/bun": "1.2.21",
     "@types/earcut": "^3.0.0",
     "@types/lodash-es": "4.17.12",