From ec64299df1b136bfbf98fc59234554b6ff9b9ff1 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Mon, 25 Mar 2024 13:21:17 +0100 Subject: [PATCH] Simplify `Surface::surface_from_uv` to `from_uv` --- crates/fj-core/src/operations/build/surface.rs | 4 ++-- crates/fj-core/src/operations/sweep/path.rs | 2 +- crates/fj-core/src/validate/solid.rs | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/fj-core/src/operations/build/surface.rs b/crates/fj-core/src/operations/build/surface.rs index 9ce8fccf1..54d664063 100644 --- a/crates/fj-core/src/operations/build/surface.rs +++ b/crates/fj-core/src/operations/build/surface.rs @@ -24,7 +24,7 @@ pub trait BuildSurface { let (u, u_line) = GlobalPath::line_from_points([a, b]); let v = c - a; - let surface = Surface::surface_from_uv(u, v, core); + let surface = Surface::from_uv(u, v, core); let points_surface = { let [a, b] = @@ -38,7 +38,7 @@ pub trait BuildSurface { } /// Build a plane from the provided `u` and `v` - fn surface_from_uv( + fn from_uv( u: impl Into, v: impl Into>, core: &mut Core, diff --git a/crates/fj-core/src/operations/sweep/path.rs b/crates/fj-core/src/operations/sweep/path.rs index 36eea5bb9..800ed1a54 100644 --- a/crates/fj-core/src/operations/sweep/path.rs +++ b/crates/fj-core/src/operations/sweep/path.rs @@ -84,6 +84,6 @@ impl SweepSurfacePath for SurfacePath { } }; - Surface::surface_from_uv(u, path, core) + Surface::from_uv(u, path, core) } } diff --git a/crates/fj-core/src/validate/solid.rs b/crates/fj-core/src/validate/solid.rs index 41f272d2b..8ba6a0569 100644 --- a/crates/fj-core/src/validate/solid.rs +++ b/crates/fj-core/src/validate/solid.rs @@ -198,7 +198,7 @@ mod tests { let mut core = Core::new(); let shared_face = Face::new( - Surface::surface_from_uv( + Surface::from_uv( GlobalPath::circle_from_radius(1.), [0., 1., 1.], &mut core, @@ -257,7 +257,7 @@ mod tests { let invalid_solid = Solid::new(vec![Shell::new(vec![ Face::new( - Surface::surface_from_uv( + Surface::from_uv( GlobalPath::circle_from_radius(1.), [0., 1., 1.], &mut core, @@ -266,7 +266,7 @@ mod tests { ) .insert(&mut core), Face::new( - Surface::surface_from_uv( + Surface::from_uv( GlobalPath::circle_from_radius(1.), [0., 0., 1.], &mut core, @@ -305,7 +305,7 @@ mod tests { let invalid_solid = Solid::new(vec![Shell::new(vec![ Face::new( - Surface::surface_from_uv( + Surface::from_uv( GlobalPath::circle_from_radius(1.), [0., 1., 1.], &mut core, @@ -314,7 +314,7 @@ mod tests { ) .insert(&mut core), Face::new( - Surface::surface_from_uv( + Surface::from_uv( GlobalPath::circle_from_radius(1.), [0., 0., 1.], &mut core, @@ -350,7 +350,7 @@ mod tests { let shared_edge = HalfEdge::circle([0., 0.], 1., &mut core); let invalid_solid = Solid::new(vec![Shell::new(vec![Face::new( - Surface::surface_from_uv( + Surface::from_uv( GlobalPath::circle_from_radius(1.), [0., 0., 1.], &mut core,