Merge pull request #1389 from hannobraun/objects

Take `&mut Objects` in `Shape::compute_brep`
hannobraun · Nov 24, 2022 · 96e38a8 · 96e38a8
2 parents 0b679e8 + 864afa7
commit 96e38a8
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/crates/fj-operations/src/difference_2d.rs b/crates/fj-operations/src/difference_2d.rs
@@ -18,7 +18,7 @@ impl Shape for fj::Difference2d {
 
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         debug_info: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError> {
         // This method assumes that `b` is fully contained within `a`:

diff --git a/crates/fj-operations/src/group.rs b/crates/fj-operations/src/group.rs
@@ -12,7 +12,7 @@ impl Shape for fj::Group {
 
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         debug_info: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError> {
         let mut faces = FaceSet::new();

diff --git a/crates/fj-operations/src/lib.rs b/crates/fj-operations/src/lib.rs
@@ -44,7 +44,7 @@ pub trait Shape {
     /// Compute the boundary representation of the shape
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         debug_info: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError>;
 
@@ -60,7 +60,7 @@ impl Shape for fj::Shape {
 
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         debug_info: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError> {
         match self {
@@ -96,7 +96,7 @@ impl Shape for fj::Shape2d {
 
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         debug_info: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError> {
         match self {

diff --git a/crates/fj-operations/src/shape_processor.rs b/crates/fj-operations/src/shape_processor.rs
@@ -42,9 +42,9 @@ impl ShapeProcessor {
             Some(user_defined_tolerance) => user_defined_tolerance,
         };
 
-        let objects = Objects::new();
+        let mut objects = Objects::new();
         let mut debug_info = DebugInfo::new();
-        let shape = shape.compute_brep(&objects, &mut debug_info)?;
+        let shape = shape.compute_brep(&mut objects, &mut debug_info)?;
         let mesh = (&shape, tolerance).triangulate();
 
         Ok(ProcessedShape {

diff --git a/crates/fj-operations/src/sketch.rs b/crates/fj-operations/src/sketch.rs
@@ -17,7 +17,7 @@ impl Shape for fj::Sketch {
 
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         _: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError> {
         let surface = objects.surfaces.xy_plane();

diff --git a/crates/fj-operations/src/sweep.rs b/crates/fj-operations/src/sweep.rs
@@ -16,7 +16,7 @@ impl Shape for fj::Sweep {
 
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         debug_info: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError> {
         let sketch = self.shape().compute_brep(objects, debug_info)?;

diff --git a/crates/fj-operations/src/transform.rs b/crates/fj-operations/src/transform.rs
@@ -13,7 +13,7 @@ impl Shape for fj::Transform {
 
     fn compute_brep(
         &self,
-        objects: &Objects,
+        objects: &mut Objects,
         debug_info: &mut DebugInfo,
     ) -> Result<Self::Brep, ValidationError> {
         let faces = self