Merge pull request #1813 from hannobraun/builder

Migrate last piece of code from builder to operations API; remove builder API
hannobraun · May 4, 2023 · d7b4fca · d7b4fca
2 parents fa02019 + fb77439
commit d7b4fca
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 91 deletions.
diff --git a/crates/fj-kernel/src/algorithms/sweep/face.rs b/crates/fj-kernel/src/algorithms/sweep/face.rs
@@ -5,10 +5,9 @@ use itertools::Itertools;
 
 use crate::{
     algorithms::{reverse::Reverse, transform::TransformObject},
-    builder::CycleBuilder,
     geometry::curve::GlobalPath,
-    objects::{Face, Shell},
-    operations::Insert,
+    objects::{Cycle, Face, Shell},
+    operations::{BuildCycle, Insert, JoinCycle},
     services::Services,
     storage::Handle,
 };
@@ -82,13 +81,14 @@ impl Sweep for Handle<Face> {
                 ));
             }
 
-            let top_cycle = CycleBuilder::connect_to_edges(top_edges, services)
-                .build(services);
+            let top_cycle = Cycle::empty()
+                .add_joined_edges(top_edges, services)
+                .insert(services);
 
             if i == 0 {
-                exterior = Some(top_cycle.insert(services));
+                exterior = Some(top_cycle);
             } else {
-                interiors.push(top_cycle.insert(services));
+                interiors.push(top_cycle);
             };
         }
 

diff --git a/crates/fj-kernel/src/builder/cycle.rs b/crates/fj-kernel/src/builder/cycle.rs
diff --git a/crates/fj-kernel/src/builder/mod.rs b/crates/fj-kernel/src/builder/mod.rs
diff --git a/crates/fj-kernel/src/lib.rs b/crates/fj-kernel/src/lib.rs
@@ -88,7 +88,6 @@
 #![warn(missing_docs)]
 
 pub mod algorithms;
-pub mod builder;
 pub mod geometry;
 pub mod objects;
 pub mod operations;

diff --git a/crates/fj-kernel/src/operations/join/cycle.rs b/crates/fj-kernel/src/operations/join/cycle.rs
@@ -1,13 +1,24 @@
 use std::ops::RangeInclusive;
 
+use fj_math::Point;
+use itertools::Itertools;
+
 use crate::{
-    objects::Cycle,
-    operations::{Insert, UpdateCycle, UpdateHalfEdge},
+    geometry::curve::Curve,
+    objects::{Cycle, HalfEdge},
+    operations::{BuildHalfEdge, Insert, UpdateCycle, UpdateHalfEdge},
     services::Services,
+    storage::Handle,
 };
 
 /// Join a [`Cycle`] to another
 pub trait JoinCycle {
+    /// Create a cycle that is joined to the provided edges
+    fn add_joined_edges<Es>(&self, edges: Es, services: &mut Services) -> Self
+    where
+        Es: IntoIterator<Item = (Handle<HalfEdge>, Curve, [Point<1>; 2])>,
+        Es::IntoIter: Clone + ExactSizeIterator;
+
     /// Join the cycle to another
     ///
     /// Joins the cycle to the other at the provided ranges. The ranges specify
@@ -47,6 +58,21 @@ pub trait JoinCycle {
 }
 
 impl JoinCycle for Cycle {
+    fn add_joined_edges<Es>(&self, edges: Es, services: &mut Services) -> Self
+    where
+        Es: IntoIterator<Item = (Handle<HalfEdge>, Curve, [Point<1>; 2])>,
+        Es::IntoIter: Clone + ExactSizeIterator,
+    {
+        self.add_half_edges(edges.into_iter().circular_tuple_windows().map(
+            |((prev, _, _), (half_edge, curve, boundary))| {
+                HalfEdge::unjoined(curve, boundary, services)
+                    .replace_start_vertex(prev.start_vertex().clone())
+                    .replace_global_form(half_edge.global_form().clone())
+                    .insert(services)
+            },
+        ))
+    }
+
     fn join_to(
         &self,
         other: &Cycle,