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

Replace from_int function calls with cast for consistency

Browse source
This commit is contained in:
Brendan Zabarauskas 2012-11-11 13:43:37 +10:00
parent 683ebf88eb
commit a3e4d090d6
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/matrix.rs
View file

@ -1,6 +1,5 @@
use cast::transmute;
use cmp::Eq;
use num::from_int;
use ptr::to_unsafe_ptr;
use vec::raw::buf_as_slice;
use std::cmp::FuzzyEq;
@ -508,7 +507,7 @@ pub impl<T:Copy Num NumCast Ord> Mat3<T>: ToQuat<T> {
let w: float, x: float, y: float, z: float;
let trace: float = cast(self[0][0] + self[1][1] + self[2][2]);
if trace >= from_int(0) {
if trace >= cast(0) {
s = (trace + 1f).sqrt();
w = 0.5 * s;
s = 0.5 / s;

2
src/quaternion.rs
View file

@ -157,7 +157,7 @@ pub impl<T:Copy Num NumCast Trig Exp Extent Ord FuzzyEq> Quat<T>: Quaternion<T>
#[inline(always)]
pure fn inverse() -> Quat<T> {
let mut n: T = from_int(1);
let mut n: T = cast(1);
n /= self.length2();
self.conjugate().mul_t(n)
}

13
src/vector.rs
View file

@ -1,6 +1,5 @@
use cast::transmute;
use cmp::{Eq, Ord};
use num::from_int;
use vec::raw::buf_as_slice;
use ptr::to_unsafe_ptr;
use std::cmp::FuzzyEq;
@ -155,7 +154,7 @@ pub impl<T:Copy Num> Vec2<T>: NumericVector<T> {
}
}
pub impl<T:Copy Num Exp> Vec2<T>: GeometricVector<T> {
pub impl<T:Copy Num NumCast Exp> Vec2<T>: GeometricVector<T> {
#[inline(always)]
pure fn length2() -> T {
self[0] * self[0] +
@ -169,7 +168,7 @@ pub impl<T:Copy Num Exp> Vec2<T>: GeometricVector<T> {
#[inline(always)]
pure fn normalize() -> Vec2<T> {
let mut n: T = from_int(1);
let mut n: T = cast(1);
n /= self.length();
return self.mul_t(n);
}
@ -340,7 +339,7 @@ pub impl<T:Copy Num> Vec3<T>: NumericVector<T> {
}
}
pub impl<T:Copy Num Exp> Vec3<T>: GeometricVector<T> {
pub impl<T:Copy Num NumCast Exp> Vec3<T>: GeometricVector<T> {
#[inline(always)]
pure fn length2() -> T {
self[0] * self[0] +
@ -355,7 +354,7 @@ pub impl<T:Copy Num Exp> Vec3<T>: GeometricVector<T> {
#[inline(always)]
pure fn normalize() -> Vec3<T> {
let mut n: T = from_int(1);
let mut n: T = cast(1);
n /= self.length();
return self.mul_t(n);
}
@ -531,7 +530,7 @@ pub impl<T:Copy Num> Vec4<T>: NumericVector<T> {
}
}
pub impl<T:Copy Num Exp> Vec4<T>: GeometricVector<T> {
pub impl<T:Copy Num NumCast Exp> Vec4<T>: GeometricVector<T> {
#[inline(always)]
pure fn length2() -> T {
self[0] * self[0] +
@ -547,7 +546,7 @@ pub impl<T:Copy Num Exp> Vec4<T>: GeometricVector<T> {
#[inline(always)]
pure fn normalize() -> Vec4<T> {
let mut n: T = from_int(1);
let mut n: T = cast(1);
n /= self.length();
return self.mul_t(n);
}