@viamrobotics/motion-tools 0.14.12 → 0.15.0

package/dist/WorldObject.svelte.d.ts

@@ -1,5 +1,5 @@
 import type { Geometry, PlainMessage, Pose, Struct, TransformWithUUID } from '@viamrobotics/sdk';
-import { BatchedMesh, Color, Object3D, Vector3 } from 'three';
+import { BatchedMesh, Color, Object3D, Vector3, type BufferGeometry } from 'three';
 import type { ValueOf } from 'type-fest';
 import type { OBB } from 'three/addons/math/OBB.js';
 export type PointsGeometry = {
@@ -16,7 +16,14 @@ export type LinesGeometry = {
         value: Float32Array;
     };
 };
-export type Geometries = Geometry | PointsGeometry | LinesGeometry;
+export type ThreeBufferGeometry = {
+    center: undefined;
+    geometryType: {
+        case: 'bufferGeometry';
+        value: BufferGeometry;
+    };
+};
+export type Geometries = Geometry | PointsGeometry | LinesGeometry | ThreeBufferGeometry;
 export declare const SupportedShapes: {
     readonly points: "points";
     readonly line: "line";

package/dist/color.js

@@ -102,8 +102,8 @@ export const isRGB = (color) => {
 };
 export const parseRGB = (color, defaultColor = { r: 0, g: 0, b: 0 }) => {
     if (!isRGB(color))
-        return new Color().setRGB(defaultColor.r, defaultColor.g, defaultColor.b);
-    return new Color().setRGB(color.r, color.g, color.b);
+        return new Color().setRGB(defaultColor.r > 1 ? defaultColor.r / 255 : defaultColor.r, defaultColor.g > 1 ? defaultColor.g / 255 : defaultColor.g, defaultColor.b > 1 ? defaultColor.b / 255 : defaultColor.b);
+    return new Color().setRGB(color.r > 1 ? color.r / 255 : color.r, color.g > 1 ? color.g / 255 : color.g, color.b > 1 ? color.b / 255 : color.b);
 };
 export const parseOpacity = (opacity, defaultOpacity = 1) => {
     if (!isNumber(opacity))

package/dist/components/Details.svelte

@@ -28,6 +28,7 @@
 	import { FrameConfigUpdater } from '../FrameConfigUpdater.svelte'
 	import { useWeblabs } from '../hooks/useWeblabs.svelte'
 	import { WEBLABS_EXPERIMENTS } from '../hooks/useWeblabs.svelte'
+	import { useEnvironment } from '../hooks/useEnvironment.svelte'
 	const { ...rest } = $props()
 
 	const focused = useFocused()
@@ -38,7 +39,7 @@
 	const selectedObject = useSelectedObject()
 	const selectedObject3d = useSelectedObject3d()
 	const weblab = useWeblabs()
-
+	const environment = useEnvironment()
 	const object = $derived(focusedObject.current ?? selectedObject.current)
 	const object3d = $derived(focusedObject3d.current ?? selectedObject3d.current)
 	const worldPosition = $state({ x: 0, y: 0, z: 0 })
@@ -564,7 +565,7 @@
 		{/if}
 
 		<WeblabActive experiment={WEBLABS_EXPERIMENTS.MOTION_TOOLS_EDIT_FRAME}>
-			{#if showEditFrameOptions}
+			{#if showEditFrameOptions && environment.current.isStandalone}
 				<Button
 					variant="danger"
 					class="mt-2 w-full"

package/dist/components/FileDrop.svelte

@@ -2,10 +2,11 @@
 	import { useDrawAPI } from '../hooks/useDrawAPI.svelte'
 	import { parsePcdInWorker, WorldObject } from '../lib'
 	import { useToast, ToastVariant } from '@viamrobotics/prime-core'
+	import { PLYLoader } from 'three/examples/jsm/Addons.js'
 
 	let { ...rest } = $props()
 
-	const { addPoints } = useDrawAPI()
+	const { addPoints, addMesh } = useDrawAPI()
 
 	type DropStates = 'inactive' | 'hovering' | 'loading'
 
@@ -31,6 +32,12 @@
 
 	const toast = useToast()
 
+	const extensions = {
+		PCD: 'pcd',
+		PLY: 'ply',
+	}
+	const supportedFiles = [extensions.PCD, extensions.PLY]
+
 	const ondrop = (event: DragEvent) => {
 		event.preventDefault()
 
@@ -45,9 +52,18 @@
 		for (const file of files) {
 			const ext = file.name.split('.').at(-1)
 
-			if (ext !== '.pcd') {
+			if (!ext) {
+				toast({
+					message: `Could not determine file extension.`,
+					variant: ToastVariant.Danger,
+				})
+
+				continue
+			}
+
+			if (!supportedFiles.includes(ext)) {
 				toast({
-					message: `.${ext} is not a supported file type.`,
+					message: `Only ${supportedFiles.map((file) => `.${file}`).join(', ')} files are supported.`,
 					variant: ToastVariant.Danger,
 				})
 
@@ -65,34 +81,55 @@
 			})
 
 			reader.addEventListener('error', () => {
-				toast({ message: `${file.name} failed to load.`, variant: ToastVariant.Danger })
+				toast({
+					message: `${file.name} failed to load.`,
+					variant: ToastVariant.Danger,
+				})
 			})
 
 			reader.addEventListener('load', async (event) => {
 				const arrayBuffer = event.target?.result
 
 				if (!arrayBuffer || typeof arrayBuffer === 'string') {
+					toast({
+						message: `${file.name} failed to load.`,
+						variant: ToastVariant.Danger,
+					})
+
 					return
 				}
 
-				const result = await parsePcdInWorker(new Uint8Array(arrayBuffer))
-
-				addPoints(
-					new WorldObject(
-						file.name,
-						undefined,
-						undefined,
-						{
-							center: undefined,
-							geometryType: {
-								case: 'points',
-								value: result.positions,
+				if (ext === extensions.PCD) {
+					const result = await parsePcdInWorker(new Uint8Array(arrayBuffer))
+
+					addPoints(
+						new WorldObject(
+							file.name,
+							undefined,
+							undefined,
+							{
+								center: undefined,
+								geometryType: {
+									case: 'points',
+									value: result.positions,
+								},
 							},
-						},
-						result.colors ? { colors: result.colors } : undefined
+							result.colors ? { colors: result.colors } : undefined
+						)
 					)
-				)
-				toast({ message: `Loaded ${file.name}`, variant: ToastVariant.Success })
+
+					toast({ message: `Loaded ${file.name}`, variant: ToastVariant.Success })
+				} else if (ext === extensions.PLY) {
+					const result = new PLYLoader().parse(arrayBuffer)
+					const worldObject = new WorldObject(file.name, undefined, undefined, {
+						center: undefined,
+						geometryType: { case: 'bufferGeometry', value: result },
+					})
+
+					addMesh(worldObject)
+
+					toast({ message: `Loaded ${file.name}`, variant: ToastVariant.Success })
+				}
 			})
 
 			reader.readAsArrayBuffer(file)

package/dist/components/Geometry.svelte

@@ -103,7 +103,12 @@
 			{uuid}
 			bvh={{ enabled: false }}
 		>
-			{#if geometry.geometryType.case === 'mesh'}
+			{#if geometry.geometryType.case === 'bufferGeometry'}
+				<T
+					is={geometry.geometryType.value}
+					{oncreate}
+				/>
+			{:else if geometry.geometryType.case === 'mesh'}
 				{@const mesh = geometry.geometryType.value.mesh}
 				{@const meshGeometry = parsePlyInput(mesh)}
 				<T

package/dist/components/Tree/buildTree.js

@@ -39,8 +39,11 @@ export const buildTreeNodes = (objects, worldStates) => {
                 children: [],
                 href: `/world-state/${worldState.name}/${object.name}`,
             };
+            const parentNode = object.referenceFrame && nodeMap.has(object.referenceFrame)
+                ? nodeMap.get(object.referenceFrame)
+                : node;
             nodeMap.set(object.name, child);
-            node.children?.push(child);
+            parentNode.children?.push(child);
         }
         nodeMap.set(worldState.name, node);
         rootNodes.push(node);

package/dist/components/WorldState.svelte

@@ -6,8 +6,9 @@
 	import Portal from './portal/Portal.svelte'
 	import PortalTarget from './portal/PortalTarget.svelte'
 	import { WorldObject } from '../WorldObject.svelte'
-	import { useArrows } from '../hooks/useArrows.svelte'
 	import { poseToDirection } from '../transform'
+	import { BatchedArrow } from '../three/BatchedArrow'
+	import { T } from '@threlte/core'
 
 	interface Props {
 		worldObjects: WorldObject[]
@@ -15,38 +16,36 @@
 
 	let { worldObjects }: Props = $props()
 
-	const batchedArrow = useArrows()
 	const currentArrows: Record<string, { id: number; arrow: WorldObject }> = {}
+	const arrowBatches = $state<Record<string, BatchedArrow>>({})
 
 	const arrows = $derived(worldObjects.filter((object) => object.metadata?.shape === 'arrow'))
 	const objects = $derived(worldObjects.filter((object) => object.metadata?.shape !== 'arrow'))
 
 	const getArrows = () => ({ ...currentArrows })
-	const getArrow = (uuid: string) => currentArrows[uuid]
-	const removeArrow = (uuid: string) => delete currentArrows[uuid]
+	const getArrow = (referenceFrame: string, uuid: string) =>
+		currentArrows[`${referenceFrame}:${uuid}`]
+
+	const removeArrow = (referenceFrame: string, uuid: string) => {
+		delete currentArrows[`${referenceFrame}:${uuid}`]
+	}
+
 	const setArrow = (arrow: WorldObject) => {
-		const currentArrow = getArrow(arrow.uuid)
+		const referenceFrame = arrow.referenceFrame ?? 'world'
+		const currentArrow = getArrow(referenceFrame, arrow.uuid)
 		const color = arrow.metadata?.color ?? new Color('yellow')
-		if (currentArrow) {
-			batchedArrow.updateArrow(
-				currentArrow.id,
-				poseToDirection(arrow.pose),
-				new Vector3(arrow.pose.x, arrow.pose.y, arrow.pose.z),
-				0.1,
-				color,
-				true
-			)
+		const direction = poseToDirection(arrow.pose)
+		const position = new Vector3(arrow.pose.x, arrow.pose.y, arrow.pose.z)
+
+		arrowBatches[referenceFrame] ??= new BatchedArrow()
+		const batchedArrow = arrowBatches[referenceFrame]
 
-			currentArrows[arrow.uuid] = { id: currentArrow.id, arrow }
+		if (currentArrow) {
+			batchedArrow.updateArrow(currentArrow.id, direction, position, 0.1, color, true)
+			currentArrows[`${referenceFrame}:${arrow.uuid}`] = { id: currentArrow.id, arrow }
 		} else {
-			const id = batchedArrow.addArrow(
-				poseToDirection(arrow.pose),
-				new Vector3(arrow.pose.x, arrow.pose.y, arrow.pose.z),
-				0.1,
-				color,
-				true
-			)
-			currentArrows[arrow.uuid] = { id, arrow }
+			const id = batchedArrow.addArrow(direction, position, 0.1, color, true)
+			currentArrows[`${referenceFrame}:${arrow.uuid}`] = { id, arrow }
 		}
 	}
 
@@ -58,12 +57,24 @@
 		})
 
 		Object.values(toRemove).forEach(({ id, arrow }) => {
-			batchedArrow.removeArrow(id)
-			removeArrow(arrow.uuid)
+			const referenceFrame = arrow.referenceFrame ?? 'world'
+			arrowBatches[referenceFrame].removeArrow(id)
+			removeArrow(referenceFrame, arrow.uuid)
 		})
 	})
 </script>
 
+{#each Object.entries(arrowBatches) as [referenceFrame, batch] (referenceFrame)}
+	<Portal id={referenceFrame}>
+		<T
+			name={batch.object3d.name}
+			is={batch.object3d}
+			dispose={false}
+			bvh={{ enabled: false }}
+		/>
+	</Portal>
+{/each}
+
 {#each objects as object (object.uuid)}
 	<Portal id={object.referenceFrame}>
 		<Frame

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

@@ -2,7 +2,6 @@ import { Vector3 } from 'three';
 import { WorldObject, type PointsGeometry } from '../WorldObject.svelte';
 type ConnectionStatus = 'connecting' | 'open' | 'closed';
 interface Context {
-    addPoints(worldObject: WorldObject<PointsGeometry>): void;
     points: WorldObject<PointsGeometry>[];
     frames: WorldObject[];
     lines: WorldObject[];
@@ -16,6 +15,8 @@ interface Context {
         lookAt: Vector3;
         animate: boolean;
     } | undefined;
+    addPoints(worldObject: WorldObject<PointsGeometry>): void;
+    addMesh(worldObject: WorldObject): void;
     clearCamera: () => void;
 }
 export declare const provideDrawAPI: () => void;

package/dist/hooks/useDrawAPI.svelte.js

@@ -112,13 +112,7 @@ export const provideDrawAPI = () => {
             result.pose = data.center;
             return;
         }
-        const geometry = {
-            label: data.label,
-            center: undefined,
-            geometryType: {
-                case: undefined,
-            },
-        };
+        const geometry = createGeometry();
         if ('mesh' in data) {
             geometry.geometryType.case = 'mesh';
             geometry.geometryType.value = data.mesh;
@@ -443,9 +437,6 @@ export const provideDrawAPI = () => {
         get points() {
             return points;
         },
-        addPoints(worldObject) {
-            points.push(worldObject);
-        },
         get lines() {
             return lines;
         },
@@ -467,6 +458,12 @@ export const provideDrawAPI = () => {
         get camera() {
             return camera;
         },
+        addPoints(worldObject) {
+            points.push(worldObject);
+        },
+        addMesh(worldObject) {
+            meshes.push(worldObject);
+        },
         clearCamera: () => {
             camera = undefined;
         },

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

@@ -1,3 +1,4 @@
+export declare const ENVIRONMENT_CONTEXT_KEY: unique symbol;
 interface Environemnt {
     viewerMode: 'edit' | 'monitor';
     isStandalone: boolean;
@@ -5,6 +6,7 @@ interface Environemnt {
 interface Context {
     current: Environemnt;
 }
+export declare const createEnvironment: () => Context;
 export declare const provideEnvironment: () => Context;
 export declare const useEnvironment: () => Context;
 export {};

package/dist/hooks/useEnvironment.svelte.js

@@ -1,19 +1,23 @@
 import { getContext, setContext } from 'svelte';
-const key = Symbol('environment');
+export const ENVIRONMENT_CONTEXT_KEY = Symbol('environment');
 const defaults = () => ({
     viewerMode: 'monitor',
     isStandalone: true,
 });
-export const provideEnvironment = () => {
+export const createEnvironment = () => {
     const environment = $state(defaults());
     const context = {
         get current() {
             return environment;
         },
     };
-    setContext(key, context);
+    return context;
+};
+export const provideEnvironment = () => {
+    const context = createEnvironment();
+    setContext(ENVIRONMENT_CONTEXT_KEY, context);
     return context;
 };
 export const useEnvironment = () => {
-    return getContext(key);
+    return getContext(ENVIRONMENT_CONTEXT_KEY);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viamrobotics/motion-tools",
-  "version": "0.14.12",
+  "version": "0.15.0",
   "description": "Motion visualization with Viam",
   "license": "Apache-2.0",
   "type": "module",