Replace Sweep implementation of Sketch

hannobraun · Nov 23, 2023 · 2bf1a55 · 2bf1a55
1 parent 8b2ee27
commit 2bf1a55
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 19 deletions.
diff --git a/crates/fj-core/src/operations/sweep/mod.rs b/crates/fj-core/src/operations/sweep/mod.rs
@@ -8,7 +8,7 @@ mod vertex;
 
 pub use self::{
     face::SweepFace, half_edge::SweepHalfEdge, path::SweepSurfacePath,
-    vertex::SweepVertex,
+    sketch::SweepSketch, vertex::SweepVertex,
 };
 
 use std::collections::BTreeMap;

diff --git a/crates/fj-core/src/operations/sweep/sketch.rs b/crates/fj-core/src/operations/sweep/sketch.rs
@@ -7,25 +7,39 @@ use crate::{
     storage::Handle,
 };
 
-use super::{face::SweepFace, Sweep, SweepCache};
+use super::{face::SweepFace, SweepCache};
 
-impl Sweep for (&Sketch, Handle<Surface>) {
-    type Swept = Solid;
+/// # Sweep a [`Sketch`]
+///
+/// See [module documentation] for more information.
+///
+/// [module documentation]: super
+pub trait SweepSketch {
+    /// # Sweep the [`Sketch`]
+    fn sweep_sketch(
+        &self,
+        surface: Handle<Surface>,
+        path: impl Into<Vector<3>>,
+        services: &mut Services,
+    ) -> Solid;
+}
 
-    fn sweep_with_cache(
-        self,
+impl SweepSketch for Sketch {
+    fn sweep_sketch(
+        &self,
+        surface: Handle<Surface>,
         path: impl Into<Vector<3>>,
-        cache: &mut SweepCache,
         services: &mut Services,
-    ) -> Self::Swept {
-        let (sketch, surface) = self;
+    ) -> Solid {
         let path = path.into();
+        let mut cache = SweepCache::default();
 
         let mut shells = Vec::new();
-        for region in sketch.regions() {
+        for region in self.regions() {
             let face =
                 Face::new(surface.clone(), region.clone()).insert(services);
-            let shell = face.sweep_face(path, cache, services).insert(services);
+            let shell =
+                face.sweep_face(path, &mut cache, services).insert(services);
             shells.push(shell);
         }
 

diff --git a/models/cuboid/src/lib.rs b/models/cuboid/src/lib.rs
@@ -4,7 +4,7 @@ use fj::{
         operations::{
             build::{BuildRegion, BuildSketch},
             insert::Insert,
-            sweep::Sweep,
+            sweep::SweepSketch,
             update::UpdateSketch,
         },
         services::Services,
@@ -29,5 +29,7 @@ pub fn model(x: f64, y: f64, z: f64, services: &mut Services) -> Handle<Solid> {
 
     let surface = services.objects.surfaces.xy_plane();
     let path = Vector::from([0., 0., z]);
-    (&sketch, surface).sweep(path, services).insert(services)
+    sketch
+        .sweep_sketch(surface, path, services)
+        .insert(services)
 }
diff --git a/models/spacer/src/lib.rs b/models/spacer/src/lib.rs
@@ -5,7 +5,7 @@ use fj::{
             build::{BuildCycle, BuildRegion, BuildSketch},
             insert::Insert,
             reverse::Reverse,
-            sweep::Sweep,
+            sweep::SweepSketch,
             update::{UpdateRegion, UpdateSketch},
         },
         services::Services,
@@ -30,5 +30,7 @@ pub fn model(
 
     let surface = services.objects.surfaces.xy_plane();
     let path = Vector::from([0., 0., height]);
-    (&sketch, surface).sweep(path, services).insert(services)
+    sketch
+        .sweep_sketch(surface, path, services)
+        .insert(services)
 }
diff --git a/models/split/src/lib.rs b/models/split/src/lib.rs
@@ -5,7 +5,7 @@ use fj::{
             build::{BuildRegion, BuildSketch},
             insert::Insert,
             split::SplitFace,
-            sweep::Sweep,
+            sweep::SweepSketch,
             update::{UpdateSketch, UpdateSolid},
         },
         services::Services,
@@ -34,7 +34,7 @@ pub fn model(
 
     let surface = services.objects.surfaces.xy_plane();
     let path = Vector::from([0., 0., size]);
-    let solid = (&sketch, surface).sweep(path, services);
+    let solid = sketch.sweep_sketch(surface, path, services);
 
     solid
         .update_shell(solid.shells().only(), |shell| {

diff --git a/models/star/src/lib.rs b/models/star/src/lib.rs
@@ -7,7 +7,7 @@ use fj::{
             build::{BuildCycle, BuildRegion, BuildSketch},
             insert::Insert,
             reverse::Reverse,
-            sweep::Sweep,
+            sweep::SweepSketch,
             update::{UpdateRegion, UpdateSketch},
         },
         services::Services,
@@ -53,5 +53,7 @@ pub fn model(
 
     let surface = services.objects.surfaces.xy_plane();
     let path = Vector::from([0., 0., h]);
-    (&sketch, surface).sweep(path, services).insert(services)
+    sketch
+        .sweep_sketch(surface, path, services)
+        .insert(services)
 }