Track named objects

nicklockwood · nicklockwood · commit 640d456280c1 · 2021-11-01T23:45:09.000Z
diff --git a/ShapeScript/EvaluationContext.swift b/ShapeScript/EvaluationContext.swift
@@ -49,8 +49,16 @@ final class EvaluationContext {
     var transform = Transform.identity
     var childTransform = Transform.identity
     var childTypes: Set<ValueType> = [.mesh]
-    var children = [Value]()
     var name: String = ""
+    var namedObjects: [String: Geometry] = [:]
+    var children = [Value]() {
+        didSet {
+            for case let .mesh(geometry) in children {
+                geometry.gatherNamedObjects(&namedObjects)
+            }
+        }
+    }
+
     var random: RandomSequence
     var detail = 16
     var font: String = ""
@@ -92,6 +100,7 @@ final class EvaluationContext {
         background = parent.background
         material = parent.material
         childTypes = parent.childTypes
+        namedObjects = parent.namedObjects
         random = parent.random
         detail = parent.detail
         font = parent.font
@@ -132,6 +141,7 @@ final class EvaluationContext {
     func pushDefinition() -> EvaluationContext {
         let new = EvaluationContext(parent: self)
         new.name = name
+        new.namedObjects = namedObjects
         new.transform = transform
         new.opacity = opacity
         new.childTypes = ValueType.any
diff --git a/ShapeScript/Geometry.swift b/ShapeScript/Geometry.swift
@@ -265,6 +265,13 @@ public extension Geometry {
         }
     }
 
+    internal func gatherNamedObjects(_ dictionary: inout [String: Geometry]) {
+        if let name = self.name {
+            dictionary[name] = self
+        }
+        children.forEach { $0.gatherNamedObjects(&dictionary) }
+    }
+
     var childDebug: Bool {
         debug || children.contains(where: { $0.childDebug })
     }

Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,13 @@ public extension Geometry {`
`265`	`265`	`}`
`266`	`266`	`}`
`267`	`267`
	`268`	`+ internal func gatherNamedObjects(_ dictionary: inout [String: Geometry]) {`
	`269`	`+ if let name = self.name {`
	`270`	`+ dictionary[name] = self`
	`271`	`+ }`
	`272`	`+ children.forEach { $0.gatherNamedObjects(&dictionary) }`
	`273`	`+ }`
	`274`	`+`
`268`	`275`	`var childDebug: Bool {`
`269`	`276`	`debug \|\| children.contains(where: { $0.childDebug })`
`270`	`277`	`}`