@viamrobotics/motion-tools 0.5.1 → 0.5.2

package/dist/color.js

@@ -46,11 +46,10 @@ const oklchToHex = (raw) => {
  * @returns A new THREE.Color instance with the darkened color.
  */
 export const darkenColor = (value, percent) => {
-    const color = new Color(value);
-    const hsl = { h: 0, s: 0, l: 0 };
-    color.getHSL(hsl);
+    const original = new Color(value);
+    const hsl = original.getHSL({ h: 0, s: 0, l: 0 });
     hsl.l = Math.max(0, hsl.l * (1 - percent / 100));
-    return color.setHSL(hsl.h, hsl.s, hsl.l);
+    return new Color().setHSL(hsl.h, hsl.s, hsl.l);
 };
 export const colors = {
     selected: oklchToHex(twColors.red['900']),

package/dist/components/CameraControls.svelte

@@ -42,7 +42,7 @@
 	interface Props {
 		ref?: CameraController
 		enabled?: boolean
-		children?: Snippet
+		children?: Snippet<[{ ref: CameraController }]>
 	}
 
 	let { ref = $bindable(), enabled = true, children }: Props = $props()
@@ -77,5 +77,5 @@
 	is={controls}
 	bind:ref
 >
-	{@render children?.()}
+	{@render children?.({ ref: controls })}
 </T>

package/dist/components/CameraControls.svelte.d.ts

@@ -3,7 +3,9 @@ import type { Snippet } from 'svelte';
 interface Props {
     ref?: CameraController;
     enabled?: boolean;
-    children?: Snippet;
+    children?: Snippet<[{
+        ref: CameraController;
+    }]>;
 }
 declare const CameraControls: import("svelte").Component<Props, {}, "ref">;
 type CameraControls = ReturnType<typeof CameraControls>;

package/dist/components/Focus.svelte

@@ -1,12 +1,10 @@
 <script lang="ts">
-	import { isInstanceOf, T } from '@threlte/core'
+	import { T } from '@threlte/core'
 	import { TrackballControls, Gizmo } from '@threlte/extras'
-	import { useFocused, useFocusedObject3d } from '../hooks/useSelection.svelte'
-	import { Keybindings } from '../keybindings'
+	import { useFocusedObject3d } from '../hooks/useSelection.svelte'
 	import { Box3, Vector3 } from 'three'
 	import Camera from './Camera.svelte'
 
-	const focus = useFocused()
 	const focusedObject = useFocusedObject3d()
 	const object3d = $derived(focusedObject.current)
 
@@ -21,20 +19,8 @@
 			center = box.getCenter(vec).toArray()
 		}
 	})
-
-	const onkeydown = ({ key }: KeyboardEvent) => {
-		if (key === Keybindings.ESCAPE) {
-			focus.set(undefined)
-		} else if (key === Keybindings.UP || key === Keybindings.DOWN) {
-			if (object3d && 'material' in object3d && isInstanceOf(object3d.material, 'PointsMaterial')) {
-				object3d.material.size += key === Keybindings.UP ? 0.001 : -0.001
-			}
-		}
-	}
 </script>
 
-<svelte:window {onkeydown} />
-
 <Camera position={[2, 0, 0]}>
 	<TrackballControls target={center}>
 		<Gizmo />

package/dist/components/Frame.svelte

@@ -5,7 +5,7 @@
 	import { useObjectEvents } from '../hooks/useObjectEvents.svelte'
 	import Geometry from './Geometry.svelte'
 	import { useSelected } from '../hooks/useSelection.svelte'
