Merge pull request #1124 from hannobraun/builder

Clean up `FaceBuilder` API

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

@@ -187,9 +187,9 @@ mod tests {
         ];
 
         let face = Face::builder(&stores, surface)
-            .build_polygon_from_points(exterior)
-            .with_hole(interior)
-            .into_face();
+            .with_exterior_polygon_from_points(exterior)
+            .with_interior_polygon_from_points(interior)
+            .build();
 
         let expected =
             CurveFaceIntersection::from_intervals([[[1.], [2.]], [[4.], [5.]]]);

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

@@ -84,8 +84,8 @@ mod tests {
         let surfaces = [Surface::xy_plane(), Surface::xz_plane()];
         let [a, b] = surfaces.map(|surface| {
             Face::builder(&stores, surface)
-                .build_polygon_from_points(points)
-                .into_face()
+                .with_exterior_polygon_from_points(points)
+                .build()
         });
 
         let intersection = FaceFaceIntersection::compute([&a, &b], &stores);
@@ -107,8 +107,8 @@ mod tests {
         let surfaces = [Surface::xy_plane(), Surface::xz_plane()];
         let [a, b] = surfaces.map(|surface| {
             Face::builder(&stores, surface)
-                .build_polygon_from_points(points)
-                .into_face()
+                .with_exterior_polygon_from_points(points)
+                .build()
         });
 
         let intersection = FaceFaceIntersection::compute([&a, &b], &stores);

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

@@ -143,8 +143,8 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([[0., 0.], [1., 1.], [0., 2.]])
-            .into_face();
+            .with_exterior_polygon_from_points([[0., 0.], [1., 1.], [0., 2.]])
+            .build();
         let point = Point::from([2., 1.]);
 
         let intersection = (&face, &point).intersect();
@@ -156,8 +156,8 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([[0., 0.], [2., 1.], [0., 2.]])
-            .into_face();
+            .with_exterior_polygon_from_points([[0., 0.], [2., 1.], [0., 2.]])
+            .build();
         let point = Point::from([1., 1.]);
 
         let intersection = (&face, &point).intersect();
@@ -172,8 +172,8 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([[4., 2.], [0., 4.], [0., 0.]])
-            .into_face();
+            .with_exterior_polygon_from_points([[4., 2.], [0., 4.], [0., 0.]])
+            .build();
         let point = Point::from([1., 2.]);
 
         let intersection = (&face, &point).intersect();
@@ -188,8 +188,13 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([[0., 0.], [2., 1.], [3., 0.], [3., 4.]])
-            .into_face();
+            .with_exterior_polygon_from_points([
+                [0., 0.],
+                [2., 1.],
+                [3., 0.],
+                [3., 4.],
+            ])
+            .build();
         let point = Point::from([1., 1.]);
 
         let intersection = (&face, &point).intersect();
@@ -204,8 +209,13 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([[0., 0.], [2., 1.], [3., 1.], [0., 2.]])
-            .into_face();
+            .with_exterior_polygon_from_points([
+                [0., 0.],
+                [2., 1.],
+                [3., 1.],
+                [0., 2.],
+            ])
+            .build();
         let point = Point::from([1., 1.]);
 
         let intersection = (&face, &point).intersect();
@@ -220,14 +230,14 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [0., 0.],
                 [2., 1.],
                 [3., 1.],
                 [4., 0.],
                 [4., 5.],
             ])
-            .into_face();
+            .build();
         let point = Point::from([1., 1.]);
 
         let intersection = (&face, &point).intersect();
@@ -242,8 +252,8 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([[0., 0.], [2., 0.], [0., 1.]])
-            .into_face();
+            .with_exterior_polygon_from_points([[0., 0.], [2., 0.], [0., 1.]])
+            .build();
         let point = Point::from([1., 0.]);
 
         let intersection = (&face, &point).intersect();
@@ -267,8 +277,8 @@ mod tests {
         let stores = Stores::new();
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]])
-            .into_face();
+            .with_exterior_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]])
+            .build();
         let point = Point::from([1., 0.]);
 
         let intersection = (&face, &point).intersect();

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

@@ -169,13 +169,13 @@ mod tests {
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
         let face = Face::builder(&stores, Surface::yz_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [-1., -1.],
                 [1., -1.],
                 [1., 1.],
                 [-1., 1.],
             ])
