hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use match instead of cond!

Browse source
This commit is contained in:
Brendan Zabarauskas 2013-09-18 20:52:07 +10:00
parent 39234b7089
commit 8c17832bf8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/cgmath/matrix.rs
View file

@ -566,8 +566,8 @@ impl<S:Float> ToQuat<S> for Mat3<S> {
// http://www.cs.ucr.edu/~vbz/resources/Quatut.pdf // http://www.cs.ucr.edu/~vbz/resources/Quatut.pdf
let trace = self.trace(); let trace = self.trace();
let half: S = cast(0.5); let half: S = cast(0.5);
cond! ( match () {
(trace >= zero::<S>()) { () if trace >= zero::<S>() => {
let s = sqrt(one::<S>() + trace); let s = sqrt(one::<S>() + trace);
let w = half * s; let w = half * s;
let s = half / s; let s = half / s;
@ -576,7 +576,7 @@ impl<S:Float> ToQuat<S> for Mat3<S> {
let z = (*self.cr(0, 1) - *self.cr(1, 0)) * s; let z = (*self.cr(0, 1) - *self.cr(1, 0)) * s;
Quat::new(w, x, y, z) Quat::new(w, x, y, z)
} }
((*self.cr(0, 0) > *self.cr(1, 1)) && (*self.cr(0, 0) > *self.cr(2, 2))) { () if (*self.cr(0, 0) > *self.cr(1, 1)) && (*self.cr(0, 0) > *self.cr(2, 2)) => {
let s = sqrt(half + (*self.cr(0, 0) - *self.cr(1, 1) - *self.cr(2, 2))); let s = sqrt(half + (*self.cr(0, 0) - *self.cr(1, 1) - *self.cr(2, 2)));
let w = half * s; let w = half * s;
let s = half / s; let s = half / s;
@ -585,7 +585,7 @@ impl<S:Float> ToQuat<S> for Mat3<S> {
let z = (*self.cr(1, 2) - *self.cr(2, 1)) * s; let z = (*self.cr(1, 2) - *self.cr(2, 1)) * s;
Quat::new(w, x, y, z) Quat::new(w, x, y, z)
} }
(*self.cr(1, 1) > *self.cr(2, 2)) { () if *self.cr(1, 1) > *self.cr(2, 2) => {
let s = sqrt(half + (*self.cr(1, 1) - *self.cr(0, 0) - *self.cr(2, 2))); let s = sqrt(half + (*self.cr(1, 1) - *self.cr(0, 0) - *self.cr(2, 2)));
let w = half * s; let w = half * s;
let s = half / s; let s = half / s;
@ -594,7 +594,7 @@ impl<S:Float> ToQuat<S> for Mat3<S> {
let z = (*self.cr(2, 0) - *self.cr(0, 2)) * s; let z = (*self.cr(2, 0) - *self.cr(0, 2)) * s;
Quat::new(w, x, y, z) Quat::new(w, x, y, z)
} }
_ { () => {
let s = sqrt(half + (*self.cr(2, 2) - *self.cr(0, 0) - *self.cr(1, 1))); let s = sqrt(half + (*self.cr(2, 2) - *self.cr(0, 0) - *self.cr(1, 1)));
let w = half * s; let w = half * s;
let s = half / s; let s = half / s;
@ -603,6 +603,6 @@ impl<S:Float> ToQuat<S> for Mat3<S> {
let z = (*self.cr(0, 1) - *self.cr(1, 0)) * s; let z = (*self.cr(0, 1) - *self.cr(1, 0)) * s;
Quat::new(w, x, y, z) Quat::new(w, x, y, z)
} }
) }
} }
} }