Merge pull request #1685 from hannobraun/unify

Unify `Sketch`/`PartialSketch`, `Shell`/`PartialShell`, and `Solid`/`PartialSolid`
hannobraun · Mar 15, 2023 · b6ee338 · b6ee338
2 parents 439ca5c + b828bfc
commit b6ee338
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 474 deletions.
diff --git a/crates/fj-kernel/src/algorithms/sweep/face.rs b/crates/fj-kernel/src/algorithms/sweep/face.rs
@@ -9,7 +9,6 @@ use crate::{
     geometry::curve::GlobalPath,
     insert::Insert,
     objects::{Cycle, Face, Objects, Shell},
-    partial::{PartialObject, PartialShell},
     services::Service,
     storage::Handle,
 };
@@ -99,6 +98,6 @@ impl Sweep for Handle<Face> {
         let top_face = top_face.insert(objects);
         faces.push(top_face);
 
-        PartialShell { faces }.build(objects).insert(objects)
+        Shell::new(faces).insert(objects)
     }
 }
diff --git a/crates/fj-kernel/src/algorithms/sweep/sketch.rs b/crates/fj-kernel/src/algorithms/sweep/sketch.rs
@@ -3,7 +3,6 @@ use fj_math::Vector;
 use crate::{
     insert::Insert,
     objects::{Objects, Sketch, Solid},
-    partial::{Partial, PartialObject, PartialSolid},
     services::Service,
     storage::Handle,
 };
@@ -27,7 +26,6 @@ impl Sweep for Handle<Sketch> {
             shells.push(shell);
         }
 
-        let shells = shells.into_iter().map(Partial::from).collect();
-        PartialSolid { shells }.build(objects).insert(objects)
+        Solid::new(shells).insert(objects)
     }
 }
diff --git a/crates/fj-kernel/src/builder/face.rs b/crates/fj-kernel/src/builder/face.rs
diff --git a/crates/fj-kernel/src/builder/mod.rs b/crates/fj-kernel/src/builder/mod.rs
@@ -3,17 +3,10 @@
 // These are new-style builders that build on top of the partial object API.
 mod cycle;
 mod edge;
-mod face;
-mod shell;
-mod sketch;
-mod solid;
 
 use std::array;
 
-pub use self::{
-    cycle::CycleBuilder, edge::HalfEdgeBuilder, face::FaceBuilder,
-    shell::ShellBuilder, sketch::SketchBuilder, solid::SolidBuilder,
-};
+pub use self::{cycle::CycleBuilder, edge::HalfEdgeBuilder};
 
 /// Pass objects to a builder method
 ///

diff --git a/crates/fj-kernel/src/builder/shell.rs b/crates/fj-kernel/src/builder/shell.rs
diff --git a/crates/fj-kernel/src/builder/sketch.rs b/crates/fj-kernel/src/builder/sketch.rs
diff --git a/crates/fj-kernel/src/builder/solid.rs b/crates/fj-kernel/src/builder/solid.rs
diff --git a/crates/fj-kernel/src/lib.rs b/crates/fj-kernel/src/lib.rs
@@ -92,7 +92,6 @@ pub mod builder;
 pub mod geometry;
 pub mod insert;
 pub mod objects;
-pub mod partial;
 pub mod services;
 pub mod storage;
 pub mod validate;
diff --git a/crates/fj-kernel/src/partial/mod.rs b/crates/fj-kernel/src/partial/mod.rs
diff --git a/crates/fj-kernel/src/partial/objects/mod.rs b/crates/fj-kernel/src/partial/objects/mod.rs
diff --git a/crates/fj-kernel/src/partial/objects/shell.rs b/crates/fj-kernel/src/partial/objects/shell.rs
diff --git a/crates/fj-kernel/src/partial/objects/sketch.rs b/crates/fj-kernel/src/partial/objects/sketch.rs
diff --git a/crates/fj-kernel/src/partial/objects/solid.rs b/crates/fj-kernel/src/partial/objects/solid.rs
diff --git a/crates/fj-kernel/src/partial/traits.rs b/crates/fj-kernel/src/partial/traits.rs