Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/happy-parks-say.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@viamrobotics/motion-tools': patch
---

Add useWorldState hook
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"@tanstack/svelte-query-devtools": "5.84.0",
"@testing-library/jest-dom": "6.6.4",
"@testing-library/svelte": "5.2.8",
"@thi.ng/paths": "^5.2.21",
"@threlte/core": "8.1.4",
"@threlte/extras": "9.4.4",
"@threlte/rapier": "3.1.5",
Expand All @@ -53,8 +54,8 @@
"@typescript-eslint/eslint-plugin": "8.39.0",
"@typescript-eslint/parser": "8.39.0",
"@viamrobotics/prime-core": "0.1.5",
"@viamrobotics/sdk": "0.46.0",
"@viamrobotics/svelte-sdk": "0.4.5",
"@viamrobotics/sdk": "0.50.0",
"@viamrobotics/svelte-sdk": "0.6.0",
"@vitejs/plugin-basic-ssl": "2.1.0",
"@zag-js/svelte": "1.21.1",
"@zag-js/tree-view": "1.21.1",
Expand Down
64 changes: 53 additions & 11 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 13 additions & 1 deletion src/lib/WorldObject.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Geometry, Pose } from '@viamrobotics/sdk'
import type { Geometry, Pose, TransformWithUUID } from '@viamrobotics/sdk'
import { BatchedMesh, Box3, MathUtils, Object3D, Vector3, type ColorRepresentation } from 'three'
import { createPose } from './transform'

Expand Down Expand Up @@ -39,3 +39,15 @@ export class WorldObject<T extends Geometries = Geometries> {
this.metadata = metadata ?? {}
}
}

export const fromTransform = (transform: TransformWithUUID) => {
const metadata: Metadata = { ...transform.metadata?.fields }
const worldObject = new WorldObject(
transform.referenceFrame,
transform.poseInObserverFrame?.pose,
transform.poseInObserverFrame?.referenceFrame,
transform.physicalObject?.geometryType,
metadata
)
return worldObject
}
1 change: 1 addition & 0 deletions src/lib/components/SceneProviders.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
providePointclouds(() => partID.current)
provideMotionClient(() => partID.current)
provideObjects()

const { focus } = provideSelection()
</script>

Expand Down
4 changes: 3 additions & 1 deletion src/lib/components/Tree/TreeContainer.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import Settings from './Settings.svelte'
import Logs from './Logs.svelte'
import { useDraggable } from '$lib/hooks/useDraggable.svelte'
import { useWorldStates } from '$lib/hooks/useWorldState.svelte'

const { ...rest } = $props()

Expand All @@ -17,6 +18,7 @@
const selected = useSelected()
const objects = useObjects()
const draggable = useDraggable('treeview')
const worldStates = useWorldStates()

let rootNode = $state<TreeNode>({
id: 'world',
Expand All @@ -25,7 +27,7 @@
href: '/',
})

const nodes = $derived(buildTreeNodes(objects.current))
const nodes = $derived(buildTreeNodes(objects.current, worldStates.current))

$effect.pre(() => {
if (!isEqual(rootNode.children, nodes)) {
Expand Down
32 changes: 31 additions & 1 deletion src/lib/components/Tree/buildTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ export interface TreeNode {
/**
* Creates a tree representing parent child / relationships from a set of frames.
*/
export const buildTreeNodes = (objects: WorldObject[]): TreeNode[] => {
export const buildTreeNodes = (
objects: WorldObject[],
worldStates: { name: string; objects: WorldObject[] }[]
): TreeNode[] => {
const nodeMap = new Map<string, TreeNode>()
const rootNodes = []

Expand Down Expand Up @@ -39,5 +42,32 @@ export const buildTreeNodes = (objects: WorldObject[]): TreeNode[] => {
}
}

for (const worldState of worldStates) {
const node: TreeNode = {
name: worldState.name,
id: worldState.name,
children: [],
href: `/world-state/${worldState.name}`,
}

console.log('worldState', worldState)

for (const object of worldState.objects) {
const child: TreeNode = {
name: object.name,
id: object.uuid,
children: [],
href: `/world-state/${worldState.name}/${object.name}`,
}

nodeMap.set(object.name, child)
node.children?.push(child)
console.log('child', child)
}

nodeMap.set(worldState.name, node)
rootNodes.push(node)
}

return rootNodes
}
7 changes: 7 additions & 0 deletions src/lib/components/WorldObjects.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@
import Pointcloud from './Pointcloud.svelte'
import Model from './WorldObject.svelte'
import Label from './Label.svelte'
import { useWorldStates } from '$lib/hooks/useWorldState.svelte'
import WorldState from './WorldState.svelte'

const points = usePointClouds()
const drawAPI = useDrawAPI()
const frames = useFrames()
const geometries = useGeometries()
const worldStates = useWorldStates()
</script>

{#each frames.current as object (object.uuid)}
Expand Down Expand Up @@ -65,6 +68,10 @@
</Portal>
{/each}

{#each worldStates.current as { name, objects } (name)}
<WorldState {objects} />
{/each}

{#each points.current as object (object.uuid)}
<Portal id={object.referenceFrame}>
<Pointcloud {object}>
Expand Down
28 changes: 28 additions & 0 deletions src/lib/components/WorldState.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<script lang="ts">
import Frame from './Frame.svelte'
import Label from './Label.svelte'
import Portal from './portal/Portal.svelte'
import PortalTarget from './portal/PortalTarget.svelte'
import { WorldObject } from '$lib/WorldObject'

interface Props {
objects: WorldObject[]
}

let { objects }: Props = $props()
</script>

{#each objects as object (object.uuid)}
<Portal id={object.referenceFrame}>
<Frame
uuid={object.uuid}
name={object.name}
pose={object.pose}
geometry={object.geometry}
metadata={object.metadata}
>
<PortalTarget id={object.name} />
<Label text={object.name} />
</Frame>
</Portal>
{/each}
Loading
Loading