diff --git a/src/quaternion.rs b/src/quaternion.rs index 059e5d8..227c7ce 100644 --- a/src/quaternion.rs +++ b/src/quaternion.rs @@ -31,9 +31,9 @@ use euler::Euler; use matrix::{Matrix3, Matrix4}; use num::BaseFloat; use point::Point3; +use quaternion; use rotation::{Basis3, Rotation, Rotation3}; use vector::Vector3; -use quaternion; #[cfg(feature = "mint")] use mint; @@ -542,7 +542,7 @@ impl From> for [S; 4] { #[inline] fn from(v: Quaternion) -> Self { let (xi, yj, zk, w) = v.into(); - [xi, yj, zk, w] + [xi, yj, zk, w] } } @@ -584,10 +584,10 @@ impl<'a, S: BaseFloat> From<&'a mut [S; 4]> for &'a mut Quaternion { impl From> for (S, S, S, S) { #[inline] fn from(v: Quaternion) -> Self { - let Quaternion { - s, - v: Vector3 { x, y, z }, - } = v; + let Quaternion { + s, + v: Vector3 { x, y, z }, + } = v; (x, y, z, s) } } diff --git a/src/transform.rs b/src/transform.rs index f6bdd15..72e08ed 100644 --- a/src/transform.rs +++ b/src/transform.rs @@ -46,7 +46,8 @@ pub trait Transform: Sized + One { /// Inverse transform a vector using this transform fn inverse_transform_vector(&self, vec: P::Diff) -> Option { - self.inverse_transform().map(|inverse| inverse.transform_vector(vec)) + self.inverse_transform() + .map(|inverse| inverse.transform_vector(vec)) } /// Transform a point using this transform. diff --git a/tests/matrix.rs b/tests/matrix.rs index adcbc6a..20c78c6 100644 --- a/tests/matrix.rs +++ b/tests/matrix.rs @@ -733,11 +733,14 @@ pub mod matrix3 { let up = Vector3::unit_y(); let m = Matrix3::look_to_lh(dir, up); - assert_ulps_eq!(m, Matrix3::from([ - [0.9486833, -0.16903085, 0.26726127], - [0.0, 0.8451542, 0.53452253], - [-0.31622776, -0.50709254, 0.8017838_f32] - ])); + assert_ulps_eq!( + m, + Matrix3::from([ + [0.9486833, -0.16903085, 0.26726127], + [0.0, 0.8451542, 0.53452253], + [-0.31622776, -0.50709254, 0.8017838_f32] + ]) + ); #[allow(deprecated)] { @@ -751,11 +754,14 @@ pub mod matrix3 { let up = Vector3::unit_y(); let m = Matrix3::look_to_rh(dir, up); - assert_ulps_eq!(m, Matrix3::from([ - [-0.9486833, -0.16903085, -0.26726127], - [0.0, 0.8451542, -0.53452253], - [0.31622776, -0.50709254, -0.8017838_f32] - ])); + assert_ulps_eq!( + m, + Matrix3::from([ + [-0.9486833, -0.16903085, -0.26726127], + [0.0, 0.8451542, -0.53452253], + [0.31622776, -0.50709254, -0.8017838_f32] + ]) + ); } } @@ -1174,7 +1180,7 @@ pub mod matrix4 { [-0.9486833, -0.16903086, -0.26726127, 0.0], [0.0, 0.84515435, -0.53452253, 0.0], [0.31622776, -0.5070926, -0.8017838, 0.0], - [3.1622782, -0.84515476, 26.726126, 1.0_f32] + [3.1622782, -0.84515476, 26.726126, 1.0_f32], ]); assert_ulps_eq!(expected, m); @@ -1194,7 +1200,7 @@ pub mod matrix4 { [0.9486833, -0.16903086, 0.26726127, 0.0], [0.0, 0.84515435, 0.53452253, 0.0], [-0.31622776, -0.5070926, 0.8017838, 0.0], - [-3.1622782, -0.84515476, -26.726126, 1.0_f32] + [-3.1622782, -0.84515476, -26.726126, 1.0_f32], ]); assert_ulps_eq!(expected, m); diff --git a/tests/transform.rs b/tests/transform.rs index 926ff83..ee22977 100644 --- a/tests/transform.rs +++ b/tests/transform.rs @@ -94,7 +94,10 @@ fn test_look_at() { let center = Point3::new(0.0f64, 0.0, 0.0); let up = Vector3::new(1.0f64, 0.0, 0.0); let t: Decomposed, Quaternion> = Transform::look_at(eye, center, up); - assert_ulps_eq!(t, Decomposed::, Quaternion>::look_at(eye, center, up)); + assert_ulps_eq!( + t, + Decomposed::, Quaternion>::look_at(eye, center, up) + ); let point = Point3::new(1.0f64, 0.0, 0.0); let view_point = Point3::new(0.0f64, 1.0, 5.0); assert_ulps_eq!(&t.transform_point(point), &view_point); @@ -106,7 +109,10 @@ fn test_look_at_lh() { let center = Point3::new(0.0f64, 0.0, 0.0); let up = Vector3::new(1.0f64, 0.0, 0.0); let t: Decomposed, Quaternion> = Transform::look_at_lh(eye, center, up); - assert_ulps_eq!(t, Decomposed::, Quaternion>::look_at_lh(eye, center, up)); + assert_ulps_eq!( + t, + Decomposed::, Quaternion>::look_at_lh(eye, center, up) + ); let point = Point3::new(1.0f64, 0.0, 0.0); let view_point = Point3::new(0.0f64, 1.0, 5.0); assert_ulps_eq!(&t.transform_point(point), &view_point); @@ -129,7 +135,10 @@ fn test_look_at_rh() { let center = Point3::new(0.0f64, 0.0, 0.0); let up = Vector3::new(1.0f64, 0.0, 0.0); let t: Decomposed, Quaternion> = Transform::look_at_rh(eye, center, up); - assert_ulps_eq!(t, Decomposed::, Quaternion>::look_at_rh(eye, center, up)); + assert_ulps_eq!( + t, + Decomposed::, Quaternion>::look_at_rh(eye, center, up) + ); let point = Point3::new(1.0f64, 0.0, 0.0); let view_point = Point3::new(0.0f64, 1.0, -5.0); assert_ulps_eq!(&t.transform_point(point), &view_point);