Merge pull request #1527 from hannobraun/vertex

Remove `PartialVertex`

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

@@ -173,7 +173,7 @@ impl Sweep for (Handle<HalfEdge>, Color) {
 
 #[cfg(test)]
 mod tests {
-    use fj_interop::mesh::Color;
+    use fj_interop::{ext::ArrayExt, mesh::Color};
     use pretty_assertions::assert_eq;
 
     use crate::{
@@ -222,11 +222,14 @@ mod tests {
                 side_up.curve.write().surface = surface.clone();
 
                 {
-                    let [back, front] = &mut side_up.vertices;
+                    let [back, front] = side_up
+                        .vertices
+                        .each_mut_ext()
+                        .map(|(_, surface_vertex)| surface_vertex);
 
-                    back.surface_form = bottom.vertices[1].surface_form.clone();
+                    *back = bottom.vertices[1].1.clone();
 
-                    let mut front = front.surface_form.write();
+                    let mut front = front.write();
                     front.position = Some([1., 1.].into());
                     front.surface = surface.clone();
                 }
@@ -241,14 +244,16 @@ mod tests {
                 top.curve.write().surface = surface.clone();
 
                 {
-                    let [back, front] = &mut top.vertices;
+                    let [back, front] = top
+                        .vertices
+                        .each_mut_ext()
+                        .map(|(_, surface_vertex)| surface_vertex);
 
-                    let mut back = back.surface_form.write();
+                    let mut back = back.write();
                     back.position = Some([0., 1.].into());
                     back.surface = surface.clone();
 
-                    front.surface_form =
-                        side_up.vertices[1].surface_form.clone();
+                    *front = side_up.vertices[1].1.clone();
                 }
 
                 top.infer_global_form();
@@ -266,10 +271,13 @@ mod tests {
                 let mut side_down = PartialHalfEdge::default();
                 side_down.curve.write().surface = surface;
 
-                let [back, front] = &mut side_down.vertices;
+                let [back, front] = side_down
+                    .vertices
+                    .each_mut_ext()
+                    .map(|(_, surface_vertex)| surface_vertex);
 
-                back.surface_form = bottom.vertices[0].surface_form.clone();
-                front.surface_form = top.vertices[1].surface_form.clone();
+                *back = bottom.vertices[0].1.clone();
+                *front = top.vertices[1].1.clone();
 
                 side_down.infer_global_form();
                 side_down.update_as_line_segment();

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

@@ -98,22 +98,28 @@ impl CycleBuilder for PartialCycle {
             };
 
         {
-            let shared_surface_vertex =
-                new_half_edge.read().back().surface_form.clone();
+            let shared_surface_vertex = {
+                let [vertex, _] = &new_half_edge.read().vertices;
+                vertex.1.clone()
+            };
 
             let mut last_half_edge = last_half_edge.write();
 
-            last_half_edge.front_mut().surface_form = shared_surface_vertex;
+            let [_, vertex] = &mut last_half_edge.vertices;
+            vertex.1 = shared_surface_vertex;
             last_half_edge.infer_global_form();
         }
 
         {
-            let shared_surface_vertex =
-                first_half_edge.read().back().surface_form.clone();
+            let shared_surface_vertex = {
+                let [vertex, _] = &first_half_edge.read().vertices;
+                vertex.1.clone()
+            };
 
             let mut new_half_edge = new_half_edge.write();
 
-            new_half_edge.front_mut().surface_form = shared_surface_vertex;
+            let [_, vertex] = &mut new_half_edge.vertices;
+            vertex.1 = shared_surface_vertex;
             new_half_edge.replace_surface(self.surface.clone());
             new_half_edge.infer_global_form();
         }
@@ -128,8 +134,10 @@ impl CycleBuilder for PartialCycle {
     ) -> Partial<HalfEdge> {
         let mut half_edge = self.add_half_edge();
 
-        half_edge.write().back_mut().surface_form.write().position =
-            Some(point.into());
+        {
+            let [vertex, _] = &mut half_edge.write().vertices;
+            vertex.1.write().position = Some(point.into());
+        }
 
         half_edge
     }
@@ -140,14 +148,10 @@ impl CycleBuilder for PartialCycle {
     ) -> Partial<HalfEdge> {
         let mut half_edge = self.add_half_edge();
 
-        half_edge
-            .write()
-            .back_mut()
-            .surface_form
-            .write()
-            .global_form
-            .write()
-            .position = Some(point.into());
+        {
+            let [vertex, _] = &mut half_edge.write().vertices;
+            vertex.1.write().global_form.write().position = Some(point.into());
+        }
 
         half_edge
     }
@@ -187,14 +191,8 @@ impl CycleBuilder for PartialCycle {
 
         for (mut half_edge, point) in half_edges.clone().zip_ext(points_global)
         {
-            half_edge
-                .write()
-                .back_mut()
-                .surface_form
-                .write()
-                .global_form
-                .write()
-                .position = Some(point);
+            let [vertex, _] = &mut half_edge.write().vertices;
+            vertex.1.write().global_form.write().position = Some(point);
         }
 
         half_edges

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

@@ -6,7 +6,7 @@ use crate::{
     partial::{MaybeSurfacePath, Partial, PartialGlobalEdge, PartialHalfEdge},
 };
 
-use super::{CurveBuilder, VertexBuilder};
+use super::CurveBuilder;
 
 /// Builder API for [`PartialHalfEdge`]
 pub trait HalfEdgeBuilder {
@@ -61,7 +61,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
         self.curve.write().surface = surface.clone();
 
         for vertex in &mut self.vertices {
-            vertex.replace_surface(surface.clone());
+            vertex.1.write().surface = surface.clone();
         }
     }
 
@@ -73,7 +73,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
 
         let mut surface_vertex = {
             let [vertex, _] = &mut self.vertices;
-            vertex.surface_form.clone()
+            vertex.1.clone()
         };
         surface_vertex.write().position =
             Some(path.point_from_path_coords(a_curve));
@@ -82,8 +82,8 @@ impl HalfEdgeBuilder for PartialHalfEdge {
             self.vertices.each_mut_ext().zip_ext([a_curve, b_curve])
         {
             let mut vertex = vertex;
-            vertex.position = Some(point_curve);
-            vertex.surface_form = surface_vertex.clone();
+            vertex.0 = Some(point_curve);
+            vertex.1 = surface_vertex.clone();
         }
 
         self.infer_global_form();
@@ -96,7 +96,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
         }
         let points_surface = self.vertices.each_ref_ext().map(|vertex| {
             vertex
-                .surface_form
+                .1
                 .read()
                 .position
                 .expect("Can't infer arc without surface position")
@@ -123,8 +123,8 @@ impl HalfEdgeBuilder for PartialHalfEdge {
         for (vertex, point_curve) in
             self.vertices.each_mut_ext().zip_ext([a_curve, b_curve])
         {
-            vertex.position = Some(point_curve);
-            vertex.surface_form.write().position =
+            vertex.0 = Some(point_curve);
+            vertex.1.write().position =
                 Some(path.point_from_path_coords(point_curve));
         }
 
@@ -141,7 +141,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
         self.curve.write().surface = surface.clone();
 
         for (vertex, point) in self.vertices.each_mut_ext().zip_ext(points) {
-            let mut surface_form = vertex.surface_form.write();
+            let mut surface_form = vertex.1.write();
             surface_form.position = Some(point.into());
             surface_form.surface = surface.clone();
         }
@@ -152,7 +152,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
     fn update_as_line_segment(&mut self) {
         let points_surface = self.vertices.each_ref_ext().map(|vertex| {
             vertex
-                .surface_form
+                .1
                 .read()
                 .position
                 .expect("Can't infer line segment without surface position")
@@ -164,7 +164,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
 
         for (vertex, position) in self.vertices.each_mut_ext().zip_ext([0., 1.])
         {
-            vertex.position = Some([position].into());
+            vertex.0 = Some([position].into());
         }
 
         self.infer_global_form();
@@ -175,7 +175,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
         self.global_form.write().vertices = self
             .vertices
             .each_ref_ext()
-            .map(|vertex| vertex.surface_form.read().global_form.clone());
+            .map(|vertex| vertex.1.read().global_form.clone());
 
         self.global_form.clone()
     }
@@ -198,8 +198,8 @@ impl HalfEdgeBuilder for PartialHalfEdge {
             .iter_mut()
             .zip(other.read().vertices.iter().rev())
         {
-            this.surface_form.write().global_form.write().position =
-                other.surface_form.read().global_form.read().position;
+            this.1.write().global_form.write().position =
+                other.1.read().global_form.read().position;
         }
     }
 }

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

@@ -109,10 +109,10 @@ impl FaceBuilder for PartialFace {
 
     fn update_surface_as_plane(&mut self) -> Partial<Surface> {
         let mut exterior = self.exterior.write();
-        let mut vertices = exterior
-            .half_edges
-            .iter()
-            .map(|half_edge| half_edge.read().back().surface_form.clone());
+        let mut vertices = exterior.half_edges.iter().map(|half_edge| {
+            let [vertex, _] = &half_edge.read().vertices;
+            vertex.1.clone()
+        });
 
         let vertices = {
             let array = [
@@ -165,7 +165,7 @@ impl FaceBuilder for PartialFace {
                     MaybeSurfacePath::UndefinedLine => {
                         let points_surface =
                             half_edge.vertices.each_ref_ext().map(|vertex| {
-                                vertex.surface_form.read().position.expect(
+                                vertex.1.read().position.expect(
                                     "Can't infer curve without surface points",
                                 )
                             });
@@ -178,7 +178,7 @@ impl FaceBuilder for PartialFace {
                             .each_mut_ext()
                             .zip_ext(points_curve)
                         {
-                            vertex.position = Some(point);
+                            vertex.0 = Some(point);
                         }
                     }
                 }

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

@@ -22,7 +22,7 @@ pub use self::{
     sketch::SketchBuilder,
     solid::SolidBuilder,
     surface::SurfaceBuilder,
-    vertex::{GlobalVertexBuilder, SurfaceVertexBuilder, VertexBuilder},
+    vertex::{GlobalVertexBuilder, SurfaceVertexBuilder},
 };
 
 /// Pass objects to a builder method
@@ -44,7 +44,7 @@ pub trait ObjectArgument<T>: IntoIterator<Item = T> {
     /// is generic.
     type SameSize<R>;
 
-    /// A return value that has one more element thatn the argument
+    /// A return value that has one more element than the argument
     type SizePlusOne<R>;
 
     /// Return the number of objects

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

@@ -1,31 +1,6 @@
 use fj_math::Point;
 
-use crate::{
-    objects::Surface,
-    partial::{
-        Partial, PartialGlobalVertex, PartialSurfaceVertex, PartialVertex,
-    },
-};
-
-/// Builder API for [`PartialVertex`]
-pub trait VertexBuilder {
-    /// Completely replace the surface in this vertex' object graph
-    ///
-    /// Please note that this operation will write to every partial object that
-    /// the vertex references. If any of them were created from full objects,
-    /// this will break the connection to those, meaning that building the
-    /// partial objects won't result in those full objects again. This will be
-    /// the case, even if those full objects already referenced the provided
-    /// surface.
-    fn replace_surface(&mut self, surface: impl Into<Partial<Surface>>);
-}
-
-impl VertexBuilder for PartialVertex {
-    fn replace_surface(&mut self, surface: impl Into<Partial<Surface>>) {
-        let surface = surface.into();
-        self.surface_form.write().surface = surface;
-    }
-}
+use crate::partial::{PartialGlobalVertex, PartialSurfaceVertex};
 
 /// Builder API for [`PartialSurfaceVertex`]
 pub trait SurfaceVertexBuilder {

crates/fj-kernel/src/partial/mod.rs

@@ -24,7 +24,7 @@ pub use self::{
         sketch::PartialSketch,
         solid::PartialSolid,
         surface::PartialSurface,
-        vertex::{PartialGlobalVertex, PartialSurfaceVertex, PartialVertex},
+        vertex::{PartialGlobalVertex, PartialSurfaceVertex},
     },
     traits::{HasPartial, PartialObject},
     wrapper::{FullToPartialCache, Partial},