-            .into_face()
+            .build()
             .translate([-1., 0., 0.], &stores);
 
         assert_eq!((&ray, &face).intersect(), None);
@@ -188,13 +188,13 @@ mod tests {
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
         let face = Face::builder(&stores, Surface::yz_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [-1., -1.],
                 [1., -1.],
                 [1., 1.],
                 [-1., 1.],
             ])
-            .into_face()
+            .build()
             .translate([1., 0., 0.], &stores);
 
         assert_eq!(
@@ -210,13 +210,13 @@ mod tests {
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
         let face = Face::builder(&stores, Surface::yz_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [-1., -1.],
                 [1., -1.],
                 [1., 1.],
                 [-1., 1.],
             ])
-            .into_face()
+            .build()
             .translate([0., 0., 2.], &stores);
 
         assert_eq!((&ray, &face).intersect(), None);
@@ -229,13 +229,13 @@ mod tests {
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
         let face = Face::builder(&stores, Surface::yz_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [-1., -1.],
                 [1., -1.],
                 [1., 1.],
                 [-1., 1.],
             ])
-            .into_face()
+            .build()
             .translate([1., 1., 0.], &stores);
 
         let edge = face
@@ -259,13 +259,13 @@ mod tests {
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
         let face = Face::builder(&stores, Surface::yz_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [-1., -1.],
                 [1., -1.],
                 [1., 1.],
                 [-1., 1.],
             ])
-            .into_face()
+            .build()
             .translate([1., 1., 1.], &stores);
 
         let vertex = face
@@ -287,13 +287,13 @@ mod tests {
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [-1., -1.],
                 [1., -1.],
                 [1., 1.],
                 [-1., 1.],
             ])
