diff --git a/crates/fj-kernel/src/algorithms/sweep/edge.rs b/crates/fj-kernel/src/algorithms/sweep/edge.rs index e8bf9de1b..33438d511 100644 --- 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, - tolerance: crate::algorithms::Tolerance, - color: fj_interop::mesh::Color, + tolerance: impl Into, + 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 index 5481e6085..dccca595d 100644 --- 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, - tolerance: crate::algorithms::Tolerance, - color: fj_interop::mesh::Color, + tolerance: impl Into, + 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 index 745e717e6..4ced4d0df 100644 --- 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, - tolerance: Tolerance, + tolerance: impl Into, color: Color, ) -> Self::Swept; } diff --git a/crates/fj-kernel/src/algorithms/sweep/sketch.rs b/crates/fj-kernel/src/algorithms/sweep/sketch.rs index db21e17c4..cf10fe25c 100644 --- 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, - tolerance: Tolerance, + tolerance: impl Into, color: Color, ) -> Self::Swept { let path = path.into(); + let tolerance = tolerance.into(); let mut shells = Vec::new(); for face in self.into_faces() {