Merge pull request #1200 from hannobraun/planes

Provide access to default planes through `Objects`
hannobraun · Oct 11, 2022 · 4ba6a22 · 4ba6a22
2 parents e02c595 + fe5e0b4
commit 4ba6a22
Show file tree

Hide file tree

Showing 17 changed files with 123 additions and 98 deletions.
diff --git a/crates/fj-kernel/src/algorithms/intersect/curve_edge.rs b/crates/fj-kernel/src/algorithms/intersect/curve_edge.rs
@@ -75,7 +75,7 @@ mod tests {
     use fj_math::Point;
 
     use crate::{
-        objects::{Curve, HalfEdge, Objects, Surface},
+        objects::{Curve, HalfEdge, Objects},
         partial::HasPartial,
         storage::Handle,
     };
@@ -86,7 +86,7 @@ mod tests {
     fn compute_edge_in_front_of_curve_origin() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let curve = Handle::<Curve>::partial()
             .with_surface(Some(surface.clone()))
             .as_u_axis()
@@ -110,7 +110,7 @@ mod tests {
     fn compute_edge_behind_curve_origin() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let curve = Handle::<Curve>::partial()
             .with_surface(Some(surface.clone()))
             .as_u_axis()
@@ -134,7 +134,7 @@ mod tests {
     fn compute_edge_parallel_to_curve() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let curve = Handle::<Curve>::partial()
             .with_surface(Some(surface.clone()))
             .as_u_axis()
@@ -153,7 +153,7 @@ mod tests {
     fn compute_edge_on_curve() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let curve = Handle::<Curve>::partial()
             .with_surface(Some(surface.clone()))
             .as_u_axis()

diff --git a/crates/fj-kernel/src/algorithms/intersect/curve_face.rs b/crates/fj-kernel/src/algorithms/intersect/curve_face.rs
@@ -156,7 +156,7 @@ where
 #[cfg(test)]
 mod tests {
     use crate::{
-        objects::{Curve, Face, Objects, Surface},
+        objects::{Curve, Face, Objects},
         partial::HasPartial,
         storage::Handle,
     };
@@ -167,7 +167,7 @@ mod tests {
     fn compute() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
 
         let curve = Handle::<Curve>::partial()
             .with_surface(Some(surface.clone()))

diff --git a/crates/fj-kernel/src/algorithms/intersect/face_face.rs b/crates/fj-kernel/src/algorithms/intersect/face_face.rs
@@ -64,7 +64,7 @@ mod tests {
 
     use crate::{
         algorithms::intersect::CurveFaceIntersection,
-        objects::{Curve, Face, Objects, Surface},
+        objects::{Curve, Face, Objects},
         partial::HasPartial,
         storage::Handle,
     };
@@ -82,9 +82,8 @@ mod tests {
             [2., 2.],
             [1., 2.],
         ];
-        let [a, b] =
-            [Surface::xy_plane(), Surface::xz_plane()].map(|surface| {
-                let surface = objects.surfaces.insert(surface);
+        let [a, b] = [objects.surfaces.xy_plane(), objects.surfaces.xz_plane()]
+            .map(|surface| {
                 Face::builder(&objects, surface)
                     .with_exterior_polygon_from_points(points)
                     .build()
@@ -106,8 +105,8 @@ mod tests {
             [ 1.,  1.],
             [-1.,  1.],
         ];
-        let surfaces = [Surface::xy_plane(), Surface::xz_plane()]
-            .map(|surface| objects.surfaces.insert(surface));
+        let surfaces =
+            [objects.surfaces.xy_plane(), objects.surfaces.xz_plane()];
         let [a, b] = surfaces.clone().map(|surface| {
             Face::builder(&objects, surface)
                 .with_exterior_polygon_from_points(points)

diff --git a/crates/fj-kernel/src/algorithms/intersect/face_point.rs b/crates/fj-kernel/src/algorithms/intersect/face_point.rs
@@ -134,14 +134,14 @@ mod tests {
     use crate::{
         algorithms::intersect::{face_point::FacePointIntersection, Intersect},
         iter::ObjectIters,
-        objects::{Face, Objects, Surface},
+        objects::{Face, Objects},
     };
 
     #[test]
     fn point_is_outside_face() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([[0., 0.], [1., 1.], [0., 2.]])
             .build();
@@ -155,7 +155,7 @@ mod tests {
     fn ray_hits_vertex_while_passing_outside() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([[0., 0.], [2., 1.], [0., 2.]])
             .build();
@@ -172,7 +172,7 @@ mod tests {
     fn ray_hits_vertex_at_cycle_seam() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([[4., 2.], [0., 4.], [0., 0.]])
             .build();
@@ -189,7 +189,7 @@ mod tests {
     fn ray_hits_vertex_while_staying_inside() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [0., 0.],
@@ -211,7 +211,7 @@ mod tests {
     fn ray_hits_parallel_edge_and_leaves_face_at_vertex() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [0., 0.],
@@ -233,7 +233,7 @@ mod tests {
     fn ray_hits_parallel_edge_and_does_not_leave_face_there() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [0., 0.],
@@ -256,7 +256,7 @@ mod tests {
     fn point_is_coincident_with_edge() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([[0., 0.], [2., 0.], [0., 1.]])
             .build();
@@ -282,7 +282,7 @@ mod tests {
     fn point_is_coincident_with_vertex() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([[0., 0.], [1., 0.], [0., 1.]])
             .build();

diff --git a/crates/fj-kernel/src/algorithms/intersect/ray_face.rs b/crates/fj-kernel/src/algorithms/intersect/ray_face.rs
@@ -152,7 +152,7 @@ mod tests {
             transform::TransformObject,
         },
         iter::ObjectIters,
-        objects::{Face, Objects, Surface},
+        objects::{Face, Objects},
     };
 
     #[test]
@@ -161,7 +161,7 @@ mod tests {
 
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
-        let surface = objects.surfaces.insert(Surface::yz_plane());
+        let surface = objects.surfaces.yz_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [-1., -1.],
@@ -181,7 +181,7 @@ mod tests {
 
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
-        let surface = objects.surfaces.insert(Surface::yz_plane());
+        let surface = objects.surfaces.yz_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [-1., -1.],
@@ -204,7 +204,7 @@ mod tests {
 
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
-        let surface = objects.surfaces.insert(Surface::yz_plane());
+        let surface = objects.surfaces.yz_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [-1., -1.],
@@ -224,7 +224,7 @@ mod tests {
 
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
-        let surface = objects.surfaces.insert(Surface::yz_plane());
+        let surface = objects.surfaces.yz_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [-1., -1.],
@@ -255,7 +255,7 @@ mod tests {
 
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
-        let surface = objects.surfaces.insert(Surface::yz_plane());
+        let surface = objects.surfaces.yz_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [-1., -1.],
@@ -284,7 +284,7 @@ mod tests {
 
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [-1., -1.],
@@ -306,7 +306,7 @@ mod tests {
 
         let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([
                 [-1., -1.],

diff --git a/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs b/crates/fj-kernel/src/algorithms/intersect/surface_surface.rs
@@ -88,7 +88,7 @@ mod tests {
 
     use crate::{
         algorithms::transform::TransformObject,
-        objects::{Curve, Objects, Surface},
+        objects::{Curve, Objects},
         partial::HasPartial,
         storage::Handle,
     };
@@ -99,8 +99,8 @@ mod tests {
     fn plane_plane() {
         let objects = Objects::new();
 
-        let xy = objects.surfaces.insert(Surface::xy_plane());
-        let xz = objects.surfaces.insert(Surface::xz_plane());
+        let xy = objects.surfaces.xy_plane();
+        let xz = objects.surfaces.xz_plane();
 
         // Coincident and parallel planes don't have an intersection curve.
         assert_eq!(

diff --git a/crates/fj-kernel/src/algorithms/sweep/edge.rs b/crates/fj-kernel/src/algorithms/sweep/edge.rs
@@ -188,7 +188,7 @@ mod tests {
 
     use crate::{
         algorithms::{reverse::Reverse, sweep::Sweep},
-        objects::{Cycle, Face, HalfEdge, Objects, Surface},
+        objects::{Cycle, Face, HalfEdge, Objects},
         partial::HasPartial,
     };
 
@@ -197,14 +197,14 @@ mod tests {
         let objects = Objects::new();
 
         let half_edge = HalfEdge::partial()
-            .with_surface(Some(objects.surfaces.insert(Surface::xy_plane())))
+            .with_surface(Some(objects.surfaces.xy_plane()))
             .as_line_segment_from_points([[0., 0.], [1., 0.]])
             .build(&objects);
 
         let face = (half_edge, Color::default()).sweep([0., 0., 1.], &objects);
 
         let expected_face = {
-            let surface = objects.surfaces.insert(Surface::xz_plane());
+            let surface = objects.surfaces.xz_plane();
 
             let bottom = HalfEdge::partial()
                 .with_surface(Some(surface.clone()))

diff --git a/crates/fj-kernel/src/algorithms/sweep/face.rs b/crates/fj-kernel/src/algorithms/sweep/face.rs
@@ -80,7 +80,7 @@ mod tests {
 
     use crate::{
         algorithms::{reverse::Reverse, transform::TransformObject},
-        objects::{Face, HalfEdge, Objects, Sketch, Surface},
+        objects::{Face, HalfEdge, Objects, Sketch},
         partial::HasPartial,
     };
 
@@ -95,7 +95,7 @@ mod tests {
     fn sweep_up() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let solid = Sketch::builder(&objects, surface.clone())
             .build_polygon_from_points(TRIANGLE)
             .sweep(UP, &objects);
@@ -119,9 +119,7 @@ mod tests {
             let [a, b] = [window[0], window[1]];
 
             let half_edge = HalfEdge::partial()
-                .with_surface(Some(
-                    objects.surfaces.insert(Surface::xy_plane()),
-                ))
+                .with_surface(Some(objects.surfaces.xy_plane()))
                 .as_line_segment_from_points([a, b])
                 .build(&objects);
             (half_edge, Color::default()).sweep(UP, &objects)
@@ -134,7 +132,7 @@ mod tests {
     fn sweep_down() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let solid = Sketch::builder(&objects, surface.clone())
             .build_polygon_from_points(TRIANGLE)
             .sweep(DOWN, &objects);
@@ -159,9 +157,7 @@ mod tests {
             let [a, b] = [window[0], window[1]];
 
             let half_edge = HalfEdge::partial()
-                .with_surface(Some(
-                    objects.surfaces.insert(Surface::xy_plane()),
-                ))
+                .with_surface(Some(objects.surfaces.xy_plane()))
                 .as_line_segment_from_points([a, b])
                 .build(&objects)
                 .reverse();

diff --git a/crates/fj-kernel/src/algorithms/sweep/vertex.rs b/crates/fj-kernel/src/algorithms/sweep/vertex.rs
@@ -154,7 +154,7 @@ mod tests {
 
     use crate::{
         algorithms::sweep::Sweep,
-        objects::{Curve, HalfEdge, Objects, Surface, Vertex},
+        objects::{Curve, HalfEdge, Objects, Vertex},
         partial::HasPartial,
         storage::Handle,
     };
@@ -163,7 +163,7 @@ mod tests {
     fn vertex_surface() {
         let objects = Objects::new();
 
-        let surface = objects.surfaces.insert(Surface::xz_plane());
+        let surface = objects.surfaces.xz_plane();
         let curve = Handle::<Curve>::partial()
             .with_surface(Some(surface.clone()))
             .as_u_axis()

diff --git a/crates/fj-kernel/src/algorithms/triangulate/mod.rs b/crates/fj-kernel/src/algorithms/triangulate/mod.rs
@@ -84,7 +84,7 @@ mod tests {
 
     use crate::{
         algorithms::approx::{Approx, Tolerance},
-        objects::{Face, Objects, Surface},
+        objects::{Face, Objects},
     };
 
     use super::Triangulate;
@@ -98,7 +98,7 @@ mod tests {
         let c = [2., 2.];
         let d = [0., 1.];
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface)
             .with_exterior_polygon_from_points([a, b, c, d])
             .build();
@@ -132,7 +132,7 @@ mod tests {
         let g = [3., 3.];
         let h = [3., 1.];
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface.clone())
             .with_exterior_polygon_from_points([a, b, c, d])
             .with_interior_polygon_from_points([e, f, g, h])
@@ -192,7 +192,7 @@ mod tests {
         let d = [0.1, 0.1];
         let e = [0., 0.8];
 
-        let surface = objects.surfaces.insert(Surface::xy_plane());
+        let surface = objects.surfaces.xy_plane();
         let face = Face::builder(&objects, surface.clone())
             .with_exterior_polygon_from_points([a, b, c, d, e])
             .build();