Add common Geometry protocol

Author: tomasf

Sources/Manifold3D/CrossSection/CrossSection+Operations.swift

@@ -11,7 +11,7 @@ public extension CrossSection {
         Self(crossSection.Boolean(other.crossSection, op.manifoldOp))
     }
 
-    func warp(_ function: @escaping (V) -> V) -> Self {
+    func warp(_ function: @escaping (Vector) -> Vector) -> Self {
         Self(bridge.Warp(crossSection) {
             $0.pointee = function(.init($0.pointee)).vec2
         })
@@ -35,7 +35,7 @@ public extension CrossSection {
         Self(manifold.CrossSection.Hull(.init(crossSections.map(\.crossSection))))
     }
 
-    static func hull(_ points: [V]) -> Self {
+    static func hull(_ points: [Vector]) -> Self {
         Self(manifold.CrossSection.Hull(.init(points.map(\.vec2))))
     }
 }
@@ -45,7 +45,7 @@ public extension CrossSection {
         height: Double,
         divisions: Int = 0,
         twist twistDegrees: Double = 0,
-        scaleTop: V? = nil
+        scaleTop: Vector? = nil
     ) -> Manifold<V3> {
         Manifold(manifold.Manifold.Extrude(
             crossSection.ToPolygons(), height, Int32(divisions), twistDegrees, scaleTop?.vec2 ?? .init(1, 1))

Sources/Manifold3D/CrossSection/CrossSection+Properties.swift

@@ -5,7 +5,7 @@ public extension CrossSection {
         crossSection.IsEmpty()
     }
 
-    var bounds: (min: V, max: V) {
+    var bounds: (min: Vector, max: Vector) {
         let box = crossSection.Bounds()
         return (.init(box.min), .init(box.max))
     }

Sources/Manifold3D/CrossSection/CrossSection+Shapes.swift

@@ -5,7 +5,7 @@ public extension CrossSection {
         Self(manifold.CrossSection())
     }
 
-    static func square(size: V) -> Self {
+    static func square(size: Vector) -> Self {
         Self(manifold.CrossSection.Square(size.vec2))
     }
 

Sources/Manifold3D/CrossSection/CrossSection+Transforms.swift

@@ -1,23 +1,23 @@
 import ManifoldCPP
 
 public extension CrossSection {
-    func transform<M: Matrix2x3>(_ transform: M) -> Self {
+    func transform(_ transform: any Matrix2x3) -> Self {
         Self(crossSection.Transform(transform.mat2x3))
     }
 
-    func translate(_ translation: V) -> Self {
+    func translate(_ translation: Vector) -> Self {
         Self(crossSection.Translate(translation.vec2))
     }
 
-    func scale(_ scale: V) -> Self {
+    func scale(_ scale: Vector) -> Self {
         Self(crossSection.Scale(scale.vec2))
     }
 
     func rotate(_ degrees: Double) -> Self {
         Self(crossSection.Rotate(degrees))
     }
 
-    func mirror(_ axis: V) -> Self {
+    func mirror(_ axis: Vector) -> Self {
         Self(crossSection.Mirror(axis.vec2))
     }
 }

Sources/Manifold3D/CrossSection/CrossSection.swift

@@ -1,7 +1,7 @@
 import ManifoldCPP
 import Cxx
 
-public struct CrossSection<V: Vector2>: @unchecked Sendable {
+public struct CrossSection<Vector: Vector2>: Geometry, @unchecked Sendable {
     internal let crossSection: manifold.CrossSection
 
     internal init(_ crossSection: manifold.CrossSection) {
@@ -10,11 +10,11 @@ public struct CrossSection<V: Vector2>: @unchecked Sendable {
 }
 
 public extension CrossSection {
-    init(polygons: [Polygon<V>], fillRule: FillRule) {
+    init(polygons: [Polygon<Vector>], fillRule: FillRule) {
         self.init(manifold.CrossSection(Polygon.manifoldPolygons(polygons), fillRule.manifoldFillRule))
     }
 
-    func polygons() -> [Polygon<V>] {
+    func polygons() -> [Polygon<Vector>] {
         crossSection.ToPolygons().map { Polygon($0) }
     }
 

Sources/Manifold3D/Geometry.swift

@@ -0,0 +1,30 @@
+import Foundation
+
+public protocol Geometry<Vector>: Sendable {
+    associatedtype Vector
+    associatedtype Rotation
+    associatedtype Transform
+
+    static var empty: Self { get }
+    init(composing: [Self])
+    func decompose() -> [Self]
+
+    var isEmpty: Bool { get }
+    var bounds: (min: Vector, max: Vector) { get }
+    var vertexCount: Int { get }
+
+    func transform(_ transform: Transform) -> Self
+    func translate(_ translation: Vector) -> Self
+    func scale(_ scale: Vector) -> Self
+    func rotate(_ rotation: Rotation) -> Self
+
+    func boolean(_ op: BooleanOperation, with other: Self) -> Self
+    static func boolean(_ op: BooleanOperation, with children: [Self]) -> Self
+
+    func hull() -> Self
+    static func hull(_ children: [Self]) -> Self
+    static func hull(_ points: [Vector]) -> Self
+
+    func warp(_ function: @escaping (Vector) -> Vector) -> Self
+    func simplify(epsilon: Double) -> Self
+}

Sources/Manifold3D/Manifold/Manifold+Operations.swift

@@ -10,7 +10,7 @@ public extension Manifold {
         Self(mesh.Boolean(other.mesh, op.manifoldOp))
     }
 
-    func warp(_ function: @escaping (V) -> V) -> Manifold {
+    func warp(_ function: @escaping (Vector) -> Vector) -> Manifold {
         Self(bridge.Warp(mesh) {
             $0.pointee = function(.init($0.pointee)).vec3
         })
@@ -26,7 +26,7 @@ public extension Manifold {
         Self(manifold.Manifold.Hull(.init(meshes.map(\.mesh))))
     }
 
-    static func hull(_ points: [V]) -> Self {
+    static func hull(_ points: [Vector]) -> Self {
         Self(manifold.Manifold.Hull(.init(points.map(\.vec3))))
     }
 }
@@ -37,12 +37,12 @@ public extension Manifold {
         return (Manifold(results.first), Manifold(results.second))
     }
 
-    func split(by plane: V, originOffset: Double) -> (Manifold, Manifold) {
+    func split(by plane: Vector, originOffset: Double) -> (Manifold, Manifold) {
         let results = mesh.SplitByPlane(plane.vec3, originOffset)
         return (Manifold(results.first), Manifold(results.second))
     }
 
-    func trim(by plane: V, originOffset: Double) -> Manifold {
+    func trim(by plane: Vector, originOffset: Double) -> Manifold {
         Manifold(mesh.TrimByPlane(plane.vec3, originOffset))
     }
 }

Sources/Manifold3D/Manifold/Manifold+Properties.swift

@@ -5,7 +5,7 @@ public extension Manifold {
         mesh.IsEmpty()
     }
 
-    var bounds: (min: V, max: V) {
+    var bounds: (min: Vector, max: Vector) {
         let box = mesh.BoundingBox()
         return (.init(box.min), .init(box.max))
     }

Sources/Manifold3D/Manifold/Manifold+Shapes.swift

@@ -23,11 +23,11 @@ public extension Manifold {
     }
 
     static func levelSet(
-        bounds: (V, V),
+        bounds: (Vector, Vector),
         edgeLength: Double,
         level: Double = 0,
         tolerance: Double = -1,
-        functor: @escaping (V) -> Double
+        functor: @escaping (Vector) -> Double
     ) -> Self {
         Self(bridge.LevelSet({ functor(.init($0)) }, .init(bounds.0.vec3, bounds.1.vec3), edgeLength, level, tolerance, true))
     }

Sources/Manifold3D/Manifold/Manifold+Smoothing.swift

@@ -3,7 +3,7 @@ import ManifoldCPP
 import ManifoldBridge
 
 public extension Manifold {
-    init(meshGL: MeshGL<V>, smoothEdges: [MeshGL<V>.EdgeReference: Double]) {
+    init(meshGL: MeshGL<Vector>, smoothEdges: [MeshGL<Vector>.EdgeReference: Double]) {
         self = Self(manifold.Manifold.Smooth(meshGL.meshGL, .init(smoothEdges.map {
             manifold.Smoothness(halfedge: $0.key.index, smoothness: $0.value)
         })))

Sources/Manifold3D/Manifold/Manifold+Transforms.swift

@@ -1,23 +1,23 @@
 import ManifoldCPP
 
 public extension Manifold {
-    func transform<T: Matrix3x4>(_ transform: T) -> Self {
+    func transform(_ transform: any Matrix3x4) -> Self {
         Self(mesh.Transform(transform.mat3x4))
     }
 
-    func translate(_ translation: V) -> Self {
+    func translate(_ translation: Vector) -> Self {
         Self(mesh.Translate(translation.vec3))
     }
 
-    func scale(_ scale: V) -> Self {
+    func scale(_ scale: Vector) -> Self {
         Self(mesh.Scale(scale.vec3))
     }
 
-    func rotate(_ rotation: V) -> Self {
+    func rotate(_ rotation: Vector) -> Self {
         Self(mesh.Rotate(rotation.x, rotation.y, rotation.z))
     }
 
-    func mirror(_ normal: V) -> Self {
+    func mirror(_ normal: Vector) -> Self {
         Self(mesh.Mirror(normal.vec3))
     }
 }

Sources/Manifold3D/Manifold/Manifold+VertexProperties.swift

@@ -3,7 +3,7 @@ import ManifoldCPP
 import ManifoldBridge
 
 public extension Manifold {
-    func setProperties(channelCount: Int, getter function: @escaping (_ position: V, _ oldProperties: [Double]) -> [Double]) -> Self {
+    func setProperties(channelCount: Int, getter function: @escaping (_ position: Vector, _ oldProperties: [Double]) -> [Double]) -> Self {
         let oldCount = propertyCount
         return Self(bridge.SetProperties(mesh, .init(channelCount)) { newProps, position, oldProps in
             let props = function(.init(position), Array(UnsafeBufferPointer(start: oldProps, count: oldCount)))

Sources/Manifold3D/Manifold/Manifold.swift

@@ -1,6 +1,6 @@
 import ManifoldCPP
 
-public struct Manifold<V: Vector3>: @unchecked Sendable {
+public struct Manifold<Vector: Vector3>: Geometry, @unchecked Sendable {    
     internal let mesh: manifold.Manifold
 
     internal init(_ mesh: manifold.Manifold) {
@@ -9,14 +9,14 @@ public struct Manifold<V: Vector3>: @unchecked Sendable {
 }
 
 public extension Manifold {
-    init(_ meshGL: MeshGL<V>) throws(Error) {
+    init(_ meshGL: MeshGL<Vector>) throws(Error) {
         self.init(manifold.Manifold(meshGL.meshGL))
         if isEmpty, let error = self.status {
             throw error
         }
     }
 
-    func meshGL(normalChannelIndex: Int = -1) -> MeshGL<V> {
+    func meshGL(normalChannelIndex: Int = -1) -> MeshGL<Vector> {
         MeshGL(meshGL: mesh.GetMeshGL64(Int32(normalChannelIndex)))
     }
 

Sources/Manifold3D/MeshGL.swift

@@ -2,7 +2,7 @@ import Foundation
 import ManifoldCPP
 import ManifoldBridge
 
-public struct MeshGL<V: Vector3> {
+public struct MeshGL<Vector: Vector3> {
     internal let meshGL: manifold.MeshGL64
 
     internal init(meshGL: manifold.MeshGL64) {
@@ -11,7 +11,7 @@ public struct MeshGL<V: Vector3> {
 }
 
 public extension MeshGL {
-    init(vertices: [V], triangles: [Triangle]) {
+    init(vertices: [Vector], triangles: [Triangle]) {
         var meshGL = manifold.MeshGL64()
         meshGL.numProp = 3
         meshGL.vertProperties = .init(vertices.flatMap { [$0.x, $0.y, $0.z] })
@@ -30,9 +30,9 @@ public extension MeshGL {
         meshGL.faceID.map { Int($0) }
     }
 
-    var vertices: [V] {
+    var vertices: [Vector] {
         (0..<Int(meshGL.NumVert())).map {
-            V(meshGL.GetVertPos($0))
+            Vector(meshGL.GetVertPos($0))
         }
     }
 

Sources/Manifold3D/Types/Matrices.swift

@@ -1,12 +1,11 @@
 import ManifoldCPP
 
-public protocol Matrix3x4 {
+public protocol Matrix {
     subscript(_ row: Int, _ column: Int) -> Double { get }
 }
 
-public protocol Matrix2x3 {
-    subscript(_ row: Int, _ column: Int) -> Double { get }
-}
+public protocol Matrix3x4: Matrix {}
+public protocol Matrix2x3: Matrix {}
 
 internal extension Matrix3x4 {
     var mat3x4: manifold.mat3x4 {