Provide surface to BuildHalfEdge methods

hannobraun · Apr 26, 2024 · 23684c2 · 23684c2
1 parent 143e12b
commit 23684c2
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 20 deletions.
diff --git a/crates/fj-core/src/operations/build/cycle.rs b/crates/fj-core/src/operations/build/cycle.rs
@@ -23,15 +23,19 @@ pub trait BuildCycle {
     fn circle(
         center: impl Into<Point<2>>,
         radius: impl Into<Scalar>,
-        _: Handle<Surface>,
+        surface: Handle<Surface>,
         core: &mut Core,
     ) -> Cycle {
-        let circle = HalfEdge::circle(center, radius, core);
+        let circle = HalfEdge::circle(center, radius, surface, core);
         Cycle::empty().add_half_edges([circle], core)
     }
 
     /// Build a polygon
-    fn polygon<P, Ps>(points: Ps, _: Handle<Surface>, core: &mut Core) -> Cycle
+    fn polygon<P, Ps>(
+        points: Ps,
+        surface: Handle<Surface>,
+        core: &mut Core,
+    ) -> Cycle
     where
         P: Into<Point<2>>,
         Ps: IntoIterator<Item = P>,
@@ -42,7 +46,12 @@ pub trait BuildCycle {
             .map(Into::into)
             .circular_tuple_windows()
             .map(|(start, end)| {
-                HalfEdge::line_segment([start, end], None, core)
+                HalfEdge::line_segment(
+                    [start, end],
+                    None,
+                    surface.clone(),
+                    core,
+                )
             });
 
         Cycle::new(edges)

diff --git a/crates/fj-core/src/operations/build/half_edge.rs b/crates/fj-core/src/operations/build/half_edge.rs
@@ -5,7 +5,7 @@ use crate::{
     geometry::{HalfEdgeGeom, SurfacePath},
     operations::{geometry::UpdateHalfEdgeGeometry, insert::Insert},
     storage::Handle,
-    topology::{Curve, HalfEdge, Vertex},
+    topology::{Curve, HalfEdge, Surface, Vertex},
     Core,
 };
 
@@ -46,6 +46,7 @@ pub trait BuildHalfEdge {
         start: impl Into<Point<2>>,
         end: impl Into<Point<2>>,
         angle_rad: impl Into<Scalar>,
+        _: Handle<Surface>,
         core: &mut Core,
     ) -> Handle<HalfEdge> {
         let angle_rad = angle_rad.into();
@@ -76,6 +77,7 @@ pub trait BuildHalfEdge {
     fn circle(
         center: impl Into<Point<2>>,
         radius: impl Into<Scalar>,
+        _: Handle<Surface>,
         core: &mut Core,
     ) -> Handle<HalfEdge> {
         let path = SurfacePath::circle_from_center_and_radius(center, radius);
@@ -98,6 +100,7 @@ pub trait BuildHalfEdge {
     fn line_segment(
         points_surface: [impl Into<Point<2>>; 2],
         boundary: Option<[Point<1>; 2]>,
+        _: Handle<Surface>,
         core: &mut Core,
     ) -> Handle<HalfEdge> {
         let boundary =

diff --git a/crates/fj-core/src/operations/build/shell.rs b/crates/fj-core/src/operations/build/shell.rs
@@ -95,6 +95,7 @@ pub trait BuildShell {
                             let half_edge = HalfEdge::line_segment(
                                 positions,
                                 Some(boundary.reverse().inner),
+                                surface.clone(),
                                 core,
                             );
                             half_edge

diff --git a/crates/fj-core/src/operations/holes.rs b/crates/fj-core/src/operations/holes.rs
@@ -43,7 +43,12 @@ impl AddHole for Shell {
         path: impl Into<Vector<3>>,
         core: &mut Core,
     ) -> Self {
-        let entry = HalfEdge::circle(location.position, radius, core);
+        let entry = HalfEdge::circle(
+            location.position,
+            radius,
+            location.face.surface().clone(),
+            core,
+        );
         let hole = Region::empty(core)
             .update_exterior(
                 |_, core| Cycle::empty().add_half_edges([entry.clone()], core),
@@ -91,7 +96,12 @@ impl AddHole for Shell {
     ) -> Self {
         let radius = radius.into();
 
-        let entry = HalfEdge::circle(entry_location.position, radius, core);
+        let entry = HalfEdge::circle(
+            entry_location.position,
+            radius,
+            entry_location.face.surface().clone(),
+            core,
+        );
 
         let path = {
             let point = |location: &HoleLocation| {

diff --git a/crates/fj-core/src/operations/split/face.rs b/crates/fj-core/src/operations/split/face.rs
@@ -109,6 +109,7 @@ impl SplitFace for Shell {
                     core.layers.geometry.of_half_edge(&d).start_position(),
                 ],
                 None,
+                face.surface().clone(),
                 core,
             );
             half_edge

diff --git a/crates/fj-core/src/operations/sweep/half_edge.rs b/crates/fj-core/src/operations/sweep/half_edge.rs
@@ -122,6 +122,7 @@ impl SweepHalfEdge for Handle<HalfEdge> {
                     let line_segment = HalfEdge::line_segment(
                         [start, end],
                         Some(boundary),
+                        surface.clone(),
                         core,
                     );
                     let half_edge = line_segment

diff --git a/crates/fj-core/src/validate/sketch.rs b/crates/fj-core/src/validate/sketch.rs
@@ -220,7 +220,8 @@ mod tests {
 
         let surface = core.layers.topology.surfaces.space_2d();
 
-        let valid_outer_circle = HalfEdge::circle([0., 0.], 1., &mut core);
+        let valid_outer_circle =
+            HalfEdge::circle([0., 0.], 1., surface.clone(), &mut core);
         let valid_exterior =
             Cycle::new(vec![valid_outer_circle.clone()]).insert(&mut core);
         let valid_sketch = Sketch::new(
@@ -259,8 +260,10 @@ mod tests {
 
         let surface = core.layers.topology.surfaces.space_2d();
 
-        let outer_circle = HalfEdge::circle([0., 0.], 2., &mut core);
-        let inner_circle = HalfEdge::circle([0., 0.], 1., &mut core);
+        let outer_circle =
+            HalfEdge::circle([0., 0.], 2., surface.clone(), &mut core);
+        let inner_circle =
+            HalfEdge::circle([0., 0.], 1., surface.clone(), &mut core);
         let cw_inner_circle = HalfEdge::from_sibling(
             &inner_circle,
             Vertex::new().insert(&mut core),

diff --git a/crates/fj-core/src/validate/solid.rs b/crates/fj-core/src/validate/solid.rs
@@ -204,8 +204,13 @@ mod tests {
                 &mut core,
             ),
             Region::new(
-                Cycle::new(vec![HalfEdge::circle([0., 0.], 1., &mut core)])
-                    .insert(&mut core),
+                Cycle::new(vec![HalfEdge::circle(
+                    [0., 0.],
+                    1.,
+                    core.layers.topology.surfaces.space_2d(),
+                    &mut core,
+                )])
+                .insert(&mut core),
                 vec![],
             )
             .insert(&mut core),
@@ -249,8 +254,13 @@ mod tests {
         let mut core = Core::new();
 
         let shared_region = Region::new(
-            Cycle::new(vec![HalfEdge::circle([0., 0.], 1., &mut core)])
-                .insert(&mut core),
+            Cycle::new(vec![HalfEdge::circle(
+                [0., 0.],
+                1.,
+                core.layers.topology.surfaces.space_2d(),
+                &mut core,
+            )])
+            .insert(&mut core),
             vec![],
         )
         .insert(&mut core);
@@ -299,9 +309,13 @@ mod tests {
     fn should_find_cycle_multiple_references() -> anyhow::Result<()> {
         let mut core = Core::new();
 
-        let shared_cycle =
-            Cycle::new(vec![HalfEdge::circle([0., 0.], 1., &mut core)])
-                .insert(&mut core);
+        let shared_cycle = Cycle::new(vec![HalfEdge::circle(
+            [0., 0.],
+            1.,
+            core.layers.topology.surfaces.space_2d(),
+            &mut core,
+        )])
+        .insert(&mut core);
 
         let invalid_solid = Solid::new(vec![Shell::new(vec![
             Face::new(
@@ -347,7 +361,12 @@ mod tests {
     fn should_find_half_edge_multiple_references() -> anyhow::Result<()> {
         let mut core = Core::new();
 
-        let shared_edge = HalfEdge::circle([0., 0.], 1., &mut core);
+        let shared_edge = HalfEdge::circle(
+            [0., 0.],
+            1.,
+            core.layers.topology.surfaces.space_2d(),
+            &mut core,
+        );
 
         let invalid_solid = Solid::new(vec![Shell::new(vec![Face::new(
             Surface::from_uv(

diff --git a/crates/fj-core/src/validation/checks/half_edge_connection.rs b/crates/fj-core/src/validation/checks/half_edge_connection.rs
@@ -147,8 +147,11 @@ mod tests {
 
         // We're only testing for `Face` here, not `Sketch`. Should be fine, as
         // most of the code is shared.
-        let valid =
-            Face::polygon(surface, [[0., 0.], [1., 0.], [1., 1.]], &mut core);
+        let valid = Face::polygon(
+            surface.clone(),
+            [[0., 0.], [1., 0.], [1., 1.]],
+            &mut core,
+        );
         AdjacentHalfEdgesNotConnected::check_and_return_first_error(
             &valid,
             &core.layers.geometry,
@@ -164,6 +167,7 @@ mod tests {
                                 [HalfEdge::line_segment(
                                     [[0., 0.], [2., 0.]],
                                     None,
+                                    surface,
                                     core,
                                 )]
                             },