Surface Revolve: sheets turned from open curves and profiles (#824)

Surface Revolve turns open curves and closed profile boundaries about a sketch axis into surface bodies, with cone apexes and sphere poles where a chain ends on the axis, and a closed shell made solid. Adds the SurfaceRevolve feature (format 18 note), the surface.revolve command, a dialog with Edit Feature support and analytic kernel and engine tests.

Part of #757.

crates/doc/src/assembly.rs

@@ -221,7 +221,8 @@ impl FeatureKind {
                     pt(&mut t.point);
                 }
             }
-            FeatureKind::Revolve { axis: AxisRef::Line { origin, dir: d }, .. } => {
+            FeatureKind::Revolve { axis: AxisRef::Line { origin, dir: d }, .. }
+            | FeatureKind::SurfaceRevolve { axis: AxisRef::Line { origin, dir: d }, .. } => {
                 pt(origin);
                 dir(d);
             }
@@ -322,6 +323,7 @@ impl FeatureKind {
             FeatureKind::Revolve { .. }
             | FeatureKind::Extrude { .. }
             | FeatureKind::SurfaceExtrude { .. }
+            | FeatureKind::SurfaceRevolve { .. }
             | FeatureKind::Combine { .. }
             | FeatureKind::Loft { .. }
             | FeatureKind::Sweep { .. }

crates/doc/src/clipboard.rs

@@ -48,6 +48,7 @@ impl FeatureKind {
             }
             FeatureKind::Extrude { sketch, .. }
             | FeatureKind::SurfaceExtrude { sketch, .. }
+            | FeatureKind::SurfaceRevolve { sketch, .. }
             | FeatureKind::Revolve { sketch, .. }
             | FeatureKind::Emboss { sketch, .. }
             | FeatureKind::SheetBase { sketch, .. }

crates/doc/src/document.rs

@@ -954,6 +954,23 @@ pub enum FeatureKind {
         #[serde(default, skip_serializing_if = "Vec::is_empty")]
         faces: Vec<Vec3>,
     },
+    /// A surface body turned about an axis from open curve chains and the boundaries of
+    /// profiles: walls only, no caps (a solid where a full turn closes them).
+    SurfaceRevolve {
+        sketch: u64,
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        profiles: Option<ProfileSel>,
+        #[serde(default, skip_serializing_if = "Vec::is_empty")]
+        curves: Vec<String>,
+        axis: AxisRef,
+        angle: String,
+        /// Two Sides: the angle on the other side.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        angle2: Option<String>,
+        /// Symmetric: `angle` split evenly either side of the sketch.
+        #[serde(default, skip_serializing_if = "std::ops::Not::not")]
+        symmetric: bool,
+    },
     /// A planar surface body extended outward by `distance` past the edges through `edges`.
     SurfaceExtend {
         body: String,
@@ -1255,6 +1272,7 @@ impl FeatureKind {
         match self {
             K::Extrude { sketch, .. }
             | K::SurfaceExtrude { sketch, .. }
+            | K::SurfaceRevolve { sketch, .. }
             | K::Revolve { sketch, .. }
             | K::Emboss { sketch, .. }
             | K::Rib { sketch, .. }
@@ -1389,6 +1407,7 @@ impl FeatureKind {
             FeatureKind::Remove { .. } => "RemoveFeature",
             FeatureKind::Patch { .. } => "PatchFeature",
             FeatureKind::SurfaceExtrude { .. } => "SurfaceExtrudeFeature",
+            FeatureKind::SurfaceRevolve { .. } => "SurfaceRevolveFeature",
             FeatureKind::Stitch { .. } => "StitchFeature",
             FeatureKind::Thicken { .. } => "ThickenFeature",
             FeatureKind::SurfaceTrim { .. } => "TrimFeature",
@@ -1458,6 +1477,7 @@ impl FeatureKind {
             FeatureKind::Remove { .. } => "Remove",
             FeatureKind::Patch { .. } => "Patch",
             FeatureKind::SurfaceExtrude { .. } => "SurfaceExtrude",
+            FeatureKind::SurfaceRevolve { .. } => "SurfaceRevolve",
             FeatureKind::Stitch { .. } => "Stitch",
             FeatureKind::Thicken { .. } => "Thicken",
             FeatureKind::SurfaceTrim { .. } => "Trim",
@@ -1480,7 +1500,9 @@ impl FeatureKind {
             | FeatureKind::Sweep { sketch, profiles, .. }
             | FeatureKind::Emboss { sketch, profiles, .. }
             | FeatureKind::SheetBase { sketch, profiles, .. } => vec![(*sketch, profiles)],
-            FeatureKind::Patch { sketch: Some(sk), profiles, .. } | FeatureKind::SurfaceExtrude { sketch: sk, profiles: Some(profiles), .. } => {
+            FeatureKind::Patch { sketch: Some(sk), profiles, .. }
+            | FeatureKind::SurfaceExtrude { sketch: sk, profiles: Some(profiles), .. }
+            | FeatureKind::SurfaceRevolve { sketch: sk, profiles: Some(profiles), .. } => {
                 vec![(*sk, profiles)]
             }
             FeatureKind::Loft { sections, .. } => sections.iter_mut().filter(|s| s.point.is_none()).map(|s| (s.sketch, &mut s.profiles)).collect(),
@@ -1496,7 +1518,9 @@ impl FeatureKind {
             | FeatureKind::Sweep { sketch, profiles, .. }
             | FeatureKind::Emboss { sketch, profiles, .. }
             | FeatureKind::SheetBase { sketch, profiles, .. } => vec![(*sketch, profiles)],
-            FeatureKind::Patch { sketch: Some(sketch), profiles, .. } | FeatureKind::SurfaceExtrude { sketch, profiles: Some(profiles), .. } => {
+            FeatureKind::Patch { sketch: Some(sketch), profiles, .. }
+            | FeatureKind::SurfaceExtrude { sketch, profiles: Some(profiles), .. }
+            | FeatureKind::SurfaceRevolve { sketch, profiles: Some(profiles), .. } => {
                 vec![(*sketch, profiles)]
             }
             FeatureKind::Loft { sections, .. } => {
@@ -1561,7 +1585,7 @@ impl FeatureKind {
                     v.push(d);
                 }
             }
-            FeatureKind::Revolve { angle, angle2, .. } => {
+            FeatureKind::Revolve { angle, angle2, .. } | FeatureKind::SurfaceRevolve { angle, angle2, .. } => {
                 v.push(angle);
                 v.extend(angle2.iter().map(String::as_str));
             }

crates/doc/src/eval.rs

@@ -3634,7 +3634,8 @@ fn eval_feature(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature, st:
         | FeatureKind::SurfaceExtend { .. }
         | FeatureKind::SurfaceExtrude { .. }
         | FeatureKind::Unstitch { .. }
-        | FeatureKind::ReverseNormal { .. } => surface::eval(doc, vals, f, st),
+        | FeatureKind::ReverseNormal { .. }
+        | FeatureKind::SurfaceRevolve { .. } => surface::eval(doc, vals, f, st),
         FeatureKind::Emboss { .. }
         | FeatureKind::Rib { .. }
         | FeatureKind::ReplaceFace { .. }

crates/doc/src/eval_surface.rs

@@ -98,17 +98,28 @@ pub(super) fn eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature,
             let d = val(vals, &extent.distance, Kind::Length)?;
             let off = extent.start_offset.as_deref().map(|e| val(vals, e, Kind::Length)).transpose()?.unwrap_or(0.0);
             let (a, b) = extent_sides(vals, extent, d, extent.direction)?;
-            let mut chains: Vec<Vec<Seg2>> = Vec::new();
-            if let Some(sel) = profiles {
-                for r in solidcraft_sketch::merge_regions(&select_profiles(&ss, sel)?) {
-                    chains.extend(std::iter::once(r.outer).chain(r.holes).map(|lp| lp.segs));
+            let body = kernel::extrude_sheet(&ss.plane, &sheet_chains(&ss, profiles.as_ref(), curves)?, a + off, b + off)?;
+            let name = new_name(st, f, 0);
+            st.bodies.push(ModelBody::new(name, body, f.id));
+            Ok(())
+        }
+        FeatureKind::SurfaceRevolve { sketch, profiles, curves, axis, angle, angle2, symmetric } => {
+            let ss = sketch_in_feature_frame(
+                doc,
+                st.sketch(*sketch).ok_or_else(|| DocError::Unknown(format!("sketch {sketch} (it must come earlier in the timeline)")))?,
+                f.component,
+            )?;
+            let (o, d) = revolve_axis(&ss, axis)?;
+            let a = val(vals, angle, Kind::Angle)?;
+            let (start, sweep) = match (angle2, symmetric) {
+                (Some(a2), _) => {
+                    let a2 = val(vals, a2, Kind::Angle)?;
+                    (-a2, a + a2)
                 }
-            }
-            chains.extend(curve_chains(&ss, curves)?);
-            if chains.is_empty() {
-                return Err(DocError::Invalid("pick the profiles or curves to extrude".into()));
-            }
-            let body = kernel::extrude_sheet(&ss.plane, &chains, a + off, b + off)?;
+                (None, true) => (-a / 2.0, a),
+                (None, false) => (0.0, a),
+            };
+            let body = kernel::revolve_sheet(&ss.plane, &sheet_chains(&ss, profiles.as_ref(), curves)?, o, d, start, sweep)?;
             let name = new_name(st, f, 0);
             st.bodies.push(ModelBody::new(name, body, f.id));
             Ok(())
@@ -148,6 +159,22 @@ pub(super) fn eval(doc: &Document, vals: &BTreeMap<String, Value>, f: &Feature,
     }
 }
 
+/// What a surface builder sweeps: the boundary loops of the picked profiles, then the picked
+/// curves chained end to end.
+fn sheet_chains(ss: &SolvedSketch, profiles: Option<&ProfileSel>, curves: &[String]) -> Result<Vec<Vec<Seg2>>> {
+    let mut chains: Vec<Vec<Seg2>> = Vec::new();
+    if let Some(sel) = profiles {
+        for r in solidcraft_sketch::merge_regions(&select_profiles(ss, sel)?) {
+            chains.extend(std::iter::once(r.outer).chain(r.holes).map(|lp| lp.segs));
+        }
+    }
+    chains.extend(curve_chains(ss, curves)?);
+    if chains.is_empty() {
+        return Err(DocError::Invalid("pick the profiles or curves".into()));
+    }
+    Ok(chains)
+}
+
 /// Most sketch curves one feature chains.
 const MAX_CHAIN_CURVES: usize = 1000;
 

crates/doc/src/format.rs

@@ -116,6 +116,8 @@
 //!   Under the same version, Delete Face can leave the gap open (`heal: false` on the feature:
 //!   the faces left are a surface body); a Delete Face without it heals, as it always did, and
 //!   saves as before. 0.9.0 would heal a gap the design leaves open.
+//!   A `SurfaceRevolve` feature (Surface Revolve: `sketch`, optional `profiles`, `curves`,
+//!   `axis`, `angle`, optional `angle2` and `symmetric`) is also first saved in 18.
 
 use serde_json::Value;
 

crates/doc/src/params.rs

@@ -69,7 +69,7 @@ impl FeatureKind {
                     v.push(("To offset", d, L));
                 }
             }
-            FeatureKind::Revolve { angle, angle2, .. } => {
+            FeatureKind::Revolve { angle, angle2, .. } | FeatureKind::SurfaceRevolve { angle, angle2, .. } => {
                 v.push(("Angle", angle, A));
                 if let Some(a) = angle2 {
                     v.push(("Angle 2", a, A));