Merge pull request #2169 from hannobraun/transform

Make some cleanups in `transform`, move it to `operations`

crates/fj-core/src/algorithms/intersect/ray_face.rs

@@ -145,17 +145,14 @@ mod tests {
     use fj_math::Point;
 
     use crate::{
-        algorithms::{
-            intersect::{
-                ray_face::RayFaceIntersection, HorizontalRayToTheRight,
-                Intersect,
-            },
-            transform::TransformObject,
+        algorithms::intersect::{
+            ray_face::RayFaceIntersection, HorizontalRayToTheRight, Intersect,
         },
         objects::{Cycle, Face},
         operations::{
             build::{BuildCycle, BuildFace},
             insert::Insert,
+            transform::TransformObject,
             update::{UpdateFace, UpdateRegion},
         },
         services::Services,

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

@@ -76,7 +76,7 @@ mod tests {
     use pretty_assertions::assert_eq;
 
     use crate::{
-        algorithms::transform::TransformObject, geometry::SurfacePath,
+        geometry::SurfacePath, operations::transform::TransformObject,
         services::Services,
     };
 

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

@@ -13,5 +13,4 @@
 pub mod approx;
 pub mod bounding_volume;
 pub mod intersect;
-pub mod transform;
 pub mod triangulate;

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

@@ -48,4 +48,5 @@ pub mod replace;
 pub mod reverse;
 pub mod split;
 pub mod sweep;
+pub mod transform;
 pub mod update;

crates/fj-core/src/operations/sweep/region.rs

@@ -2,9 +2,10 @@ use fj_interop::Color;
 use fj_math::Vector;
 
 use crate::{
-    algorithms::transform::TransformObject,
     objects::{Cycle, Face, Region, Surface},
-    operations::{insert::Insert, reverse::Reverse},
+    operations::{
+        insert::Insert, reverse::Reverse, transform::TransformObject,
+    },
     services::Services,
     storage::Handle,
 };

crates/fj-core/src/algorithms/transform/curve.rs → crates/fj-core/src/operations/transform/curve.rs

@@ -6,7 +6,7 @@ use super::{TransformCache, TransformObject};
 
 impl TransformObject for Curve {
     fn transform_with_cache(
-        self,
+        &self,
         _: &Transform,
         _: &mut Services,
         _: &mut TransformCache,

crates/fj-core/src/algorithms/transform/cycle.rs → crates/fj-core/src/operations/transform/cycle.rs

@@ -6,7 +6,7 @@ use super::{TransformCache, TransformObject};
 
 impl TransformObject for Cycle {
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         services: &mut Services,
         cache: &mut TransformCache,

crates/fj-core/src/algorithms/transform/edge.rs → crates/fj-core/src/operations/transform/edge.rs

@@ -6,7 +6,7 @@ use super::{TransformCache, TransformObject};
 
 impl TransformObject for HalfEdge {
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         services: &mut Services,
         cache: &mut TransformCache,

crates/fj-core/src/algorithms/transform/face.rs → crates/fj-core/src/operations/transform/face.rs

@@ -1,38 +1,24 @@
 use fj_math::Transform;
 
-use crate::{
-    objects::{Face, Region},
-    operations::insert::Insert,
-    services::Services,
-};
+use crate::{objects::Face, services::Services};
 
 use super::{TransformCache, TransformObject};
 
 impl TransformObject for Face {
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         services: &mut Services,
         cache: &mut TransformCache,
     ) -> Self {
-        // Color does not need to be transformed.
-        let color = self.region().color();
-
         let surface = self
             .surface()
             .clone()
             .transform_with_cache(transform, services, cache);
-        let exterior = self
+        let region = self
             .region()
-            .exterior()
             .clone()
             .transform_with_cache(transform, services, cache);
-        let interiors =
-            self.region().interiors().iter().cloned().map(|interior| {
-                interior.transform_with_cache(transform, services, cache)
-            });
-
-        let region = Region::new(exterior, interiors, color).insert(services);
 
         Self::new(surface, region)
     }

crates/fj-core/src/algorithms/transform/mod.rs → crates/fj-core/src/operations/transform/mod.rs

@@ -4,6 +4,7 @@ mod curve;
 mod cycle;
 mod edge;
 mod face;
+mod region;
 mod shell;
 mod solid;
 mod surface;
@@ -31,14 +32,18 @@ use crate::{
 /// hasn't been done so far, is that no one has put in the work yet.
 pub trait TransformObject: Sized {
     /// Transform the object
-    fn transform(self, transform: &Transform, services: &mut Services) -> Self {
+    fn transform(
+        &self,
+        transform: &Transform,
+        services: &mut Services,
+    ) -> Self {
         let mut cache = TransformCache::default();
         self.transform_with_cache(transform, services, &mut cache)
     }
 
     /// Transform the object using the provided cache
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         services: &mut Services,
         cache: &mut TransformCache,
@@ -48,7 +53,7 @@ pub trait TransformObject: Sized {
     ///
     /// Convenience wrapper around [`TransformObject::transform`].
     fn translate(
-        self,
+        &self,
         offset: impl Into<Vector<3>>,
         services: &mut Services,
     ) -> Self {
@@ -59,7 +64,7 @@ pub trait TransformObject: Sized {
     ///
     /// Convenience wrapper around [`TransformObject::transform`].
     fn rotate(
-        self,
+        &self,
         axis_angle: impl Into<Vector<3>>,
         services: &mut Services,
     ) -> Self {
@@ -72,12 +77,12 @@ where
     T: Clone + Insert<Inserted = Handle<T>> + TransformObject + 'static,
 {
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         services: &mut Services,
         cache: &mut TransformCache,
     ) -> Self {
-        if let Some(object) = cache.get(&self) {
+        if let Some(object) = cache.get(self) {
             return object.clone();
         }
 

crates/fj-core/src/operations/transform/region.rs

@@ -0,0 +1,25 @@
+use crate::objects::Region;
+
+use super::TransformObject;
+
+impl TransformObject for Region {
+    fn transform_with_cache(
+        &self,
+        transform: &fj_math::Transform,
+        services: &mut crate::services::Services,
+        cache: &mut super::TransformCache,
+    ) -> Self {
+        // Color does not need to be transformed.
+        let color = self.color();
+
+        let exterior = self
+            .exterior()
+            .clone()
+            .transform_with_cache(transform, services, cache);
+        let interiors = self.interiors().iter().cloned().map(|interior| {
+            interior.transform_with_cache(transform, services, cache)
+        });
+
+        Region::new(exterior, interiors, color)
+    }
+}

crates/fj-core/src/algorithms/transform/shell.rs → crates/fj-core/src/operations/transform/shell.rs

@@ -6,7 +6,7 @@ use super::{TransformCache, TransformObject};
 
 impl TransformObject for Shell {
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         services: &mut Services,
         cache: &mut TransformCache,

crates/fj-core/src/algorithms/transform/solid.rs → crates/fj-core/src/operations/transform/solid.rs

@@ -6,7 +6,7 @@ use super::{TransformCache, TransformObject};
 
 impl TransformObject for Solid {
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         services: &mut Services,
         cache: &mut TransformCache,

crates/fj-core/src/algorithms/transform/surface.rs → crates/fj-core/src/operations/transform/surface.rs

@@ -6,7 +6,7 @@ use super::{TransformCache, TransformObject};
 
 impl TransformObject for Surface {
     fn transform_with_cache(
-        self,
+        &self,
         transform: &Transform,
         _: &mut Services,
         _: &mut TransformCache,

crates/fj-core/src/algorithms/transform/vertex.rs → crates/fj-core/src/operations/transform/vertex.rs

@@ -6,7 +6,7 @@ use super::{TransformCache, TransformObject};
 
 impl TransformObject for Vertex {
     fn transform_with_cache(
-        self,
+        &self,
         _: &Transform,
         _: &mut Services,
         _: &mut TransformCache,

models/all/src/lib.rs

@@ -1,8 +1,9 @@
 use fj::{
     core::{
-        algorithms::transform::TransformObject,
         objects::Solid,
-        operations::{insert::Insert, merge::Merge},
+        operations::{
+            insert::Insert, merge::Merge, transform::TransformObject,
+        },
         services::Services,
         storage::Handle,
     },