Prepare code for follow-on change

hannobraun · Mar 1, 2023 · 3fd82aa · 3fd82aa
1 parent 6c4f02f
commit 3fd82aa
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/crates/fj-kernel/src/algorithms/sweep/edge.rs b/crates/fj-kernel/src/algorithms/sweep/edge.rs
@@ -128,8 +128,7 @@ impl Sweep for (Handle<HalfEdge>, &Handle<SurfaceVertex>, &Surface, Color) {
         .into_iter()
         .circular_tuple_windows()
         {
-            edge.write()
-                .update_as_line_segment(next.read().start_vertex.clone());
+            edge.write().update_as_line_segment(next.clone());
         }
 
         // Finally, we can make sure that all edges refer to the correct global

diff --git a/crates/fj-kernel/src/builder/cycle.rs b/crates/fj-kernel/src/builder/cycle.rs
@@ -140,9 +140,7 @@ impl CycleBuilder for PartialCycle {
         for (mut half_edge, next) in
             self.half_edges.iter().cloned().circular_tuple_windows()
         {
-            half_edge
-                .write()
-                .update_as_line_segment(next.read().start_vertex.clone());
+            half_edge.write().update_as_line_segment(next.clone());
         }
     }
 

diff --git a/crates/fj-kernel/src/builder/edge.rs b/crates/fj-kernel/src/builder/edge.rs
@@ -33,7 +33,7 @@ pub trait HalfEdgeBuilder {
     /// Update partial half-edge to be a line segment
     fn update_as_line_segment(
         &mut self,
-        next_vertex: Partial<SurfaceVertex>,
+        next_half_edge: Partial<HalfEdge>,
     ) -> Curve;
 
     /// Infer the global form of the half-edge
@@ -138,15 +138,17 @@ impl HalfEdgeBuilder for PartialHalfEdge {
 
     fn update_as_line_segment(
         &mut self,
-        next_vertex: Partial<SurfaceVertex>,
+        next_half_edge: Partial<HalfEdge>,
     ) -> Curve {
         let boundary = self.boundary;
-        let points_surface = [&self.start_vertex, &next_vertex].map(|vertex| {
-            vertex
-                .read()
-                .position
-                .expect("Can't infer line segment without surface position")
-        });
+        let points_surface =
+            [&self.start_vertex, &next_half_edge.read().start_vertex].map(
+                |vertex| {
+                    vertex.read().position.expect(
+                        "Can't infer line segment without surface position",
+                    )
+                },
+            );
 
         let path = if let [Some(start), Some(end)] = boundary {
             let points = [start, end].zip_ext(points_surface);
@@ -168,7 +170,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
             path
         };
 
-        self.infer_global_form(next_vertex);
+        self.infer_global_form(next_half_edge.read().start_vertex.clone());
 
         path
     }

diff --git a/crates/fj-operations/src/sketch.rs b/crates/fj-operations/src/sketch.rs
@@ -73,14 +73,11 @@ impl Shape for fj::Sketch {
                     for ((mut half_edge, route), (next_half_edge, _)) in
                         half_edges.into_iter().circular_tuple_windows()
                     {
-                        let next_vertex =
-                            next_half_edge.read().start_vertex.clone();
-
                         match route {
                             fj::SketchSegmentRoute::Direct => {
                                 half_edge
                                     .write()
-                                    .update_as_line_segment(next_vertex);
+                                    .update_as_line_segment(next_half_edge);
                             }
                             fj::SketchSegmentRoute::Arc { angle } => {
                                 half_edge