Merge pull request #991 from hannobraun/sweep

Make `Sweep::sweep` easier to call
hannobraun · Aug 24, 2022 · dd413cb · dd413cb
2 parents fa0e5d7 + 5a0b6c0
commit dd413cb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/crates/fj-kernel/src/algorithms/sweep/edge.rs b/crates/fj-kernel/src/algorithms/sweep/edge.rs
@@ -17,10 +17,11 @@ impl Sweep for Edge {
     fn sweep(
         self,
         path: impl Into<Path>,
-        tolerance: crate::algorithms::Tolerance,
-        color: fj_interop::mesh::Color,
+        tolerance: impl Into<Tolerance>,
+        color: Color,
     ) -> Self::Swept {
         let path = path.into();
+        let tolerance = tolerance.into();
 
         if let Some(vertices) = self.vertices().get() {
             let face = create_non_continuous_side_face(

diff --git a/crates/fj-kernel/src/algorithms/sweep/face.rs b/crates/fj-kernel/src/algorithms/sweep/face.rs
@@ -1,5 +1,7 @@
+use fj_interop::mesh::Color;
+
 use crate::{
-    algorithms::{reverse_face, TransformObject},
+    algorithms::{reverse_face, Tolerance, TransformObject},
     objects::{Face, Shell},
 };
 
@@ -11,10 +13,11 @@ impl Sweep for Face {
     fn sweep(
         self,
         path: impl Into<Path>,
-        tolerance: crate::algorithms::Tolerance,
-        color: fj_interop::mesh::Color,
+        tolerance: impl Into<Tolerance>,
+        color: Color,
     ) -> Self::Swept {
         let path = path.into();
+        let tolerance = tolerance.into();
 
         let mut faces = Vec::new();
 

diff --git a/crates/fj-kernel/src/algorithms/sweep/mod.rs b/crates/fj-kernel/src/algorithms/sweep/mod.rs
@@ -18,7 +18,7 @@ pub trait Sweep {
     fn sweep(
         self,
         path: impl Into<Path>,
-        tolerance: Tolerance,
+        tolerance: impl Into<Tolerance>,
         color: Color,
     ) -> Self::Swept;
 }

diff --git a/crates/fj-kernel/src/algorithms/sweep/sketch.rs b/crates/fj-kernel/src/algorithms/sweep/sketch.rs
@@ -13,10 +13,11 @@ impl Sweep for Sketch {
     fn sweep(
         self,
         path: impl Into<Path>,
-        tolerance: Tolerance,
+        tolerance: impl Into<Tolerance>,
         color: Color,
     ) -> Self::Swept {
         let path = path.into();
+        let tolerance = tolerance.into();
 
         let mut shells = Vec::new();
         for face in self.into_faces() {