-	import { colors } from '../color'
+	import { colors, darkenColor } from '../color'
 
 	interface Props {
 		uuid: string
@@ -24,7 +24,9 @@
 
 <Geometry
 	{uuid}
-	color={selected.current === uuid ? colors.selected : undefined}
+	color={selected.current === uuid
+		? `#${darkenColor(rest.metadata.color ?? colors.default, 75).getHexString()}`
+		: undefined}
 	{...events}
 	{...rest}
 />

package/dist/components/KeyboardControls.svelte

@@ -0,0 +1,102 @@
+<script lang="ts">
+	import { MathUtils } from 'three'
+	import { useTask } from '@threlte/core'
+	import type CameraController from 'camera-controls'
+	import { PressedKeys } from 'runed'
+	import { useFocused } from '../hooks/useSelection.svelte'
+	import { useSettings } from '../hooks/useSettings.svelte'
+
+	interface Props {
+		cameraControls: CameraController
+	}
+
+	let { cameraControls }: Props = $props()
+
+	const focus = useFocused()
+	const settings = useSettings()
+
+	const keys = new PressedKeys()
+	const w = $derived(keys.has('w'))
+	const s = $derived(keys.has('s'))
+	const a = $derived(keys.has('a'))
+	const d = $derived(keys.has('d'))
+	const up = $derived(keys.has('arrowup'))
+	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 || up || left || down || right)
+
+	const { start, stop } = useTask(
+		(delta) => {
+			const dt = delta * 1000
+
+			if (a) {
+				cameraControls.truck(-0.01 * dt, 0, true)
+			}
+
+			if (d) {
+				cameraControls.truck(0.01 * dt, 0, true)
+			}
+
+			if (w) {
+				cameraControls.forward(0.01 * dt, true)
+			}
+
+			if (s) {
+				cameraControls.forward(-0.01 * dt, true)
+			}
+
+			if (left) {
+				cameraControls.rotate(-0.1 * MathUtils.DEG2RAD * dt, 0, true)
+			}
+
+			if (right) {
+				cameraControls.rotate(0.1 * MathUtils.DEG2RAD * dt, 0, true)
+			}
+
+			if (up) {
+				cameraControls.rotate(0, -0.05 * MathUtils.DEG2RAD * dt, true)
+			}
+
+			if (down) {
+				cameraControls.rotate(0, 0.05 * MathUtils.DEG2RAD * dt, true)
+			}
+		},
+		{ autoStart: false, autoInvalidate: false }
+	)
+
+	$effect.pre(() => {
+		if (any) {
+			start()
+		} else {
+			stop()
+		}
+	})
+
+	keys.onKeys('escape', () => {
+		if (keys.has('escape')) {
+			focus.set(undefined)
+		}
+	})
+
+	keys.onKeys('c', () => {
+		settings.current.cameraMode =
+			settings.current.cameraMode === 'perspective' ? 'orthographic' : 'perspective'
+	})
+
+	keys.onKeys('1', () => {
+		settings.current.transformMode = 'translate'
+	})
+
+	keys.onKeys('2', () => {
+		settings.current.transformMode = 'rotate'
+	})
+
+	keys.onKeys('3', () => {
+		settings.current.transformMode = 'scale'
+	})
+
+	keys.onKeys(['ctrl', 'x'], () => {
+		settings.current.enableXR = !settings.current.enableXR
+	})
+</script>

package/dist/components/KeyboardControls.svelte.d.ts

@@ -0,0 +1,7 @@
+import type CameraController from 'camera-controls';
+interface Props {
+    cameraControls: CameraController;
+}
+declare const KeyboardControls: import("svelte").Component<Props, {}, "">;
+type KeyboardControls = ReturnType<typeof KeyboardControls>;
+export default KeyboardControls;

package/dist/components/Scene.svelte

@@ -15,6 +15,7 @@
 	import type { Snippet } from 'svelte'
 	import { useXR } from '@threlte/xr'
 	import { useTransformControls } from '../hooks/useControls.svelte'
