Expand operations API; replace HalfEdgeBuilder

crates/fj-kernel/src/algorithms/approx/edge.rs

@@ -262,10 +262,9 @@ mod tests {
 
     use crate::{
         algorithms::approx::{path::RangeOnPath, Approx, ApproxPoint},
-        builder::HalfEdgeBuilder,
         geometry::{curve::GlobalPath, surface::SurfaceGeometry},
-        objects::Surface,
-        operations::Insert,
+        objects::{HalfEdge, Surface},
+        operations::{BuildHalfEdge, Insert},
         services::Services,
     };
 
@@ -274,9 +273,11 @@ mod tests {
         let mut services = Services::new();
 
         let surface = services.objects.surfaces.xz_plane();
-        let half_edge =
-            HalfEdgeBuilder::line_segment([[1., 1.], [2., 1.]], None)
-                .build(&mut services.objects);
+        let half_edge = HalfEdge::line_segment(
+            [[1., 1.], [2., 1.]],
+            None,
+            &mut services.objects,
+        );
 
         let tolerance = 1.;
         let approx = (&half_edge, surface.deref()).approx(tolerance);
@@ -293,9 +294,11 @@ mod tests {
             v: [0., 0., 1.].into(),
         })
         .insert(&mut services.objects);
-        let half_edge =
-            HalfEdgeBuilder::line_segment([[1., 1.], [2., 1.]], None)
-                .build(&mut services.objects);
+        let half_edge = HalfEdge::line_segment(
+            [[1., 1.], [2., 1.]],
+            None,
+            &mut services.objects,
+        );
 
         let tolerance = 1.;
         let approx = (&half_edge, surface.deref()).approx(tolerance);
@@ -315,11 +318,11 @@ mod tests {
             v: [0., 0., 1.].into(),
         })
         .insert(&mut services.objects);
-        let half_edge = HalfEdgeBuilder::line_segment(
+        let half_edge = HalfEdge::line_segment(
             [[0., 1.], [TAU, 1.]],
             Some(range.boundary),
-        )
-        .build(&mut services.objects);
+            &mut services.objects,
+        );
 
         let tolerance = 1.;
         let approx = (&half_edge, surface.deref()).approx(tolerance);