-            .into_face();
+            .build();
 
         assert_eq!(
             (&ray, &face).intersect(),
@@ -308,13 +308,13 @@ mod tests {
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
         let face = Face::builder(&stores, Surface::xy_plane())
-            .build_polygon_from_points([
+            .with_exterior_polygon_from_points([
                 [-1., -1.],
                 [1., -1.],
                 [1., 1.],
                 [-1., 1.],
             ])
-            .into_face()
+            .build()
             .translate([0., 0., 1.], &stores);
 
         assert_eq!((&ray, &face).intersect(), None)

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

@@ -198,18 +198,17 @@ mod tests {
 
         let expected_face = {
             let surface = Surface::xz_plane();
-            let builder = HalfEdge::builder(&stores, surface);
 
-            let bottom =
-                builder.build_line_segment_from_points([[0., 0.], [1., 0.]]);
-            let top = builder
+            let bottom = HalfEdge::builder(&stores, surface)
+                .build_line_segment_from_points([[0., 0.], [1., 0.]]);
+            let top = HalfEdge::builder(&stores, surface)
                 .build_line_segment_from_points([[0., 1.], [1., 1.]])
                 .reverse();
-            let left = builder
+            let left = HalfEdge::builder(&stores, surface)
                 .build_line_segment_from_points([[0., 0.], [0., 1.]])
                 .reverse();
-            let right =
-                builder.build_line_segment_from_points([[1., 0.], [1., 1.]]);
+            let right = HalfEdge::builder(&stores, surface)
+                .build_line_segment_from_points([[1., 0.], [1., 1.]]);
 
             let cycle = Cycle::new(surface, [bottom, right, top, left]);
 

crates/fj-kernel/src/algorithms/sweep/face.rs

@@ -95,12 +95,12 @@ mod tests {
             .sweep(UP, &stores);
 
         let bottom = Face::builder(&stores, surface)
-            .build_polygon_from_points(TRIANGLE)
-            .into_face()
+            .with_exterior_polygon_from_points(TRIANGLE)
+            .build()
             .reverse();
         let top = Face::builder(&stores, surface.translate(UP, &stores))
-            .build_polygon_from_points(TRIANGLE)
-            .into_face();
+            .with_exterior_polygon_from_points(TRIANGLE)
+            .build();
 
         assert!(solid.find_face(&bottom).is_some());
         assert!(solid.find_face(&top).is_some());
@@ -130,12 +130,12 @@ mod tests {
             .sweep(DOWN, &stores);
 
         let bottom = Face::builder(&stores, surface.translate(DOWN, &stores))
-            .build_polygon_from_points(TRIANGLE)
-            .into_face()
+            .with_exterior_polygon_from_points(TRIANGLE)
+            .build()
             .reverse();
         let top = Face::builder(&stores, surface)
-            .build_polygon_from_points(TRIANGLE)
-            .into_face();
+            .with_exterior_polygon_from_points(TRIANGLE)
+            .build();
 
         assert!(solid.find_face(&bottom).is_some());
         assert!(solid.find_face(&top).is_some());

crates/fj-kernel/src/algorithms/triangulate/mod.rs

@@ -101,8 +101,8 @@ mod tests {
 
         let surface = Surface::xy_plane();
         let face = Face::builder(&stores, surface)
-            .build_polygon_from_points([a, b, c, d])
-            .into_face();
+            .with_exterior_polygon_from_points([a, b, c, d])
+            .build();
 
         let a = Point::from(a).to_xyz();
         let b = Point::from(b).to_xyz();
@@ -135,9 +135,9 @@ mod tests {
 
         let surface = Surface::xy_plane();
         let face = Face::builder(&stores, surface)
-            .build_polygon_from_points([a, b, c, d])
-            .with_hole([e, f, g, h])
-            .into_face();
+            .with_exterior_polygon_from_points([a, b, c, d])
+            .with_interior_polygon_from_points([e, f, g, h])
+            .build();
 
         let triangles = triangulate(face)?;
 
@@ -188,8 +188,8 @@ mod tests {
 
         let surface = Surface::xy_plane();
         let face = Face::builder(&stores, surface)
-            .build_polygon_from_points([a, b, c, d, e])
-            .into_face();
+            .with_exterior_polygon_from_points([a, b, c, d, e])
+            .build();
 
         let triangles = triangulate(face)?;
 

crates/fj-kernel/src/builder/curve.rs

@@ -19,23 +19,23 @@ pub struct CurveBuilder<'a> {
 
 impl<'a> CurveBuilder<'a> {
     /// Build a line that represents the u-axis on the surface
-    pub fn build_u_axis(&self) -> Curve {
+    pub fn build_u_axis(self) -> Curve {
         let a = Point::origin();
         let b = a + Vector::unit_u();
 
         self.build_line_from_points([a, b])
     }
 
     /// Build a line that represents the v-axis on the surface
-    pub fn build_v_axis(&self) -> Curve {
+    pub fn build_v_axis(self) -> Curve {
         let a = Point::origin();
         let b = a + Vector::unit_v();
 
         self.build_line_from_points([a, b])
     }
 
     /// Build a circle from the given radius
-    pub fn build_circle_from_radius(&self, radius: impl Into<Scalar>) -> Curve {
+    pub fn build_circle_from_radius(self, radius: impl Into<Scalar>) -> Curve {
         let radius = radius.into();
 
         let path = SurfacePath::circle_from_radius(radius);

crates/fj-kernel/src/builder/cycle.rs

@@ -19,7 +19,7 @@ pub struct CycleBuilder<'a> {
 impl<'a> CycleBuilder<'a> {
     /// Create a polygon from a list of points
     pub fn build_polygon_from_points(
-        &self,
+        self,
         points: impl IntoIterator<Item = impl Into<Point<2>>>,
     ) -> Cycle {
         let mut points: Vec<_> = points.into_iter().map(Into::into).collect();

crates/fj-kernel/src/builder/edge.rs

@@ -23,7 +23,7 @@ pub struct HalfEdgeBuilder<'a> {
 impl<'a> HalfEdgeBuilder<'a> {
     /// Build a circle from the given radius
     pub fn build_circle_from_radius(
-        &self,
+        self,
         radius: impl Into<Scalar>,
     ) -> HalfEdge {
         let curve = Curve::builder(self.stores, self.surface)
@@ -62,7 +62,7 @@ impl<'a> HalfEdgeBuilder<'a> {
 
     /// Build a line segment from two points
     pub fn build_line_segment_from_points(
-        &self,
+        self,
         points: [impl Into<Point<2>>; 2],
     ) -> HalfEdge {
         let points = points.map(Into::into);