Unify Face and PartialFace

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

@@ -114,7 +114,7 @@ pub struct FaceApprox {
  pub interiors: BTreeSet<CycleApprox>,
 
  /// The color of the approximated face
- pub color: Color,
+ pub color: Option<Color>,
 
  /// The handedness of the approximated face's front-side coordinate system
  pub coord_handedness: Handedness,

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

@@ -150,11 +150,10 @@ where
 #[cfg(test)]
 mod tests {
  use crate::{
- builder::{CycleBuilder, FaceBuilder},
+ builder::CycleBuilder,
  geometry::curve::Curve,
  insert::Insert,
- objects::Cycle,
- partial::{PartialFace, PartialObject},
+ objects::{Cycle, Face},
  services::Services,
  };
 
@@ -181,29 +180,26 @@ mod tests {
  [ 1., -1.],
  ];
 
- let face = {
- let mut face = PartialFace::new(&mut services.objects);
-
- face.surface = Some(services.objects.surfaces.xy_plane());
+ let face = Face::new(
+ services.objects.surfaces.xy_plane(),
  {
- let (exterior, _) =
- face.exterior.clone_object().update_as_polygon_from_points(
+ let (exterior, _) = Cycle::new([])
+ .update_as_polygon_from_points(
  exterior_points,
  &mut services.objects,
  );
- face.exterior = exterior.insert(&mut services.objects);
- }
- {
+ exterior.insert(&mut services.objects)
+ },
+ vec![{
  let (interior, _) = Cycle::new([])
  .update_as_polygon_from_points(
  interior_points,
  &mut services.objects,
  );
- face.add_interior(interior, &mut services.objects);
- }
-
- face.build(&mut services.objects)
- };
+ interior.insert(&mut services.objects)
+ }],
+ None,
+ );
 
  let expected =
  CurveFaceIntersection::from_intervals([[[1.], [2.]], [[4.], [5.]]]);

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

@@ -65,7 +65,7 @@ mod tests {
  builder::CycleBuilder,
  geometry::curve::Curve,
  insert::Insert,
- partial::{PartialFace, PartialObject},
+ objects::{Cycle, Face},
  services::Services,
  };
 
@@ -87,19 +87,19 @@ mod tests {
  services.objects.surfaces.xz_plane(),
  ]
  .map(|surface| {
- let mut face = PartialFace::new(&mut services.objects);
-
- face.surface = Some(surface);
- {
- let (exterior, _) =
- face.exterior.clone_object().update_as_polygon_from_points(
- points,
- &mut services.objects,
- );
- face.exterior = exterior.insert(&mut services.objects);
- }
-
- face.build(&mut services.objects)
+ Face::new(
+ surface,
+  {
+  let (exterior, _) = Cycle::new([])
+  .update_as_polygon_from_points(
+  points,
+  &mut services.objects,
+ );
+ exterior.insert(&mut services.objects)
+ },
+  Vec::new(),
+ None,
+ )
  });
 
  let intersection = FaceFaceIntersection::compute([&a, &b]);
@@ -123,19 +123,19 @@ mod tests {
  services.objects.surfaces.xz_plane(),
  ];
  let [a, b] = surfaces.clone().map(|surface| {
- let mut face = PartialFace::new(&mut services.objects);
-
- face.surface = Some(surface);
- {
- let (exterior, _) =
- face.exterior.clone_object().update_as_polygon_from_points(
- points,
- &mut services.objects,
- );
- face.exterior = exterior.insert(&mut services.objects);
- }
-
- face.build(&mut services.objects)
+ Face::new(
+ surface,
+  {
+  let (exterior, _) = Cycle::new([])
+  .update_as_polygon_from_points(
+  points,
+  &mut services.objects,
+ );
+ exterior.insert(&mut services.objects)
+ },
+  Vec::new(),
+ None,
+ )
  });
 
  let intersection = FaceFaceIntersection::compute([&a, &b]);