+	import KeyboardControls from './KeyboardControls.svelte'
 
 	interface Props {
 		children?: Snippet
@@ -48,7 +49,10 @@
 		{#if !$isPresenting}
 			<Camera position={[3, 3, 3]}>
 				<CameraControls enabled={!transformControls.active}>
-					<Gizmo />
+					{#snippet children({ ref })}
+						<KeyboardControls cameraControls={ref} />
+						<Gizmo />
+					{/snippet}
 				</CameraControls>
 			</Camera>
 		{/if}

package/dist/components/StaticGeometries.svelte

@@ -3,45 +3,27 @@
 	import { useSelected } from '../hooks/useSelection.svelte'
 	import { useStaticGeometries } from '../hooks/useStaticGeometries.svelte'
 	import { useTransformControls } from '../hooks/useControls.svelte'
-	import { Keybindings } from '../keybindings'
-	import { PersistedState } from 'runed'
+	import { PressedKeys } from 'runed'
 	import { quaternionToPose, scaleToDimensions, vector3ToPose } from '../transform'
 	import { Quaternion, Vector3 } from 'three'
 	import Frame from './Frame.svelte'
+	import { useSettings } from '../hooks/useSettings.svelte'
 
-	type Modes = 'translate' | 'rotate' | 'scale'
-
+	const settings = useSettings()
 	const transformControls = useTransformControls()
 	const geometries = useStaticGeometries()
 	const selected = useSelected()
 
-	let mode = new PersistedState<Modes>('transform-mode', 'translate')
+	const mode = $derived(settings.current.transformMode)
 
 	const quaternion = new Quaternion()
 	const vector3 = new Vector3()
-</script>
 
-<svelte:window
-	onkeydown={(event) => {
-		if (event.metaKey || event.ctrlKey) {
-			return
-		}
+	const keys = new PressedKeys()
 
-		const key = event.key.toLowerCase()
-
-		if (key === Keybindings.ADD_GEOMETRY) {
-			geometries.add()
-		} else if (key === Keybindings.REMOVE_GEOMETRY) {
-			geometries.remove(selected.current ?? '')
-		} else if (key === Keybindings.TRANSLATE) {
-			mode.current = 'translate'
-		} else if (key === Keybindings.ROTATE) {
-			mode.current = 'rotate'
-		} else if (key === Keybindings.SCALE) {
-			mode.current = 'scale'
-		}
-	}}
-/>
+	keys.onKeys('=', () => geometries.add())
+	keys.onKeys('-', () => geometries.remove(selected.current ?? ''))
+</script>
 
 {#each geometries.current as object (object.uuid)}
 	<Frame
@@ -53,20 +35,20 @@
 	>
 		{#snippet children({ ref })}
 			{#if selected.current === ref.uuid}
-				{#key mode.current}
+				{#key mode}
 					<TransformControls
 						object={ref}
-						mode={mode.current}
+						{mode}
 						onmouseDown={() => transformControls.setActive(true)}
 						onmouseUp={() => {
 							transformControls.setActive(false)
 
-							if (mode.current === 'translate') {
+							if (mode === 'translate') {
 								vector3ToPose(ref.getWorldPosition(vector3), object.pose)
-							} else if (mode.current === 'rotate') {
+							} else if (mode === 'rotate') {
 								quaternionToPose(ref.getWorldQuaternion(quaternion), object.pose)
 								ref.quaternion.copy(quaternion)
-							} else if (mode.current === 'scale' && object.geometry?.case === 'box') {
+							} else if (mode === 'scale' && object.geometry?.case === 'box') {
 								scaleToDimensions(ref.scale, object.geometry)
 								ref.scale.setScalar(1)
 							}

package/dist/components/StaticGeometries.svelte.d.ts

@@ -1,18 +1,3 @@
-interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
-    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
-        $$bindings?: Bindings;
-    } & Exports;
-    (internal: unknown, props: {
-        $$events?: Events;
-        $$slots?: Slots;
-    }): Exports & {
-        $set?: any;
-        $on?: any;
-    };
-    z_$$bindings?: Bindings;
-}
-declare const StaticGeometries: $$__sveltets_2_IsomorphicComponent<Record<string, never>, {
-    [evt: string]: CustomEvent<any>;
-}, {}, {}, string>;
-type StaticGeometries = InstanceType<typeof StaticGeometries>;
+declare const StaticGeometries: import("svelte").Component<Record<string, never>, {}, "">;
+type StaticGeometries = ReturnType<typeof StaticGeometries>;
 export default StaticGeometries;

package/dist/components/dashboard/Dashboard.svelte

@@ -5,15 +5,6 @@
 	const settings = useSettings()
 </script>
 
-<svelte:window
-	onkeydown={({ key }) => {
-		if (key.toLowerCase() === 'c') {
-			settings.current.cameraMode =
-				settings.current.cameraMode === 'perspective' ? 'orthographic' : 'perspective'
-		}
-	}}
-/>
-
 <div class="absolute top-2 flex w-full justify-center">
 	<!-- transform -->
 	<!-- <fieldset>

package/dist/components/xr/XR.svelte

@@ -1,21 +1,14 @@
 <script lang="ts">
-	import { PersistedState } from 'runed'
 	import { XR, XRButton } from '@threlte/xr'
 	import OriginMarker from './OriginMarker.svelte'
 	import DomPortal from '../DomPortal.svelte'
+	import { useSettings } from '../../hooks/useSettings.svelte'
 
-	const enableXR = new PersistedState('enable-xr', false)
+	const settings = useSettings()
+	const enableXR = $derived(settings.current.enableXR)
 </script>
 
-<svelte:window
-	onkeydown={(event) => {
-		if (event.ctrlKey && event.key.toLowerCase() === 'a') {
-			enableXR.current = !enableXR.current
-		}
-	}}
-/>
-
-{#if enableXR.current}
+{#if enableXR}
 	<XR>
 		<OriginMarker />
 	</XR>

package/dist/components/xr/XR.svelte.d.ts

@@ -1,18 +1,3 @@
-interface $$__sveltets_2_IsomorphicComponent<Props extends Record<string, any> = any, Events extends Record<string, any> = any, Slots extends Record<string, any> = any, Exports = {}, Bindings = string> {
-    new (options: import('svelte').ComponentConstructorOptions<Props>): import('svelte').SvelteComponent<Props, Events, Slots> & {
-        $$bindings?: Bindings;
-    } & Exports;
-    (internal: unknown, props: {
-        $$events?: Events;
-        $$slots?: Slots;
-    }): Exports & {
-        $set?: any;
-        $on?: any;
-    };
-    z_$$bindings?: Bindings;
-}
-declare const Xr: $$__sveltets_2_IsomorphicComponent<Record<string, never>, {
-    [evt: string]: CustomEvent<any>;
-}, {}, {}, string>;
-type Xr = InstanceType<typeof Xr>;
+declare const Xr: import("svelte").Component<Record<string, never>, {}, "">;
+type Xr = ReturnType<typeof Xr>;
 export default Xr;

package/dist/hooks/useObjectEvents.svelte.d.ts

@@ -4,6 +4,7 @@ export declare const useObjectEvents: (uuid: () => string) => {
     onpointerenter: (event: IntersectionEvent<MouseEvent>) => void;
     onpointerleave: (event: IntersectionEvent<MouseEvent>) => void;
     ondblclick: (event: IntersectionEvent<MouseEvent>) => void;
+    onpointerdown: (event: IntersectionEvent<MouseEvent>) => void;
     onclick: (event: IntersectionEvent<MouseEvent>) => void;
     onpointermissed: () => void;
 };

package/dist/hooks/useObjectEvents.svelte.js

@@ -1,11 +1,13 @@
 import { useCursor } from '@threlte/extras';
 import { useFocused, useSelected } from './useSelection.svelte';
 import { useVisibility } from './useVisibility.svelte';
+import { Vector2 } from 'three';
 export const useObjectEvents = (uuid) => {
     const { onPointerEnter, onPointerLeave } = useCursor();
     const selected = useSelected();
     const focused = useFocused();
     const visibility = useVisibility();
+    const down = new Vector2();
     return {
         get visible() {
             return visibility.get(uuid());
@@ -22,9 +24,14 @@ export const useObjectEvents = (uuid) => {
             event.stopPropagation();
             focused.set(uuid());
         },
+        onpointerdown: (event) => {
+            down.copy(event.pointer);
+        },
         onclick: (event) => {
             event.stopPropagation();
-            selected.set(uuid());
+            if (down.distanceToSquared(event.pointer) < 0.1) {
+                selected.set(uuid());
+            }
         },
         onpointermissed: () => selected.set(),
     };

package/dist/hooks/useSettings.svelte.d.ts

@@ -1,5 +1,7 @@
 interface Settings {
     cameraMode: 'orthographic' | 'perspective';
+    transformMode: 'translate' | 'rotate' | 'scale';
+    enableXR: boolean;
 }
 interface Context {
     current: Settings;

package/dist/hooks/useSettings.svelte.js

@@ -3,12 +3,14 @@ import { getContext, setContext } from 'svelte';
 const key = Symbol('dashboard-context');
 const defaults = () => ({
     cameraMode: 'perspective',
+    transformMode: 'translate',
+    enableXR: false,
 });
 export const provideSettings = () => {
     let settings = $state(defaults());
     get('motion-tools-settings').then((response) => {
         if (response) {
-            settings = response;
+            settings = { ...settings, ...response };
         }
     });
     $effect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viamrobotics/motion-tools",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "description": "Motion visualization with Viam",
   "license": "Apache-2.0",
   "type": "module",
@@ -16,7 +16,7 @@
     "@skeletonlabs/skeleton": "3.1.3",
     "@skeletonlabs/skeleton-svelte": "1.2.3",
     "@sveltejs/adapter-static": "^3.0.8",
-    "@sveltejs/kit": "^2.21.3",
+    "@sveltejs/kit": "^2.21.4",
     "@sveltejs/package": "^2.3.11",
     "@sveltejs/vite-plugin-svelte": "^5.1.0",
     "@tailwindcss/forms": "^0.5.10",
@@ -32,18 +32,18 @@
     "@types/bun": "^1.2.15",
     "@types/lodash-es": "^4.17.12",
     "@types/three": "^0.177.0",
-    "@typescript-eslint/eslint-plugin": "^8.33.1",
-    "@typescript-eslint/parser": "^8.33.1",
+    "@typescript-eslint/eslint-plugin": "^8.34.0",
+    "@typescript-eslint/parser": "^8.34.0",
     "@viamrobotics/prime-core": "^0.1.5",
     "@viamrobotics/sdk": "0.43.0",
     "@viamrobotics/svelte-sdk": "0.3.3",
     "@vitejs/plugin-basic-ssl": "^2.0.0",
-    "@zag-js/svelte": "1.15.0",
-    "@zag-js/tree-view": "1.15.0",
+    "@zag-js/svelte": "1.15.1",
+    "@zag-js/tree-view": "1.15.1",
     "camera-controls": "^2.10.1",
     "eslint": "^9.28.0",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-svelte": "^3.9.1",
+    "eslint-plugin-svelte": "^3.9.2",
     "globals": "^16.2.0",
     "idb-keyval": "^6.2.2",
     "jsdom": "^26.1.0",
@@ -54,7 +54,7 @@
     "prettier-plugin-tailwindcss": "^0.6.12",
     "publint": "^0.3.12",
     "runed": "^0.28.0",
-    "svelte": "5.33.18",
+    "svelte": "5.33.19",
     "svelte-check": "^4.2.1",
     "svelte-virtuallists": "^1.4.2",
     "tailwindcss": "^4.1.8",
@@ -62,7 +62,7 @@
     "threlte-uikit": "^1.1.0",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.33.1",
+    "typescript-eslint": "^8.34.0",
     "vite": "^6.3.5",
     "vite-plugin-mkcert": "^1.17.8",
     "vitest": "^3.2.3"

package/dist/keybindings.d.ts

@@ -1,12 +0,0 @@
-export declare const Keybindings: {
-    MACHINES: string;
-    TREEVIEW: string;
-    ESCAPE: string;
-    UP: string;
-    DOWN: string;
-    ADD_GEOMETRY: string;
-    REMOVE_GEOMETRY: string;
-    TRANSLATE: string;
-    ROTATE: string;
-    SCALE: string;
-};

package/dist/keybindings.js

@@ -1,12 +0,0 @@
-export const Keybindings = {
-    MACHINES: 'm',
-    TREEVIEW: '`',
-    ESCAPE: 'Escape',
-    UP: 'ArrowUp',
-    DOWN: 'ArrowDown',
-    ADD_GEOMETRY: '=',
-    REMOVE_GEOMETRY: '-',
-    TRANSLATE: 't',
-    ROTATE: 'r',
-    SCALE: 's',
-};