Skip to content

Commit

Permalink
Merge pull request #1005 from hannobraun/transform
Browse files Browse the repository at this point in the history
Make minor cleanups in `algorithms::transform`
  • Loading branch information
hannobraun authored Aug 26, 2022
2 parents bb6a298 + d1055f9 commit ceb8e96
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/intersect/ray_face.rs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ mod tests {
ray_face::RayFaceIntersection, HorizontalRayToTheRight,
Intersect,
},
TransformObject,
transform::TransformObject,
},
iter::ObjectIters,
objects::{Face, Surface},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ mod tests {
use fj_math::Transform;

use crate::{
algorithms::TransformObject,
algorithms::transform::TransformObject,
objects::{Curve, Surface},
};

Expand Down
8 changes: 2 additions & 6 deletions crates/fj-kernel/src/algorithms/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,11 @@
//! on their respective purpose.
mod reverse;
mod transform;
mod triangulate;

pub mod approx;
pub mod intersect;
pub mod sweep;
pub mod transform;

pub use self::{
reverse::reverse_face,
transform::{transform_faces, TransformObject},
triangulate::triangulate,
};
pub use self::{reverse::reverse_face, triangulate::triangulate};
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/algorithms/sweep/face.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use fj_interop::mesh::Color;

use crate::{
algorithms::{approx::Tolerance, reverse_face, TransformObject},
algorithms::{approx::Tolerance, reverse_face, transform::TransformObject},
objects::{Face, Shell},
};

Expand Down
2 changes: 2 additions & 0 deletions crates/fj-kernel/src/algorithms/transform.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//! Transforming objects
use fj_math::{Transform, Vector};

use crate::objects::{
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-kernel/src/builder/shell.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use fj_math::Scalar;

use crate::{
algorithms::TransformObject,
algorithms::transform::TransformObject,
objects::{Face, Shell, Surface},
};

Expand Down
2 changes: 1 addition & 1 deletion crates/fj-operations/src/transform.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use fj_interop::debug::DebugInfo;
use fj_kernel::{
algorithms::{approx::Tolerance, transform_faces},
algorithms::{approx::Tolerance, transform::transform_faces},
objects::Face,
validation::{validate, Validated, ValidationConfig, ValidationError},
};
Expand Down

0 comments on commit ceb8e96

Please sign in to comment.