Merge branch 'dev'

Author: tomasf

Package.resolved

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "Helical-Demo", targets: ["Demo"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/tomasf/Cadova.git", .upToNextMinor(from: "0.9.0")),
+        .package(url: "https://github.com/tomasf/Cadova.git", .upToNextMinor(from: "0.10.0")),
     ],
     targets: [
         .target(

Package.swift

@@ -40,7 +40,7 @@ let nutsAndWashers: [(String, any Geometry3D)] = [
     ("Large washer, M5", Washer.plain(.m5, series: .large))
 ]
 
-struct Repertoire: Shape3D {
+struct Repertoire: Geometry3D {
     let contents: [(label: String, part: any Geometry3D)]
 
     var body: any Geometry3D {

Sources/Demo/main.swift

@@ -4,7 +4,7 @@ import Cadova
 ///
 /// `Bolt` composes a head shape, drive socket, threaded section (``Screw``), and point
 /// into a full fastener model. For just the bare threaded geometry, use ``Screw``.
-public struct Bolt: Shape3D {
+public struct Bolt: Geometry3D {
     /// The screw thread specification.
     public let thread: ScrewThread
     /// Nominal length of the bolt, measured according to convention for the head type.

Sources/Helical/Bolt/Bolt.swift

@@ -1,7 +1,7 @@
 import Cadova
 
 /// A protocol defining the geometry and dimensions of a bolt head.
-public protocol BoltHeadShape: Shape3D {
+public protocol BoltHeadShape: Geometry3D {
     /// Total height of the head.
     var height: Double { get }
     /// Portion of the nominal bolt length consumed by the head, such as the countersunk portion.

Sources/Helical/Bolt/Parts/Heads/BoltHeadShape.swift

@@ -1,7 +1,7 @@
 import Cadova
 
 /// A protocol defining the geometry at the tip of a bolt.
-public protocol BoltPoint: Shape3D {
+public protocol BoltPoint: Geometry3D {
     /// Portion of the nominal bolt length consumed by the point geometry.
     var consumedLength: Double { get }
     /// Geometry to subtract from the bolt body to form the point.

Sources/Helical/Bolt/Parts/Points/BoltPoint.swift

@@ -1,7 +1,7 @@
 import Cadova
 
 /// A protocol defining the drive socket geometry in a bolt head.
-public protocol BoltHeadSocket: Shape3D {
+public protocol BoltHeadSocket: Geometry3D {
     /// Depth of the socket recess.
     var depth: Double { get }
 }

Sources/Helical/Bolt/Parts/Sockets/BoltHeadSocket.swift

@@ -1,6 +1,6 @@
 import Cadova
 
-internal struct TorxShape: Shape2D {
+internal struct TorxShape: Geometry2D {
     let size: TorxSize
 
     var body: any Geometry2D {

Sources/Helical/Bolt/Parts/Sockets/TorxHeadSocket.swift

@@ -6,7 +6,7 @@ public let defaultHeadClearance: Double = 100.0
 
 public extension Countersink {
     /// A 3D shape representing a countersink recess with clearance above.
-    struct Shape: Shape3D {
+    struct Shape: Geometry3D {
         let countersink: Countersink
         let headClearance: Double
 
@@ -36,7 +36,7 @@ public extension Countersink {
 
 public extension Counterbore {
     /// A 3D shape representing a counterbore recess with clearance above.
-    struct Shape: Shape3D {
+    struct Shape: Geometry3D {
         let counterbore: Counterbore
         let headClearance: Double
 
@@ -61,7 +61,7 @@ public extension Counterbore {
     }
 }
 
-struct PolygonalHeadRecess: Shape3D {
+struct PolygonalHeadRecess: Geometry3D {
     let sideCount: Int
     let widthAcrossFlats: Double
     let height: Double

Sources/Helical/Holes/BoltHeadRecessShapes.swift

@@ -3,7 +3,7 @@ import Cadova
 /// A clearance hole for a bolt to pass through without threading.
 ///
 /// Supports optional edge profiles, countersinks, or custom head recesses.
-public struct ClearanceHole: Shape3D {
+public struct ClearanceHole: Geometry3D {
     let diameter: Double
     let depth: Double
     let entry: Entry