Merge pull request #1891 from hannobraun/operations

Add `Merge` operation

crates/fj-core/src/operations/build/solid.rs

@@ -24,7 +24,7 @@ pub trait BuildSolid {
         services: &mut Services,
     ) -> Tetrahedron {
         let shell = Shell::tetrahedron(points, services).insert(services);
-        let solid = Solid::empty().add_shell(shell.shell.clone());
+        let solid = Solid::empty().add_shells([shell.shell.clone()]);
 
         Tetrahedron { solid, shell }
     }

crates/fj-core/src/operations/merge.rs

@@ -0,0 +1,15 @@
+use crate::objects::Solid;
+
+use super::UpdateSolid;
+
+/// Merge two [`Solid`]s
+pub trait Merge {
+    /// Merge this solid with another
+    fn merge(&self, other: &Self) -> Self;
+}
+
+impl Merge for Solid {
+    fn merge(&self, other: &Self) -> Self {
+        self.add_shells(other.shells().cloned())
+    }
+}

crates/fj-core/src/operations/mod.rs

@@ -3,6 +3,7 @@
 mod build;
 mod insert;
 mod join;
+mod merge;
 mod reverse;
 mod update;
 
@@ -19,6 +20,7 @@ pub use self::{
     },
     insert::{Insert, IsInserted, IsInsertedNo, IsInsertedYes},
     join::cycle::JoinCycle,
+    merge::Merge,
     reverse::Reverse,
     update::{
         cycle::UpdateCycle, edge::UpdateHalfEdge, face::UpdateFace,

crates/fj-core/src/operations/update/solid.rs

@@ -6,12 +6,18 @@ use crate::{
 /// Update a [`Solid`]
 pub trait UpdateSolid {
     /// Add a shell to the solid
-    fn add_shell(&self, shell: Handle<Shell>) -> Solid;
+    fn add_shells(
+        &self,
+        shells: impl IntoIterator<Item = Handle<Shell>>,
+    ) -> Solid;
 }
 
 impl UpdateSolid for Solid {
-    fn add_shell(&self, shell: Handle<Shell>) -> Solid {
-        let shells = self.shells().cloned().chain([shell]);
+    fn add_shells(
+        &self,
+        shells: impl IntoIterator<Item = Handle<Shell>>,
+    ) -> Solid {
+        let shells = self.shells().cloned().chain(shells);
         Solid::new(shells)
     }
 }