Merge pull request #2137 from hannobraun/sweep

Add `SweptRegion`

Author: hannobraun

crates/fj-core/src/operations/holes.rs

@@ -50,7 +50,7 @@ impl AddHole for Shell {
                 &mut SweepCache::default(),
                 services,
             )
-            .into_iter()
+            .all_faces()
             .map(|face| face.insert(services))
             .collect::<Vec<_>>();
 

crates/fj-core/src/operations/sweep/face.rs

@@ -54,7 +54,7 @@ impl SweepFace for Handle<Face> {
         let side_faces = bottom_face
             .region()
             .sweep_region(bottom_face.surface(), path, cache, services)
-            .into_iter()
+            .all_faces()
             .map(|side_face| side_face.insert(services));
         faces.extend(side_faces);
 

crates/fj-core/src/operations/sweep/mod.rs

@@ -17,7 +17,7 @@ pub use self::{
     face::SweepFace,
     half_edge::SweepHalfEdge,
     path::SweepSurfacePath,
-    region::SweepRegion,
+    region::{SweepRegion, SweptRegion},
     shell_face::SweepFaceOfShell,
     sketch::SweepSketch,
     vertex::SweepVertex,

crates/fj-core/src/operations/sweep/region.rs

@@ -34,7 +34,7 @@ pub trait SweepRegion {
         path: impl Into<Vector<3>>,
         cache: &mut SweepCache,
         services: &mut Services,
-    ) -> Vec<Face>;
+    ) -> SweptRegion;
 }
 
 impl SweepRegion for Region {
@@ -44,7 +44,7 @@ impl SweepRegion for Region {
         path: impl Into<Vector<3>>,
         cache: &mut SweepCache,
         services: &mut Services,
-    ) -> Vec<Face> {
+    ) -> SweptRegion {
         let path = path.into();
 
         let mut faces = Vec::new();
@@ -84,9 +84,11 @@ impl SweepRegion for Region {
 
             Face::new(top_surface, top_region)
         };
-        faces.push(top_face);
 
-        faces
+        SweptRegion {
+            top_face,
+            side_faces: faces,
+        }
     }
 }
 
@@ -111,3 +113,21 @@ fn sweep_cycle(
 
     swept_cycle.top_cycle.insert(services)
 }
+
+/// The result of sweeping a [`Region`]
+///
+/// See [`SweepRegion`].
+pub struct SweptRegion {
+    /// The side faces created by the sweep
+    pub side_faces: Vec<Face>,
+
+    /// The top face created by the sweep
+    pub top_face: Face,
+}
+
+impl SweptRegion {
+    /// Return an iterator over all of the faces
+    pub fn all_faces(self) -> impl Iterator<Item = Face> {
+        self.side_faces.into_iter().chain([self.top_face])
+    }
+}

crates/fj-core/src/operations/sweep/shell_face.rs

@@ -57,7 +57,7 @@ impl SweepFaceOfShell for Shell {
         let region = Region::new(exterior, [], face.region().color());
         let faces = region
             .sweep_region(face.surface(), path, &mut cache, services)
-            .into_iter()
+            .all_faces()
             .map(|face| face.insert(services));
 
         self.remove_face(&face).add_faces(faces)