Pipe (solid or hollow, along sketch curves), Bounding Solid, Scale (uniform or per axis), Offset Face (planar faces), physical materials with mass in Measure; sweeps keep profile holes

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AS5Tn3xieewUSg3uxrMVdL

crates/doc/src/document.rs

@@ -289,6 +289,41 @@ pub enum FeatureKind {
         body: String,
         plane: PlaneRef,
     },
+    /// Scale bodies about a point (uniform, or per axis).
+    Scale {
+        bodies: Vec<String>,
+        #[serde(default)]
+        origin: Vec3,
+        factor: String,
+        /// Per-axis factors instead of `factor`.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        factors: Option<[String; 3]>,
+    },
+    /// Move planar faces (at the given points) along their normals; the body keeps its shape.
+    OffsetFace {
+        faces: Vec<Vec3>,
+        distance: String,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        body: Option<String>,
+    },
+    /// A box around bodies, grown by a margin.
+    BoundingSolid {
+        bodies: Vec<String>,
+        #[serde(default = "zero_expr")]
+        margin: String,
+    },
+    /// A tube along a chain of sketch curves (solid, or hollow with a wall thickness).
+    Pipe {
+        path_sketch: u64,
+        path: Vec<String>,
+        diameter: String,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        wall: Option<String>,
+        #[serde(default)]
+        operation: Operation,
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
+        targets: Vec<String>,
+    },
     Move {
         bodies: Vec<String>,
         translate: [String; 3],
@@ -445,6 +480,10 @@ impl FeatureKind {
             FeatureKind::Draft { .. } => "DraftFeature",
             FeatureKind::Split { .. } => "SplitBodyFeature",
             FeatureKind::Move { .. } => "MoveFeature",
+            FeatureKind::Scale { .. } => "ScaleFeature",
+            FeatureKind::OffsetFace { .. } => "OffsetFacesFeature",
+            FeatureKind::BoundingSolid { .. } => "BoundingSolidFeature",
+            FeatureKind::Pipe { .. } => "PipeFeature",
             FeatureKind::Import { .. } => "BaseFeature",
             FeatureKind::MeshImport { .. } => "MeshFeature",
         }
@@ -474,6 +513,10 @@ impl FeatureKind {
             FeatureKind::Draft { .. } => "Draft",
             FeatureKind::Split { .. } => "Split",
             FeatureKind::Move { .. } => "Move",
+            FeatureKind::Scale { .. } => "Scale",
+            FeatureKind::OffsetFace { .. } => "OffsetFace",
+            FeatureKind::BoundingSolid { .. } => "BoundingSolid",
+            FeatureKind::Pipe { .. } => "Pipe",
             FeatureKind::Import { .. } => "Import",
             FeatureKind::MeshImport { .. } => "Mesh",
         }
@@ -531,6 +574,16 @@ impl FeatureKind {
                 }
             }
             FeatureKind::Thread { length, .. } => v.extend(length.iter().map(String::as_str)),
