From 20d29efd927343da981f5c2f583447329349005c Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 15 May 2024 14:03:40 +0200 Subject: [PATCH 1/3] Update variable name --- crates/fj-core/src/operations/sweep/face.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/fj-core/src/operations/sweep/face.rs b/crates/fj-core/src/operations/sweep/face.rs index f06be7cc2..dd0f7454f 100644 --- a/crates/fj-core/src/operations/sweep/face.rs +++ b/crates/fj-core/src/operations/sweep/face.rs @@ -57,7 +57,7 @@ impl SweepFace for Handle { core, ) .all_faces() - .map(|side_face| side_face.insert(core)); + .map(|face| face.insert(core)); let mut faces = Vec::new(); faces.push(bottom_face.clone()); From baf51fe38bbac77d4bd493c543b84bb15a26161f Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 15 May 2024 14:08:23 +0200 Subject: [PATCH 2/3] Make argument name more explicit --- crates/fj-core/src/operations/sweep/region.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/fj-core/src/operations/sweep/region.rs b/crates/fj-core/src/operations/sweep/region.rs index b3be68d8b..bbdc3fda3 100644 --- a/crates/fj-core/src/operations/sweep/region.rs +++ b/crates/fj-core/src/operations/sweep/region.rs @@ -31,7 +31,7 @@ pub trait SweepRegion { /// operation's scope. fn sweep_region( &self, - surface: Handle, + bottom_surface: Handle, color: Option, path: impl Into>, cache: &mut SweepCache, @@ -42,7 +42,7 @@ pub trait SweepRegion { impl SweepRegion for Region { fn sweep_region( &self, - surface: Handle, + bottom_surface: Handle, color: Option, path: impl Into>, cache: &mut SweepCache, @@ -52,11 +52,11 @@ impl SweepRegion for Region { let mut faces = Vec::new(); - let top_surface = surface.translate(path, core).insert(core); + let top_surface = bottom_surface.translate(path, core).insert(core); let top_exterior = sweep_cycle( self.exterior(), - surface.clone(), + bottom_surface.clone(), top_surface.clone(), color, &mut faces, @@ -71,7 +71,7 @@ impl SweepRegion for Region { .map(|bottom_cycle| { sweep_cycle( bottom_cycle, - surface.clone(), + bottom_surface.clone(), top_surface.clone(), color, &mut faces, From a63ad3080de12d3fdbf5444285288ce92a2a2811 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 15 May 2024 14:11:44 +0200 Subject: [PATCH 3/3] Make argument name more explicit --- crates/fj-core/src/operations/sweep/cycle.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/fj-core/src/operations/sweep/cycle.rs b/crates/fj-core/src/operations/sweep/cycle.rs index 4d00d294a..d4c50953d 100644 --- a/crates/fj-core/src/operations/sweep/cycle.rs +++ b/crates/fj-core/src/operations/sweep/cycle.rs @@ -38,7 +38,7 @@ pub trait SweepCycle { /// operation is called in, and therefore falls outside of its scope. fn sweep_cycle( &self, - surface: Handle, + bottom_surface: Handle, top_surface: Handle, color: Option, path: impl Into>, @@ -50,7 +50,7 @@ pub trait SweepCycle { impl SweepCycle for Cycle { fn sweep_cycle( &self, - surface: Handle, + bottom_surface: Handle, top_surface: Handle, color: Option, path: impl Into>, @@ -68,7 +68,7 @@ impl SweepCycle for Cycle { let (side_face, top_half_edge) = bottom_half_edge.sweep_half_edge( bottom_half_edge_next.start_vertex().clone(), - surface.clone(), + bottom_surface.clone(), color, path, cache,