Skip to content

Commit 575c458

Browse files
Rémi Lauzierkvark
authored andcommitted
cargo fmt
1 parent fb205c0 commit 575c458

File tree

4 files changed

+38
-22
lines changed

4 files changed

+38
-22
lines changed

src/quaternion.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ use euler::Euler;
3131
use matrix::{Matrix3, Matrix4};
3232
use num::BaseFloat;
3333
use point::Point3;
34+
use quaternion;
3435
use rotation::{Basis3, Rotation, Rotation3};
3536
use vector::Vector3;
36-
use quaternion;
3737

3838
#[cfg(feature = "mint")]
3939
use mint;
@@ -542,7 +542,7 @@ impl<S: BaseFloat> From<Quaternion<S>> for [S; 4] {
542542
#[inline]
543543
fn from(v: Quaternion<S>) -> Self {
544544
let (xi, yj, zk, w) = v.into();
545-
[xi, yj, zk, w]
545+
[xi, yj, zk, w]
546546
}
547547
}
548548

@@ -584,10 +584,10 @@ impl<'a, S: BaseFloat> From<&'a mut [S; 4]> for &'a mut Quaternion<S> {
584584
impl<S: BaseFloat> From<Quaternion<S>> for (S, S, S, S) {
585585
#[inline]
586586
fn from(v: Quaternion<S>) -> Self {
587-
let Quaternion {
588-
s,
589-
v: Vector3 { x, y, z },
590-
} = v;
587+
let Quaternion {
588+
s,
589+
v: Vector3 { x, y, z },
590+
} = v;
591591
(x, y, z, s)
592592
}
593593
}

src/transform.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ pub trait Transform<P: EuclideanSpace>: Sized + One {
4646

4747
/// Inverse transform a vector using this transform
4848
fn inverse_transform_vector(&self, vec: P::Diff) -> Option<P::Diff> {
49-
self.inverse_transform().map(|inverse| inverse.transform_vector(vec))
49+
self.inverse_transform()
50+
.map(|inverse| inverse.transform_vector(vec))
5051
}
5152

5253
/// Transform a point using this transform.

tests/matrix.rs

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -733,11 +733,14 @@ pub mod matrix3 {
733733
let up = Vector3::unit_y();
734734
let m = Matrix3::look_to_lh(dir, up);
735735

736-
assert_ulps_eq!(m, Matrix3::from([
737-
[0.9486833, -0.16903085, 0.26726127],
738-
[0.0, 0.8451542, 0.53452253],
739-
[-0.31622776, -0.50709254, 0.8017838_f32]
740-
]));
736+
assert_ulps_eq!(
737+
m,
738+
Matrix3::from([
739+
[0.9486833, -0.16903085, 0.26726127],
740+
[0.0, 0.8451542, 0.53452253],
741+
[-0.31622776, -0.50709254, 0.8017838_f32]
742+
])
743+
);
741744

742745
#[allow(deprecated)]
743746
{
@@ -751,11 +754,14 @@ pub mod matrix3 {
751754
let up = Vector3::unit_y();
752755
let m = Matrix3::look_to_rh(dir, up);
753756

754-
assert_ulps_eq!(m, Matrix3::from([
755-
[-0.9486833, -0.16903085, -0.26726127],
756-
[0.0, 0.8451542, -0.53452253],
757-
[0.31622776, -0.50709254, -0.8017838_f32]
758-
]));
757+
assert_ulps_eq!(
758+
m,
759+
Matrix3::from([
760+
[-0.9486833, -0.16903085, -0.26726127],
761+
[0.0, 0.8451542, -0.53452253],
762+
[0.31622776, -0.50709254, -0.8017838_f32]
763+
])
764+
);
759765
}
760766
}
761767

@@ -1174,7 +1180,7 @@ pub mod matrix4 {
11741180
[-0.9486833, -0.16903086, -0.26726127, 0.0],
11751181
[0.0, 0.84515435, -0.53452253, 0.0],
11761182
[0.31622776, -0.5070926, -0.8017838, 0.0],
1177-
[3.1622782, -0.84515476, 26.726126, 1.0_f32]
1183+
[3.1622782, -0.84515476, 26.726126, 1.0_f32],
11781184
]);
11791185
assert_ulps_eq!(expected, m);
11801186

@@ -1194,7 +1200,7 @@ pub mod matrix4 {
11941200
[0.9486833, -0.16903086, 0.26726127, 0.0],
11951201
[0.0, 0.84515435, 0.53452253, 0.0],
11961202
[-0.31622776, -0.5070926, 0.8017838, 0.0],
1197-
[-3.1622782, -0.84515476, -26.726126, 1.0_f32]
1203+
[-3.1622782, -0.84515476, -26.726126, 1.0_f32],
11981204
]);
11991205
assert_ulps_eq!(expected, m);
12001206

tests/transform.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,10 @@ fn test_look_at() {
9494
let center = Point3::new(0.0f64, 0.0, 0.0);
9595
let up = Vector3::new(1.0f64, 0.0, 0.0);
9696
let t: Decomposed<Vector3<f64>, Quaternion<f64>> = Transform::look_at(eye, center, up);
97-
assert_ulps_eq!(t, Decomposed::<Vector3<f64>, Quaternion<f64>>::look_at(eye, center, up));
97+
assert_ulps_eq!(
98+
t,
99+
Decomposed::<Vector3<f64>, Quaternion<f64>>::look_at(eye, center, up)
100+
);
98101
let point = Point3::new(1.0f64, 0.0, 0.0);
99102
let view_point = Point3::new(0.0f64, 1.0, 5.0);
100103
assert_ulps_eq!(&t.transform_point(point), &view_point);
@@ -106,7 +109,10 @@ fn test_look_at_lh() {
106109
let center = Point3::new(0.0f64, 0.0, 0.0);
107110
let up = Vector3::new(1.0f64, 0.0, 0.0);
108111
let t: Decomposed<Vector3<f64>, Quaternion<f64>> = Transform::look_at_lh(eye, center, up);
109-
assert_ulps_eq!(t, Decomposed::<Vector3<f64>, Quaternion<f64>>::look_at_lh(eye, center, up));
112+
assert_ulps_eq!(
113+
t,
114+
Decomposed::<Vector3<f64>, Quaternion<f64>>::look_at_lh(eye, center, up)
115+
);
110116
let point = Point3::new(1.0f64, 0.0, 0.0);
111117
let view_point = Point3::new(0.0f64, 1.0, 5.0);
112118
assert_ulps_eq!(&t.transform_point(point), &view_point);
@@ -129,7 +135,10 @@ fn test_look_at_rh() {
129135
let center = Point3::new(0.0f64, 0.0, 0.0);
130136
let up = Vector3::new(1.0f64, 0.0, 0.0);
131137
let t: Decomposed<Vector3<f64>, Quaternion<f64>> = Transform::look_at_rh(eye, center, up);
132-
assert_ulps_eq!(t, Decomposed::<Vector3<f64>, Quaternion<f64>>::look_at_rh(eye, center, up));
138+
assert_ulps_eq!(
139+
t,
140+
Decomposed::<Vector3<f64>, Quaternion<f64>>::look_at_rh(eye, center, up)
141+
);
133142
let point = Point3::new(1.0f64, 0.0, 0.0);
134143
let view_point = Point3::new(0.0f64, 1.0, -5.0);
135144
assert_ulps_eq!(&t.transform_point(point), &view_point);

0 commit comments

Comments
 (0)