+            FeatureKind::Scale { factor, factors, .. } => {
+                v.push(factor);
+                v.extend(factors.iter().flatten().map(String::as_str));
+            }
+            FeatureKind::OffsetFace { distance, .. } => v.push(distance),
+            FeatureKind::BoundingSolid { margin, .. } => v.push(margin),
+            FeatureKind::Pipe { diameter, wall, .. } => {
+                v.push(diameter);
+                v.extend(wall.iter().map(String::as_str));
+            }
             FeatureKind::Move { translate, angle, .. } => {
                 v.extend(translate.iter().map(String::as_str));
                 if let Some(a) = angle {
@@ -559,6 +612,10 @@ pub struct Feature {
     pub kind: FeatureKind,
 }
 
+fn zero_expr() -> String {
+    "0".into()
+}
+
 fn is_root(c: &u64) -> bool {
     *c == 0
 }
@@ -581,6 +638,9 @@ pub struct Document {
     /// Components below the root, as a tree (by parent).
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub components: Vec<Component>,
+    /// Physical material per body (by body name); others use the default.
+    #[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
+    pub materials: std::collections::BTreeMap<String, String>,
     /// Bodies moved into another component than their feature's (by body name).
     #[serde(default, skip_serializing_if = "std::collections::BTreeMap::is_empty")]
     pub body_components: std::collections::BTreeMap<String, u64>,
@@ -611,9 +671,15 @@ impl Document {
             next_id: 1,
             components: Vec::new(),
             body_components: Default::default(),
+            materials: Default::default(),
         }
     }
 
+    /// Density of a body's material (g/cm³).
+    pub fn density(&self, body: &str) -> f64 {
+        self.materials.get(body).and_then(|m| material_density(m)).unwrap_or(DEFAULT_DENSITY)
+    }
+
     /// The component a body belongs to: where it was moved, else its feature's.
     pub fn body_component(&self, body: &str, feature: u64) -> u64 {
         self.body_components.get(body).copied().unwrap_or_else(|| self.feature(feature).map(|f| f.component).unwrap_or(0))
@@ -910,3 +976,28 @@ impl Document {
         Ok(())
     }
 }
+
+/// Density of the default material (g/cm³), as Fusion's default.
+pub const DEFAULT_DENSITY: f64 = 1.29;
+
+/// Physical materials: name and density (g/cm³).
+pub const MATERIALS: [(&str, f64); 14] = [
+    ("Default", DEFAULT_DENSITY),
+    ("Steel", 7.85),
+    ("Stainless Steel", 8.0),
+    ("Aluminum", 2.70),
+    ("Brass", 8.50),
+    ("Copper", 8.96),
+    ("Titanium", 4.43),
+    ("Cast Iron", 7.20),
+    ("ABS Plastic", 1.06),
+    ("PLA", 1.24),
+    ("Nylon", 1.14),
+    ("Polycarbonate", 1.20),
+    ("Oak", 0.75),
+    ("Glass", 2.50),
+];
+
+pub fn material_density(name: &str) -> Option<f64> {
+    MATERIALS.iter().find(|(n, _)| n.eq_ignore_ascii_case(name.trim())).map(|(_, d)| *d)
+}

crates/doc/src/eval.rs

@@ -940,6 +940,34 @@ fn feature_tools(vals: &BTreeMap<String, Value>, f: &Feature, st: &ModelState) -
             let segs = path_segments(ps, path, start)?;
             regions.iter().map(|r| kernel::sweep(&ss.plane, r, &segs).map_err(DocError::from)).collect()
         }
+        FeatureKind::Pipe { path_sketch, path, diameter, wall, .. } => {
+            let ps =
+                st.sketch(*path_sketch).ok_or_else(|| DocError::Unknown(format!("sketch {path_sketch} (it must come earlier in the timeline)")))?;
+            let r = val(vals, diameter, Kind::Length)? / 2.0;
+            if !(r > 1e-6) {
+                return Err(DocError::Invalid("pipe diameter must be positive".into()));
+            }
+            let segs = path_segments(ps, path, Vec3::new(f64::NAN, f64::NAN, f64::NAN))?;
+            let first = segs.first().ok_or_else(|| DocError::Invalid("empty path".into()))?;
+            let (start, tangent) = match *first {
+                kernel::PathSeg::Line { a, b } => (a, b - a),
+                kernel::PathSeg::Arc { a, center, axis, .. } => (a, axis.cross(a - center)),
+            };
+            let t = tangent.normalized().ok_or_else(|| DocError::Invalid("path direction".into()))?;
+            let plane = Plane::from_normal(start, t).ok_or_else(|| DocError::Invalid("pipe profile plane".into()))?;
+            let holes = match wall {
+                Some(w) => {
+                    let wt = val(vals, w, Kind::Length)?;
+                    if !(wt > 0.0 && wt < r) {
+                        return Err(DocError::Invalid("the wall must be thinner than the radius".into()));
+                    }
+                    vec![solvecraft_geom::Loop2::circle(Vec2::ZERO, r - wt).reversed()]
+                }
+                None => Vec::new(),
+            };
+            let region = Region2 { outer: solvecraft_geom::Loop2::circle(Vec2::ZERO, r), holes };
+            Ok(vec![kernel::sweep(&plane, &region, &segs)?])
+        }
         FeatureKind::Box { corner, length, width, height, .. } => {
             let s = Vec3::new(val(vals, length, Kind::Length)?, val(vals, width, Kind::Length)?, val(vals, height, Kind::Length)?);
             Ok(vec![kernel::box_solid(*corner, *corner + s)?])
@@ -985,6 +1013,13 @@ fn path_segments(ps: &SolvedSketch, ids: &[String], start: Vec3) -> Result<Vec<k
     {
         segs[0] = f.reversed();
     }
+    // No start given (a pipe): the first curve runs toward the second.
+    if !start.is_finite()
+        && let (Some(f), Some(n)) = (segs.first().copied(), segs.get(1).copied())
+        && (n.start().dist(f.start()) < 1e-6 || n.end().dist(f.start()) < 1e-6)
+    {
+        segs[0] = f.reversed();
+    }
     for i in 1..segs.len() {
         let prev_end = segs[i - 1].end();
         if segs[i].end().dist(prev_end) < segs[i].start().dist(prev_end) {
@@ -1015,6 +1050,7 @@ fn feature_op(f: &Feature) -> (Operation, Vec<String>) {
         | FeatureKind::Sphere { operation, .. }
         | FeatureKind::Torus { operation, .. } => (*operation, Vec::new()),
         FeatureKind::Hole { .. } => (Operation::Cut, Vec::new()),
+        FeatureKind::Pipe { operation, targets, .. } => (*operation, targets.clone()),
         FeatureKind::Loft { operation, targets, .. } | FeatureKind::Sweep { operation, targets, .. } => (*operation, targets.clone()),
         _ => (Operation::NewBody, Vec::new()),
     }
@@ -1156,6 +1192,7 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
             Ok(())
         }
         FeatureKind::Extrude { operation, targets, .. }
+        | FeatureKind::Pipe { operation, targets, .. }
         | FeatureKind::Revolve { operation, targets, .. }
         | FeatureKind::Loft { operation, targets, .. }
         | FeatureKind::Sweep { operation, targets, .. } => {
@@ -1291,6 +1328,59 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
             }
             Ok(())
         }
+        FeatureKind::Scale { bodies, origin, factor, factors } => {
+            let k = match factors {
+                Some(fs) => [val(vals, &fs[0], Kind::Unitless)?, val(vals, &fs[1], Kind::Unitless)?, val(vals, &fs[2], Kind::Unitless)?],
+                None => {
+                    let x = val(vals, factor, Kind::Unitless)?;
+                    [x, x, x]
+                }
+            };
+            if k.iter().any(|x| !(x.is_finite() && *x > 1e-9 && *x < 1e6)) {
+                return Err(DocError::Invalid("scale factors must be positive".into()));
+            }
+            let o = *origin;
+            // Column-major: scale about the origin.
+            let m = [
+                [k[0], 0.0, 0.0, 0.0],
+                [0.0, k[1], 0.0, 0.0],
+                [0.0, 0.0, k[2], 0.0],
+                [o.x * (1.0 - k[0]), o.y * (1.0 - k[1]), o.z * (1.0 - k[2]), 1.0],
+            ];
+            for n in bodies {
+                let i = st.bodies.iter().position(|b| &b.name == n).ok_or_else(|| DocError::Unknown(format!("body `{n}`")))?;
+                if let Some(mb) = st.bodies.get_mut(i) {
+                    let nb = kernel::transform_matrix(&mb.body, m)?;
+                    *mb = ModelBody::new(mb.name.clone(), nb, mb.feature);
+                }
+            }
+            Ok(())
+        }
+        FeatureKind::OffsetFace { faces, distance, body } => {
+            let d = val(vals, distance, Kind::Length)?;
+            let i = body_at(st, body, faces)?;
+            let Some(mb) = st.bodies.get(i).cloned() else { return Err(DocError::Invalid("body".into())) };
+            let nb = kernel::offset_faces(&mb.body, faces, d)?;
+            if let Some(slot) = st.bodies.get_mut(i) {
+                *slot = ModelBody::new(mb.name, nb, mb.feature);
+            }
+            Ok(())
+        }
+        FeatureKind::BoundingSolid { bodies, margin } => {
+            let m = val(vals, margin, Kind::Length)?;
+            let mut bb = solvecraft_geom::Aabb3::EMPTY;
+            for b in st.bodies.iter().filter(|b| bodies.is_empty() || bodies.contains(&b.name)) {
+                bb = bb.union(&b.mesh().bounds());
+            }
+            if bb.is_empty() {
+                return Err(DocError::Invalid("no bodies to bound".into()));
+            }
+            let pad = Vec3::new(m, m, m);
+            let b = kernel::box_solid(bb.min - pad, bb.max + pad)?;
+            let name = unique_body_name(st, f.body_names.first().map(String::as_str).unwrap_or("Bounding"));
+            st.bodies.push(ModelBody::new(name, b, f.id));
+            Ok(())
+        }
         FeatureKind::Move { bodies, translate, rotate_axis, angle } => {
             let t =
                 Vec3::new(val(vals, &translate[0], Kind::Length)?, val(vals, &translate[1], Kind::Length)?, val(vals, &translate[2], Kind::Length)?);