Add Geometry.worldTransform

nicklockwood · nicklockwood · commit 5e4c73daa116 · 2021-11-01T23:45:09.000Z
diff --git a/ShapeScript/Geometry.swift b/ShapeScript/Geometry.swift
@@ -17,6 +17,7 @@ public final class Geometry: Hashable {
     public let children: [Geometry]
     public let isOpaque: Bool // Computed
     public let sourceLocation: SourceLocation?
+    public private(set) weak var parent: Geometry?
 
     public func hash(into hasher: inout Hasher) {
         hasher.combine(type)
@@ -232,6 +233,9 @@ public final class Geometry: Hashable {
 
         // Must be set after cache key is generated
         self.isOpaque = isOpaque
+
+        // Must be set after all other properties
+        children.forEach { $0.parent = self }
     }
 }
 
@@ -265,6 +269,10 @@ public extension Geometry {
         }
     }
 
+    var worldTransform: Transform {
+        (parent?.worldTransform ?? .identity) * transform
+    }
+
     internal func gatherNamedObjects(_ dictionary: inout [String: Geometry]) {
         if let name = self.name {
             dictionary[name] = self

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public final class Geometry: Hashable {`
`17`	`17`	`public let children: [Geometry]`
`18`	`18`	`public let isOpaque: Bool // Computed`
`19`	`19`	`public let sourceLocation: SourceLocation?`
	`20`	`+ public private(set) weak var parent: Geometry?`
`20`	`21`
`21`	`22`	`public func hash(into hasher: inout Hasher) {`
`22`	`23`	`hasher.combine(type)`
`@@ -232,6 +233,9 @@ public final class Geometry: Hashable {`
`232`	`233`
`233`	`234`	`// Must be set after cache key is generated`
`234`	`235`	`self.isOpaque = isOpaque`
	`236`	`+`
	`237`	`+ // Must be set after all other properties`
	`238`	`+ children.forEach { $0.parent = self }`
`235`	`239`	`}`
`236`	`240`	`}`
`237`	`241`
`@@ -265,6 +269,10 @@ public extension Geometry {`
`265`	`269`	`}`
`266`	`270`	`}`
`267`	`271`
	`272`	`+ var worldTransform: Transform {`
	`273`	`+ (parent?.worldTransform ?? .identity) * transform`
	`274`	`+ }`
	`275`	`+`
`268`	`276`	`internal func gatherNamedObjects(_ dictionary: inout [String: Geometry]) {`
`269`	`277`	`if let name = self.name {`
`270`	`278`	`dictionary[name] = self`