Unify Vertex and PartialVertex

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

@@ -6,7 +6,7 @@ use crate::{
     builder::{CycleBuilder, HalfEdgeBuilder},
     insert::Insert,
     objects::{Face, HalfEdge, Objects, Surface, Vertex},
-    partial::{Partial, PartialFace, PartialObject},
+    partial::{PartialFace, PartialObject},
     services::Service,
     storage::Handle,
 };
@@ -97,7 +97,7 @@ impl Sweep for (Handle<HalfEdge>, &Handle<Vertex>, &Surface, Color) {
             // Writing to the start vertices is enough. Neighboring half-
             // edges share surface vertices, so writing the start vertex of
             // each half-edge writes to all vertices.
-            half_edge.start_vertex = Partial::from(global_vertex);
+            half_edge.start_vertex = global_vertex;
         });
 
         // With the vertices set, we can now update the curves.

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

@@ -7,14 +7,12 @@ mod face;
 mod shell;
 mod sketch;
 mod solid;
-mod vertex;
 
 use std::array;
 
 pub use self::{
     cycle::CycleBuilder, edge::HalfEdgeBuilder, face::FaceBuilder,
     shell::ShellBuilder, sketch::SketchBuilder, solid::SolidBuilder,
-    vertex::VertexBuilder,
 };
 
 /// Pass objects to a builder method

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

@@ -22,7 +22,6 @@ pub use self::{
         shell::PartialShell,
         sketch::PartialSketch,
         solid::PartialSolid,
-        vertex::PartialVertex,
     },
     traits::{HasPartial, PartialObject},
     wrapper::{FullToPartialCache, Partial},

crates/fj-kernel/src/partial/objects/edge.rs

@@ -4,7 +4,7 @@ use crate::{
     geometry::curve::Curve,
     insert::Insert,
     objects::{GlobalEdge, HalfEdge, Objects, Vertex},
-    partial::{FullToPartialCache, Partial, PartialObject},
+    partial::{FullToPartialCache, PartialObject},
     services::Service,
     storage::Handle,
 };
@@ -19,7 +19,7 @@ pub struct PartialHalfEdge {
     pub boundary: [Option<Point<1>>; 2],
 
     /// The surface vertex where the half-edge starts
-    pub start_vertex: Partial<Vertex>,
+    pub start_vertex: Handle<Vertex>,
 
     /// The global form of the half-edge
     pub global_form: Handle<GlobalEdge>,
@@ -52,27 +52,21 @@ impl PartialObject for PartialHalfEdge {
         Self {
             curve: None,
             boundary: [None; 2],
-            start_vertex: Partial::new(objects),
+            start_vertex: Vertex::new().insert(objects),
             global_form: GlobalEdge::new().insert(objects),
         }
     }
 
-    fn from_full(
-        half_edge: &Self::Full,
-        cache: &mut FullToPartialCache,
-    ) -> Self {
+    fn from_full(half_edge: &Self::Full, _: &mut FullToPartialCache) -> Self {
         Self {
             curve: Some(half_edge.curve().into()),
             boundary: half_edge.boundary().map(Some),
-            start_vertex: Partial::from_full(
-                half_edge.start_vertex().clone(),
-                cache,
-            ),
+            start_vertex: half_edge.start_vertex().clone(),
             global_form: half_edge.global_form().clone(),
         }
     }
 
-    fn build(self, objects: &mut Service<Objects>) -> Self::Full {
+    fn build(self, _: &mut Service<Objects>) -> Self::Full {
         let curve = match self.curve.expect("Need path to build curve") {
             MaybeCurve::Defined(path) => path,
             undefined => {
@@ -84,9 +78,8 @@ impl PartialObject for PartialHalfEdge {
         let boundary = self.boundary.map(|point| {
             point.expect("Can't build `HalfEdge` without boundary positions")
         });
-        let start_vertex = self.start_vertex.build(objects);
 
-        HalfEdge::new(curve, boundary, start_vertex, self.global_form)
+        HalfEdge::new(curve, boundary, self.start_vertex, self.global_form)
     }
 }
 

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

@@ -4,4 +4,3 @@ pub mod face;
 pub mod shell;
 pub mod sketch;
 pub mod solid;
-pub mod vertex;

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

@@ -42,5 +42,4 @@ impl_trait!(
     Shell, PartialShell;
     Sketch, PartialSketch;
     Solid, PartialSolid;
-    Vertex, PartialVertex;
 );