fix up code model connection a little

src/App.tsx

@@ -104,7 +104,7 @@ function App() {
       const geos: ViewerArtifact[] =
         programMemory?.return?.flatMap(
           ({ name }: { name: string }) =>
-            processShownObjects(programMemory)(programMemory?.root?.[name]) ||
+            processShownObjects(programMemory, programMemory?.root?.[name]) ||
             []
         ) || []
       setGeoArray(geos)
@@ -263,7 +263,7 @@ function RenderViewerArtifacts({
       <Line
         geo={geo}
         sourceRange={sourceRange}
-        forceHighlight={forceHighlight}
+        forceHighlight={forceHighlight || editorCursor}
       />
     )
   }
@@ -273,7 +273,7 @@ function RenderViewerArtifacts({
         <RenderViewerArtifacts
           artifact={artifact}
           key={index}
-          forceHighlight={editorCursor}
+          forceHighlight={forceHighlight || editorCursor}
         />
       ))}
     </>

src/lang/executor.ts

@@ -198,45 +198,48 @@ export type ViewerArtifact =
       children: ViewerArtifact[]
     }
 
+type PreviousTransforms = {
+  rotation: [number, number, number]
+  transform: [number, number, number]
+}[]
+
 export const processShownObjects =
-  (programMemory: ProgramMemory) =>
+  (
-  (geoMeta: Path[] | Transform): ViewerArtifact[] => {
+    programMemory: ProgramMemory,
+    geoMeta: Path[] | Transform,
+    previousTransforms: PreviousTransforms = []
+  ): ViewerArtifact[] => {
     if (Array.isArray(geoMeta)) {
-      return geoMeta.map(({ geo, sourceRange }) => ({
+      return geoMeta.map(({ geo, sourceRange }) => {
-        type: 'geo',
-        geo,
-        sourceRange,
-      }))
-    } else if (geoMeta.type === 'transform') {
-      console.log('transform', geoMeta, programMemory)
-      const geos = processShownObjects(programMemory)(
-        programMemory.root[geoMeta.id]
-      ).map((arg): ViewerArtifact => {
-        if (arg.type !== 'geo')
-          throw new Error('transform must be applied to geo')
-        const { geo, sourceRange } = arg
         const newGeo = geo.clone()
-        newGeo.rotateX(geoMeta.rotation[0])
+        previousTransforms.forEach(({ rotation, transform }) => {
-        newGeo.rotateY(geoMeta.rotation[1])
+          newGeo.rotateX(rotation[0])
-        newGeo.rotateZ(geoMeta.rotation[2])
+          newGeo.rotateY(rotation[1])
-        newGeo.translate(
+          newGeo.rotateZ(rotation[2])
-          geoMeta.transform[0],
+          newGeo.translate(transform[0], transform[1], transform[2])
-          geoMeta.transform[1],
+        })
-          geoMeta.transform[2]
+
-        )
         return {
           type: 'geo',
-          sourceRange,
           geo: newGeo,
+          sourceRange,
         }
       })
-      return [
+    } else if (geoMeta.type === 'transform') {
-        {
+      const referencedVar = programMemory.root[geoMeta.id]
-          type: 'parent',
+      const parentArtifact: ViewerArtifact = {
-          sourceRange: geoMeta.sourceRange,
+        type: 'parent',
-          children: geos,
+        sourceRange: geoMeta.sourceRange,
-        },
+        children: processShownObjects(programMemory, referencedVar, [
-      ]
+          ...previousTransforms,
+          {
+            rotation: geoMeta.rotation,
+            transform: geoMeta.transform,
+          },
+        ]),
+      }
+      return [parentArtifact]
     }
+
     throw new Error('Unknown geoMeta type')
   }