Start replacing old partial object API

crates/fj-kernel/src/algorithms/approx/curve.rs

@@ -203,7 +203,7 @@ mod tests {
  builder::{CurveBuilder, SurfaceBuilder},
  geometry::path::GlobalPath,
  insert::Insert,
- partial::{PartialCurve, PartialSurface},
+ partial2::{Partial, PartialCurve, PartialObject, PartialSurface},
  services::Services,
  };
 
@@ -215,7 +215,7 @@ mod tests {
 
  let surface = services.objects.surfaces.xz_plane();
  let mut curve = PartialCurve {
- surface: Some(surface),
+ surface: Partial::from_full_entry_point(surface),
  ..Default::default()
  };
  curve.update_as_line_from_points([[1., 1.], [2., 1.]]);
@@ -237,10 +237,10 @@ mod tests {
  GlobalPath::circle_from_radius(1.),
  [0., 0., 1.],
  )
- .build(&services.objects)
+ .build(&mut services.objects)
  .insert(&mut services.objects);
  let mut curve = PartialCurve {
- surface: Some(surface),
+ surface: Partial::from_full_entry_point(surface),
  ..Default::default()
  };
  curve.update_as_line_from_points([[1., 1.], [1., 2.]]);
@@ -260,10 +260,10 @@ mod tests {
 
  let path = GlobalPath::circle_from_radius(1.);
  let surface = PartialSurface::from_axes(path, [0., 0., 1.])
- .build(&services.objects)
+ .build(&mut services.objects)
  .insert(&mut services.objects);
  let mut curve = PartialCurve {
- surface: Some(surface.clone()),
+ surface: Partial::from_full_entry_point(surface.clone()),
  ..Default::default()
  };
  curve.update_as_line_from_points([[0., 1.], [1., 1.]]);
@@ -296,7 +296,7 @@ mod tests {
 
  let surface = services.objects.surfaces.xz_plane();
  let mut curve = PartialCurve {
- surface: Some(surface),
+ surface: Partial::from_full_entry_point(surface),
  ..Default::default()
  };
  curve.update_as_circle_from_radius(1.);

crates/fj-kernel/src/algorithms/intersect/curve_edge.rs

@@ -77,7 +77,8 @@ mod tests {
  use crate::{
  builder::{CurveBuilder, HalfEdgeBuilder},
  objects::HalfEdge,
- partial::{HasPartial, PartialCurve},
+ partial::HasPartial,
+ partial2::{Partial, PartialCurve, PartialObject},
  services::Services,
  };
 
@@ -87,9 +88,11 @@ mod tests {
  fn compute_edge_in_front_of_curve_origin() {
  let mut services = Services::new();
 
- let surface = services.objects.surfaces.xy_plane();
+ let surface = Partial::from_full_entry_point(
+ services.objects.surfaces.xy_plane(),
+ );
  let mut curve = PartialCurve {
- surface: Some(surface.clone()),
+ surface: surface.clone(),
  ..Default::default()
  };
  curve.update_as_u_axis();
@@ -112,9 +115,11 @@ mod tests {
  fn compute_edge_behind_curve_origin() {
  let mut services = Services::new();
 
- let surface = services.objects.surfaces.xy_plane();
+ let surface = Partial::from_full_entry_point(
+ services.objects.surfaces.xy_plane(),
+ );
  let mut curve = PartialCurve {
- surface: Some(surface.clone()),
+ surface: surface.clone(),
  ..Default::default()
  };
  curve.update_as_u_axis();
@@ -140,9 +145,11 @@ mod tests {
  fn compute_edge_parallel_to_curve() {
  let mut services = Services::new();
 
- let surface = services.objects.surfaces.xy_plane();
+ let surface = Partial::from_full_entry_point(
+ services.objects.surfaces.xy_plane(),
+ );
  let mut curve = PartialCurve {
- surface: Some(surface.clone()),
+ surface: surface.clone(),
  ..Default::default()
  };
  curve.update_as_u_axis();
@@ -163,9 +170,11 @@ mod tests {
  fn compute_edge_on_curve() {
  let mut services = Services::new();
 
- let surface = services.objects.surfaces.xy_plane();
+ let surface = Partial::from_full_entry_point(
+ services.objects.surfaces.xy_plane(),
+ );
  let mut curve = PartialCurve {
- surface: Some(surface.clone()),
+ surface: surface.clone(),
  ..Default::default()
  };
  curve.update_as_u_axis();

crates/fj-kernel/src/algorithms/intersect/curve_face.rs

@@ -152,7 +152,8 @@ mod tests {
  use crate::{
  builder::{CurveBuilder, FaceBuilder},
  objects::Face,
- partial::{HasPartial, PartialCurve},
+ partial::HasPartial,
+ partial2::{Partial, PartialCurve, PartialObject},
  services::Services,
  };
 
@@ -165,7 +166,7 @@ mod tests {
  let surface = services.objects.surfaces.xy_plane();
 
  let mut curve = PartialCurve {
- surface: Some(surface.clone()),
+ surface: Partial::from_full_entry_point(surface.clone()),
  ..Default::default()
  };
  curve.update_as_line_from_points([[-3., 0.], [-2., 0.]]);

crates/fj-kernel/src/algorithms/intersect/face_face.rs

@@ -72,7 +72,8 @@ mod tests {
  builder::{CurveBuilder, FaceBuilder},
  insert::Insert,
  objects::Face,
- partial::{HasPartial, PartialCurve},
+ partial::HasPartial,
+ partial2::{Partial, PartialCurve, PartialObject},
  services::Services,
  };
 
@@ -131,7 +132,7 @@ mod tests {
 
  let expected_curves = surfaces.map(|surface| {
  let mut curve = PartialCurve {
- surface: Some(surface),
+ surface: Partial::from_full_entry_point(surface),
  ..Default::default()
  };
  curve.update_as_line_from_points([[0., 0.], [1., 0.]]);

crates/fj-kernel/src/algorithms/intersect/surface_surface.rs

@@ -89,8 +89,11 @@ mod tests {
  use pretty_assertions::assert_eq;
 
  use crate::{
- algorithms::transform::TransformObject, builder::CurveBuilder,
- insert::Insert, partial::PartialCurve, services::Services,
+ algorithms::transform::TransformObject,
+ builder::CurveBuilder,
+ insert::Insert,
+ partial2::{Partial, PartialCurve, PartialObject},
+ services::Services,
  };
 
  use super::SurfaceSurfaceIntersection;
@@ -118,15 +121,15 @@ mod tests {
  );
 
  let mut expected_xy = PartialCurve {
- surface: Some(xy.clone()),
+ surface: Partial::from_full_entry_point(xy.clone()),
  ..Default::default()
  };
  expected_xy.update_as_u_axis();
  let expected_xy = expected_xy
  .build(&mut services.objects)
  .insert(&mut services.objects);
  let mut expected_xz = PartialCurve {
- surface: Some(xz.clone()),
+ surface: Partial::from_full_entry_point(xz.clone()),
  ..Default::default()
  };
  expected_xz.update_as_u_axis();

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

@@ -5,7 +5,7 @@ use crate::{
  geometry::path::{GlobalPath, SurfacePath},
  insert::Insert,
  objects::{Curve, Objects, Surface},
- partial::PartialSurface,
+ partial2::{PartialObject, PartialSurface},
  services::Service,
  storage::Handle,
 };

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

@@ -192,7 +192,10 @@ mod tests {
  builder::HalfEdgeBuilder,
  insert::Insert,
  objects::{Cycle, Face, HalfEdge},
- partial::{HasPartial, PartialSurfaceVertex, PartialVertex},
+ partial::HasPartial,
+ partial2::{
+ Partial, PartialCurve, PartialSurfaceVertex, PartialVertex,
+ },
  services::Services,
  };
 
@@ -202,7 +205,9 @@ mod tests {
 
  let half_edge = HalfEdge::partial()
  .update_as_line_segment_from_points(
- services.objects.surfaces.xy_plane(),
+ Partial::from_full_entry_point(
+ services.objects.surfaces.xy_plane(),
+ ),
  [[0., 0.], [1., 0.]],
  )
  .build(&mut services.objects)
@@ -212,52 +217,68 @@ mod tests {
  .sweep([0., 0., 1.], &mut services.objects);
 
  let expected_face = {
- let surface = services.objects.surfaces.xz_plane();
+ let surface = Partial::from_full_entry_point(
+ services.objects.surfaces.xz_plane(),
+ );
 
  let bottom = HalfEdge::partial()
  .update_as_line_segment_from_points(
- surface,
+ surface.clone(),
  [[0., 0.], [1., 0.]],
  )
  .build(&mut services.objects)
  .insert(&mut services.objects);
  let side_up = {
  let side_up = HalfEdge::partial();
  side_up
- .with_back_vertex(PartialVertex {
- surface_form: bottom
- .front()
- .surface_form()
- .clone()
- .into(),
- ..Default::default()
- })
- .with_front_vertex(PartialVertex {
- surface_form: PartialSurfaceVertex {
- position: Some([1., 1.].into()),
+ .with_back_vertex(Partial::from_partial(PartialVertex {
+ curve: Partial::from_partial(PartialCurve {
+ surface: Partial::from_full_entry_point(
+ bottom.front().surface_form().surface().clone(),
+ ),
  ..Default::default()
- }
- .into(),
+ }),
+ surface_form: Partial::from_full_entry_point(
+ bottom.front().surface_form().clone(),
+ ),
  ..Default::default()
- })
+ }))
+ .with_front_vertex(Partial::from_partial(PartialVertex {
+ surface_form: Partial::from_partial(
+ PartialSurfaceVertex {
+ position: Some([1., 1.].into()),
+ surface: surface.clone(),
+ ..Default::default()
+ },
+ ),
+ ..Default::default()
+ }))
  .update_as_line_segment()
  .build(&mut services.objects)
  .insert(&mut services.objects)
  };
  let top = {
  let top = HalfEdge::partial();
- top.with_back_vertex(PartialVertex {
- surface_form: PartialSurfaceVertex {
+ top.with_back_vertex(Partial::from_partial(PartialVertex {
+ curve: Partial::from_partial(PartialCurve {
+ surface: Partial::from_full_entry_point(
+ side_up.front().surface_form().surface().clone(),
+ ),
+ ..Default::default()
+ }),
+ surface_form: Partial::from_partial(PartialSurfaceVertex {
  position: Some([0., 1.].into()),
+ surface,
  ..Default::default()
- }
- .into(),
+ }),
  ..Default::default()
- })
- .with_front_vertex(PartialVertex {
- surface_form: side_up.front().surface_form().clone().into(),
+ }))
+ .with_front_vertex(Partial::from_partial(PartialVertex {
+ surface_form: Partial::from_full_entry_point(
+ side_up.front().surface_form().clone(),
+ ),
  ..Default::default()
- })
+ }))
  .update_as_line_segment()
  .build(&mut services.objects)
  .insert(&mut services.objects)
@@ -266,18 +287,24 @@ mod tests {
  let side_down = {
  let side_down = HalfEdge::partial();
  side_down
- .with_back_vertex(PartialVertex {
- surface_form: bottom
- .back()
- .surface_form()
- .clone()
- .into(),
+ .with_back_vertex(Partial::from_partial(PartialVertex {
+ curve: Partial::from_partial(PartialCurve {
+ surface: Partial::from_full_entry_point(
+ bottom.back().surface_form().surface().clone(),
+ ),
+ ..Default::default()
+ }),
+ surface_form: Partial::from_full_entry_point(
+ bottom.back().surface_form().clone(),
+ ),
  ..Default::default()
- })
- .with_front_vertex(PartialVertex {
- surface_form: top.front().surface_form().clone().into(),
+ }))
+ .with_front_vertex(Partial::from_partial(PartialVertex {
+ surface_form: Partial::from_full_entry_point(
+ top.front().surface_form().clone(),
+ ),
  ..Default::default()
- })
+ }))
  .update_as_line_segment()
  .build(&mut services.objects)
  .insert(&mut services.objects)

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

@@ -88,6 +88,7 @@ mod tests {
  insert::Insert,
  objects::{Face, HalfEdge, Sketch},
  partial::HasPartial,
+ partial2::Partial,
  services::Services,
  };
 
@@ -132,7 +133,9 @@ mod tests {
  let side_faces = triangle.array_windows_ext().map(|&[a, b]| {
  let half_edge = HalfEdge::partial()
  .update_as_line_segment_from_points(
- services.objects.surfaces.xy_plane(),
+ Partial::from_full_entry_point(
+ services.objects.surfaces.xy_plane(),
+ ),
  [a, b],
  )
  .build(&mut services.objects)
@@ -179,7 +182,9 @@ mod tests {
  let side_faces = triangle.array_windows_ext().map(|&[a, b]| {
  let half_edge = HalfEdge::partial()
  .update_as_line_segment_from_points(
- services.objects.surfaces.xy_plane(),
+ Partial::from_full_entry_point(
+ services.objects.surfaces.xy_plane(),
+ ),
  [a, b],
  )
  .build(&mut services.objects)