@viamrobotics/motion-tools 1.19.1 → 1.22.0

package/dist/components/StaticGeometries.svelte

@@ -8,22 +8,15 @@
 <script lang="ts">
 	import type { Entity } from 'koota'
 
-	import { TransformControls } from '@threlte/extras'
 	import { PressedKeys } from 'runed'
 	import { SvelteSet } from 'svelte/reactivity'
-	import { Quaternion, Vector3 } from 'three'
 
 	import { traits, useWorld } from '../ecs'
-	import { useTransformControls } from '../hooks/useControls.svelte'
 	import { useSelectedEntity } from '../hooks/useSelection.svelte'
-	import { useSettings } from '../hooks/useSettings.svelte'
-	import { quaternionToPose, vector3ToPose } from '../transform'
 
 	import Frame from './Entities/Frame.svelte'
 
 	const world = useWorld()
-	const settings = useSettings()
-	const transformControls = useTransformControls()
 	const selectedEntity = useSelectedEntity()
 
 	const entities = new SvelteSet<Entity>()
@@ -31,11 +24,6 @@
 		[...entities].find((entity) => entity === selectedEntity.current)
 	)
 
-	const mode = $derived(settings.current.transformMode)
-
-	const quaternion = new Quaternion()
-	const vector3 = new Vector3()
-
 	const keys = new PressedKeys()
 
 	keys.onKeys('=', () => {
@@ -43,7 +31,8 @@
 			traits.Name(`custom geometry ${++index}`),
 			traits.Pose,
 			traits.Box({ x: 100, y: 100, z: 100 }),
-			traits.Removable
+			traits.Removable,
+			traits.Transformable
 		)
 
 		entities.add(entity)
@@ -57,50 +46,8 @@
 			selectedEntity.set()
 		}
 	})
-
-	$effect(() => {
-		settings.current.transforming = selectedCustomGeometry !== undefined
-	})
 </script>
 
 {#each entities as entity (entity)}
-	<Frame {entity}>
-		{#snippet children({ ref })}
-			{#if selectedEntity.current === entity}
-				{#key mode}
-					<TransformControls
-						object={ref}
-						{mode}
-						translationSnap={settings.current.snapping ? 0.1 : undefined}
-						rotationSnap={settings.current.snapping ? Math.PI / 24 : undefined}
-						scaleSnap={settings.current.snapping ? 0.1 : undefined}
-						onmouseDown={() => {
-							transformControls.setActive(true)
-						}}
-						onmouseUp={() => {
-							transformControls.setActive(false)
-
-							const pose = entity.get(traits.Pose)
-							const box = entity.get(traits.Box)
-
-							if (pose && mode === 'translate') {
-								vector3ToPose(ref.getWorldPosition(vector3), pose)
-								entity.set(traits.Pose, pose)
-							} else if (pose && mode === 'rotate') {
-								quaternionToPose(ref.getWorldQuaternion(quaternion), pose)
-								ref.quaternion.copy(quaternion)
-								entity.set(traits.Pose, pose)
-							} else if (box && mode === 'scale') {
-								box.x *= ref.scale.x
-								box.y *= ref.scale.y
-								box.z *= ref.scale.z
-								entity.set(traits.Box, box)
-								ref.scale.setScalar(1)
-							}
-						}}
-					/>
-				{/key}
-			{/if}
-		{/snippet}
-	</Frame>
+	<Frame {entity} />
 {/each}

package/dist/components/overlay/AddRelationship.svelte

@@ -4,20 +4,30 @@
 
 	import { relations, traits, useQuery, useTrait } from '../../ecs'
 	import { SubEntityLinkType } from '../../ecs/relations'
+	import { useDrawService } from '../../hooks/useDrawService.svelte'
 
 	interface Props {
 		entity: Entity | undefined
 	}
 
 	const { entity }: Props = $props()
+	const drawService = useDrawService()
 
 	const allEntities = useQuery(traits.Name)
 	const name = useTrait(() => entity, traits.Name)
+	const drawServiceAPI = useTrait(() => entity, traits.DrawServiceAPI)
+	const isServiceManaged = $derived(!!drawServiceAPI.current)
+
 	const entityNames = $derived.by(() => {
 		const currentEntityName = name.current
 		return allEntities.current
-			.map((e: Entity) => e.get(traits.Name))
-			.filter((n: string | undefined): n is string => n !== undefined && n !== currentEntityName)
+			.filter((e: Entity) => {
+				const entityName = e.get(traits.Name)
+				if (!entityName || entityName === currentEntityName) return false
+				if (isServiceManaged) return !!e.get(traits.DrawServiceAPI)
+				return true
+			})
+			.map((e: Entity) => e.get(traits.Name)!)
 			.toSorted()
 	})
 
@@ -43,7 +53,19 @@
 		const selectedEntity = allEntities.current.find(
 			(e: Entity) => e.get(traits.Name) === selectedRelationshipEntity
 		)
-		if (selectedEntity) {
+		if (!selectedEntity) return
+
+		if (isServiceManaged) {
+			const sourceUuid = entity.get(traits.UUID)
+			const targetUuid = selectedEntity.get(traits.UUID)
+			if (!sourceUuid || !targetUuid) return
+			void drawService.createRelationship(
+				sourceUuid,
+				targetUuid,
+				linkType ?? '',
+				relationshipFormula
+			)
+		} else {
 			entity.add(
 				relations.SubEntityLink(selectedEntity, {
 					indexMapping: relationshipFormula,