Hide robot truck outside robot modes

Author: Nico-eve

packages/robot/src/components/navigation-scene-lifecycle.tsx

@@ -391,7 +391,7 @@ function getCurrentSceneGraph(): SceneGraph {
   }
 }
 
-function removePascalTruckNodesFromCurrentScene() {
+function removeRuntimePascalTruckNodesFromCurrentScene() {
   const sceneState = useScene.getState()
   const truckIds = Object.entries(sceneState.nodes)
     .filter(([, node]) => isPascalTruckNode(node) && !hasPascalTruckManualPlacement(node))
@@ -402,11 +402,46 @@ function removePascalTruckNodesFromCurrentScene() {
   }
 }
 
+function hidePascalTruckNodesOutsideRobotMode() {
+  const sceneState = useScene.getState()
+  const truckIdsToDelete: AnyNodeId[] = []
+  const truckUpdates: { id: AnyNodeId; data: Partial<AnyNode> }[] = []
+
+  for (const [nodeId, node] of Object.entries(sceneState.nodes)) {
+    if (!isPascalTruckNode(node)) {
+      continue
+    }
+
+    const truckNodeId = nodeId as AnyNodeId
+    if (hasPascalTruckManualPlacement(node)) {
+      if (node.visible !== false) {
+        truckUpdates.push({ id: truckNodeId, data: { visible: false } })
+      }
+
+      const truckObject = sceneRegistry.nodes.get(nodeId)
+      if (truckObject?.visible) {
+        truckObject.visible = false
+        truckObject.updateMatrixWorld(true)
+      }
+      continue
+    }
+
+    truckIdsToDelete.push(truckNodeId)
+  }
+
+  if (truckUpdates.length > 0) {
+    sceneState.updateNodes(truckUpdates)
+  }
+  if (truckIdsToDelete.length > 0) {
+    sceneState.deleteNodes(truckIdsToDelete)
+  }
+}
+
 function ensurePascalTruckNodeInCurrentScene() {
   const sceneGraph = getCurrentSceneGraph()
   const stripped = stripPascalTruckFromSceneGraph(sceneGraph)
   const baseGraph = stripped.sceneGraph ?? sceneGraph
-  removePascalTruckNodesFromCurrentScene()
+  removeRuntimePascalTruckNodesFromCurrentScene()
 
   const { node, parentId } = buildPascalTruckNodeForScene(baseGraph, stripped.truckNode)
   useScene.getState().createNode(node as AnyNode, parentId ? (parentId as AnyNodeId) : undefined)
@@ -621,14 +656,14 @@ export function NavigationSceneLifecycle() {
     } else if (previousRobotMode === 'task' && robotMode !== 'task') {
       restoreTaskModeSceneSnapshot({ clearSnapshot: true, mode: 'full' })
       if (robotMode === null) {
-        removePascalTruckNodesFromCurrentScene()
+        hidePascalTruckNodesOutsideRobotMode()
       } else {
         ensurePascalTruckNodeInCurrentScene()
       }
     } else if (previousRobotMode !== null && robotMode === null) {
-      removePascalTruckNodesFromCurrentScene()
+      hidePascalTruckNodesOutsideRobotMode()
     } else if (robotMode === null) {
-      removePascalTruckNodesFromCurrentScene()
+      hidePascalTruckNodesOutsideRobotMode()
     }
 
     previousRobotModeRef.current = robotMode

packages/robot/src/editor-scene.ts

@@ -34,17 +34,25 @@ export function prepareNavigationSceneGraph<T extends SceneGraphWithCollections>
   for (const [nodeId, node] of Object.entries(baseGraph.nodes)) {
     if (isPascalTruckNode(node)) {
       const localTruckAsset = getPascalTruckLocalAsset()
+      const shouldStripTruckMetadata =
+        hasTransientNavigationMetadata(node) || getItemMoveVisualState(node.metadata) !== null
       if (
         node.asset?.src !== localTruckAsset.src ||
-        node.asset?.thumbnail !== localTruckAsset.thumbnail
+        node.asset?.thumbnail !== localTruckAsset.thumbnail ||
+        node.visible !== false ||
+        shouldStripTruckMetadata
       ) {
         nextNodes ??= { ...baseGraph.nodes }
         nextNodes[nodeId] = {
           ...node,
           asset: localTruckAsset,
+          metadata: shouldStripTruckMetadata
+            ? setItemMoveVisualState(stripTransientMetadata(node.metadata), null)
+            : node.metadata,
+          visible: false,
         }
-        continue
       }
+      continue
     }
 
     if (hasTransientNavigationMetadata(node)) {

packages/robot/src/lib/pascal-truck.ts

@@ -623,7 +623,7 @@ export function buildPascalTruckNodeForScene(
           preserveManualPlacement && Array.isArray(sourceTruckNode.scale)
             ? sourceTruckNode.scale
             : seededTransform.scale,
-        visible: sourceTruckNode.visible ?? true,
+        visible: true,
       }
     : {
         asset: truckAsset,