diff --git a/src/base/cg.rs b/src/base/cg.rs index 6a7db4bd..02aeade8 100644 --- a/src/base/cg.rs +++ b/src/base/cg.rs @@ -11,11 +11,11 @@ use crate::base::allocator::Allocator; use crate::base::dimension::{DimName, DimNameDiff, DimNameSub, U1}; use crate::base::storage::{Storage, StorageMut}; use crate::base::{ - DefaultAllocator, Matrix3, Matrix4, MatrixN, Scalar, SquareMatrix, Unit, Vector, Vector3, + DefaultAllocator, Matrix3, Matrix4, MatrixN, Scalar, SquareMatrix, Unit, Vector, Vector2, Vector3, VectorN, }; use crate::geometry::{ - Isometry, IsometryMatrix3, Orthographic3, Perspective3, Point, Point3, Rotation2, Rotation3, + Isometry, IsometryMatrix3, Orthographic3, Perspective3, Point, Point2, Point3, Rotation2, Rotation3, Translation2, Translation3, }; use simba::scalar::{ClosedAdd, ClosedMul, RealField}; @@ -70,6 +70,17 @@ impl Matrix3 { pub fn new_rotation(angle: N) -> Self { Rotation2::new(angle).to_homogeneous() } + + /// Creates a new homogeneous matrix that applies a scaling factor for each dimension with respect to point. + /// + /// Can be used to implement "zoom_to" functionality. + #[inline] + pub fn new_nonuniform_scaling_wrt_point(scaling: Vector2, pt: Point2) -> Self { + let translate = Translation2::new(pt.x, pt.y).to_homogeneous(); + let scale = Matrix3::new_nonuniform_scaling(&scaling); + let translate_inv = Translation2::new(-pt.x, -pt.y).to_homogeneous(); + translate * scale * translate_inv + } } impl Matrix4 { @@ -90,6 +101,17 @@ impl Matrix4 { Isometry::rotation_wrt_point(rot, pt).to_homogeneous() } + /// Creates a new homogeneous matrix that applies a scaling factor for each dimension with respect to point. + /// + /// Can be used to implement "zoom_to" functionality. + #[inline] + pub fn new_nonuniform_scaling_wrt_point(scaling: Vector3, pt: Point3) -> Self { + let translate = Translation3::new(pt.x, pt.y, pt.z).to_homogeneous(); + let scale = Matrix4::new_nonuniform_scaling(&scaling); + let translate_inv = Translation3::new(-pt.x, -pt.y, -pt.z).to_homogeneous(); + translate * scale * translate_inv + } + /// Builds a 3D homogeneous rotation matrix from an axis and an angle (multiplied together). /// /// Returns the identity matrix if the given argument is zero. diff --git a/tests/core/cg.rs b/tests/core/cg.rs new file mode 100644 index 00000000..17df4eb1 --- /dev/null +++ b/tests/core/cg.rs @@ -0,0 +1,59 @@ +use na::{Vector2, Vector3, Matrix3, Matrix4, Point2, Point3}; + +/// See Example 3.4 of "Graphics and Visualization: Principles & Algorithms" +/// by Theoharis, Papaioannou, Platis, Patrikalakis. +#[test] +fn test_scaling_wrt_point_1() { + let a = Point2::new(0.0, 0.0); + let b = Point2::new(1.0, 1.0); + let c = Point2::new(5.0, 2.0); + + let scaling = Vector2::new(2.0, 2.0); + let scale_about = Matrix3::new_nonuniform_scaling_wrt_point(scaling, c); + + let expected_a = Point2::new(-5.0, -2.0); + let expected_b = Point2::new(-3.0, 0.0); + let result_a = scale_about.transform_point(&a); + let result_b = scale_about.transform_point(&b); + let result_c = scale_about.transform_point(&c); + + assert!(expected_a == result_a); + assert!(expected_b == result_b); + assert!(c == result_c); +} + +/// Based on the same example as the test above. +#[test] +fn test_scaling_wrt_point_2() { + let a = Point3::new(0.0, 0.0, 1.0); + let b = Point3::new(1.0, 1.0, 1.0); + let c = Point3::new(5.0, 2.0, 1.0); + + let scaling = Vector3::new(2.0, 2.0, 1.0); + let scale_about = Matrix4::new_nonuniform_scaling_wrt_point(scaling, c); + + let expected_a = Point3::new(-5.0, -2.0, 1.0); + let expected_b = Point3::new(-3.0, 0.0, 1.0); + + let result_a = scale_about.transform_point(&a); + let result_b = scale_about.transform_point(&b); + let result_c = scale_about.transform_point(&c); + + assert!(expected_a == result_a); + assert!(expected_b == result_b); + assert!(c == result_c); +} + +/// Based on https://github.com/emlowry/AiE/blob/50bae4068edb686cf8ffacdf6fab8e7cb22e7eb1/Year%201%20Classwork/MathTest/Matrix4x4TestGroup.cpp#L145 +#[test] +fn test_scaling_wrt_point_3() { + let about = Point3::new(2.0, 1.0, -2.0); + let scale = Vector3::new(2.0, 0.5, -1.0); + let pt = Point3::new(1.0, 2.0, 3.0); + let scale_about = Matrix4::new_nonuniform_scaling_wrt_point(scale, about); + + let expected = Point3::new(0.0, 1.5, -7.0); + let result = scale_about.transform_point(&pt); + + assert!(result == expected); +} \ No newline at end of file diff --git a/tests/core/mod.rs b/tests/core/mod.rs index ec1c4e3e..7c738368 100644 --- a/tests/core/mod.rs +++ b/tests/core/mod.rs @@ -1,6 +1,7 @@ #[cfg(feature = "abomonation-serialize")] mod abomonation; mod blas; +mod cg; mod conversion; mod edition; mod empty;