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

Remove util::half

Browse source
This commit is contained in:
Brendan Zabarauskas 2013-09-10 14:49:53 +10:00
parent f95426173a
commit 6e3860f232
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/cgmath/matrix.rs
View file

@ -15,13 +15,12 @@
//! Column major, square matrix types and traits. //! Column major, square matrix types and traits.
use std::num::{Zero, zero, One, one, sqrt}; use std::num::{Zero, zero, One, one, cast, sqrt};
use angle::{Rad, sin, cos}; use angle::{Rad, sin, cos};
use array::Array; use array::Array;
use quaternion::{Quat, ToQuat}; use quaternion::{Quat, ToQuat};
use vector::*; use vector::*;
use util::half;
/// A 2 x 2, column major matrix /// A 2 x 2, column major matrix
#[deriving(Clone, Eq, Zero)] #[deriving(Clone, Eq, Zero)]
@ -609,38 +608,39 @@ impl<S:Clone + Float> ToQuat<S> for Mat3<S> {
// Implemented using a mix of ideas from jMonkeyEngine and Ken Shoemake's // Implemented using a mix of ideas from jMonkeyEngine and Ken Shoemake's
// paper on Quaternions: http://www.cs.ucr.edu/~vbz/resources/Quatut.pdf // paper on Quaternions: http://www.cs.ucr.edu/~vbz/resources/Quatut.pdf
let trace = self.trace(); let trace = self.trace();
let half: S = cast(0.5);
cond! ( cond! (
(trace >= zero::<S>()) { (trace >= zero::<S>()) {
let s = sqrt(one::<S>() + trace); let s = sqrt(one::<S>() + trace);
let w = half::<S>() * s; let w = half * s;
let s = half::<S>() / s; let s = half / s;
let x = (*self.cr(1, 2) - *self.cr(2, 1)) * s; let x = (*self.cr(1, 2) - *self.cr(2, 1)) * s;
let y = (*self.cr(2, 0) - *self.cr(0, 2)) * s; let y = (*self.cr(2, 0) - *self.cr(0, 2)) * 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))) { ((*self.cr(0, 0) > *self.cr(1, 1)) && (*self.cr(0, 0) > *self.cr(2, 2))) {
let s = sqrt(half::<S>() + (*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>() * s; let w = half * s;
let s = half::<S>() / s; let s = half / s;
let x = (*self.cr(0, 1) - *self.cr(1, 0)) * s; let x = (*self.cr(0, 1) - *self.cr(1, 0)) * s;
let y = (*self.cr(2, 0) - *self.cr(0, 2)) * s; let y = (*self.cr(2, 0) - *self.cr(0, 2)) * 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)) { (*self.cr(1, 1) > *self.cr(2, 2)) {
let s = sqrt(half::<S>() + (*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>() * s; let w = half * s;
let s = half::<S>() / s; let s = half / s;
let x = (*self.cr(0, 1) - *self.cr(1, 0)) * s; let x = (*self.cr(0, 1) - *self.cr(1, 0)) * s;
let y = (*self.cr(1, 2) - *self.cr(2, 1)) * s; let y = (*self.cr(1, 2) - *self.cr(2, 1)) * 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::<S>() + (*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>() * s; let w = half * s;
let s = half::<S>() / s; let s = half / s;
let x = (*self.cr(2, 0) - *self.cr(0, 2)) * s; let x = (*self.cr(2, 0) - *self.cr(0, 2)) * s;
let y = (*self.cr(1, 2) - *self.cr(2, 1)) * s; let y = (*self.cr(1, 2) - *self.cr(2, 1)) * s;
let z = (*self.cr(0, 1) - *self.cr(1, 0)) * s; let z = (*self.cr(0, 1) - *self.cr(1, 0)) * s;

2
src/cgmath/util.rs
View file

@ -20,5 +20,3 @@ use std::num::one;
#[inline] #[inline]
pub fn two<T: Num>() -> T { one::<T>() + one::<T>() } pub fn two<T: Num>() -> T { one::<T>() + one::<T>() }
#[inline]
pub fn half<T: Real>() -> T { one::<T>() / two::<T>() }