@@ -343,8 +346,7 @@ mod tests {
         let mut services = Services::new();
 
         let surface = services.objects.surfaces.xz_plane();
-        let half_edge =
-            HalfEdgeBuilder::circle(1.).build(&mut services.objects);
+        let half_edge = HalfEdge::circle(1., &mut services.objects);
 
         let tolerance = 1.;
         let approx = (&half_edge, surface.deref()).approx(tolerance);

crates/fj-kernel/src/algorithms/intersect/curve_edge.rs

@@ -72,7 +72,8 @@ mod tests {
     use fj_math::Point;
 
     use crate::{
-        builder::HalfEdgeBuilder, geometry::curve::Curve, services::Services,
+        geometry::curve::Curve, objects::HalfEdge, operations::BuildHalfEdge,
+        services::Services,
     };
 
     use super::CurveEdgeIntersection;
@@ -82,9 +83,11 @@ mod tests {
         let mut services = Services::new();
 
         let curve = Curve::u_axis();
-        let half_edge =
-            HalfEdgeBuilder::line_segment([[1., -1.], [1., 1.]], None)
-                .build(&mut services.objects);
+        let half_edge = HalfEdge::line_segment(
+            [[1., -1.], [1., 1.]],
+            None,
+            &mut services.objects,
+        );
 
         let intersection = CurveEdgeIntersection::compute(&curve, &half_edge);
 
@@ -101,9 +104,11 @@ mod tests {
         let mut services = Services::new();
 
         let curve = Curve::u_axis();
-        let half_edge =
-            HalfEdgeBuilder::line_segment([[-1., -1.], [-1., 1.]], None)
-                .build(&mut services.objects);
+        let half_edge = HalfEdge::line_segment(
+            [[-1., -1.], [-1., 1.]],
+            None,
+            &mut services.objects,
+        );
 
         let intersection = CurveEdgeIntersection::compute(&curve, &half_edge);
 
@@ -120,9 +125,11 @@ mod tests {
         let mut services = Services::new();
 
         let curve = Curve::u_axis();
-        let half_edge =
-            HalfEdgeBuilder::line_segment([[-1., -1.], [1., -1.]], None)
-                .build(&mut services.objects);
+        let half_edge = HalfEdge::line_segment(
+            [[-1., -1.], [1., -1.]],
+            None,
+            &mut services.objects,
+        );
 
         let intersection = CurveEdgeIntersection::compute(&curve, &half_edge);
 
@@ -134,9 +141,11 @@ mod tests {
         let mut services = Services::new();
 
         let curve = Curve::u_axis();
-        let half_edge =
-            HalfEdgeBuilder::line_segment([[-1., 0.], [1., 0.]], None)
-                .build(&mut services.objects);
+        let half_edge = HalfEdge::line_segment(
+            [[-1., 0.], [1., 0.]],
+            None,
+            &mut services.objects,
+        );
 
         let intersection = CurveEdgeIntersection::compute(&curve, &half_edge);
 

crates/fj-kernel/src/algorithms/intersect/curve_face.rs

@@ -179,8 +179,14 @@ mod tests {
         ];
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon(exterior_points))
-            .with_interior(CycleBuilder::polygon(interior_points))
+            .with_exterior(CycleBuilder::polygon(
+                exterior_points,
+                &mut services.objects,
+            ))
+            .with_interior(CycleBuilder::polygon(
+                interior_points,
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
 
         let expected =

crates/fj-kernel/src/algorithms/intersect/face_face.rs

@@ -86,7 +86,10 @@ mod tests {
         ]
         .map(|surface| {
             FaceBuilder::new(surface)
-                .with_exterior(CycleBuilder::polygon(points))
+                .with_exterior(CycleBuilder::polygon(
+                    points,
+                    &mut services.objects,
+                ))
                 .build(&mut services.objects)
         });
 
@@ -112,7 +115,10 @@ mod tests {
         ];
         let [a, b] = surfaces.clone().map(|surface| {
             FaceBuilder::new(surface)
-                .with_exterior(CycleBuilder::polygon(points))
+                .with_exterior(CycleBuilder::polygon(
+                    points,
+                    &mut services.objects,
+                ))
                 .build(&mut services.objects)
         });
 

crates/fj-kernel/src/algorithms/intersect/face_point.rs

@@ -147,11 +147,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [0., 0.],
-                [1., 1.],
-                [0., 2.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[0., 0.], [1., 1.], [0., 2.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([2., 1.]);
 
@@ -164,11 +163,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [0., 0.],
-                [2., 1.],
-                [0., 2.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[0., 0.], [2., 1.], [0., 2.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([1., 1.]);
 
@@ -184,11 +182,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [4., 2.],
-                [0., 4.],
-                [0., 0.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[4., 2.], [0., 4.], [0., 0.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([1., 2.]);
 
@@ -204,12 +201,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [0., 0.],
-                [2., 1.],
-                [3., 0.],
-                [3., 4.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[0., 0.], [2., 1.], [3., 0.], [3., 4.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([1., 1.]);
 
@@ -225,12 +220,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [0., 0.],
-                [2., 1.],
-                [3., 1.],
-                [0., 2.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[0., 0.], [2., 1.], [3., 1.], [0., 2.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([1., 1.]);
 
@@ -246,13 +239,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [0., 0.],
-                [2., 1.],
-                [3., 1.],
-                [4., 0.],
-                [4., 5.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[0., 0.], [2., 1.], [3., 1.], [4., 0.], [4., 5.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([1., 1.]);
 
@@ -268,11 +258,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [0., 0.],
-                [2., 0.],
-                [0., 1.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[0., 0.], [2., 0.], [0., 1.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([1., 0.]);
 
@@ -294,11 +283,10 @@ mod tests {
         let mut services = Services::new();
 
         let face = FaceBuilder::new(services.objects.surfaces.xy_plane())
-            .with_exterior(CycleBuilder::polygon([
-                [0., 0.],
-                [1., 0.],
-                [0., 1.],
-            ]))
+            .with_exterior(CycleBuilder::polygon(
+                [[0., 0.], [1., 0.], [0., 1.]],
+                &mut services.objects,
+            ))
             .build(&mut services.objects);
         let point = Point::from([1., 0.]);