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

Remove default eq implementations and use fuzzy_eq instead

Browse source
This commit is contained in:
Brendan Zabarauskas 2012-12-04 08:23:13 +10:00
parent 4fcd71be8e
commit 53fc6d15ab
2 changed files with 60 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
src/mat.rs
View file

@ -10,7 +10,6 @@ use dim::{Dimensional, ToPtr};
use funs::common::*; use funs::common::*;
use funs::exponential::*; use funs::exponential::*;
use num::cast::*; use num::cast::*;
use num::default_eq::DefaultEq;
use num::kinds::{Float, Number}; use num::kinds::{Float, Number};
use quat::{Quat, ToQuat}; use quat::{Quat, ToQuat};
use vec::{NumericVector, Vec2, Vec3, Vec4}; use vec::{NumericVector, Vec2, Vec3, Vec4};
@ -18,7 +17,7 @@ use vec::{NumericVector, Vec2, Vec3, Vec4};
/** /**
* An N x N Matrix * An N x N Matrix
*/ */
pub trait Matrix<T,V>: Dimensional<V>, ToPtr<T>, Eq, DefaultEq, Neg<self> { pub trait Matrix<T,V>: Dimensional<V>, ToPtr<T>, Eq, Neg<self> {
pure fn col(&self, i: uint) -> V; pure fn col(&self, i: uint) -> V;
pure fn row(&self, i: uint) -> V; pure fn row(&self, i: uint) -> V;
@ -181,7 +180,7 @@ pub impl<T:Copy Float> Mat2<T>: Matrix<T, Vec2<T>> {
pure fn inverse(&self) -> Option<Mat2<T>> { pure fn inverse(&self) -> Option<Mat2<T>> {
let _0 = cast(0); let _0 = cast(0);
let d = self.determinant(); let d = self.determinant();
if d.default_eq(&_0) { if d.fuzzy_eq(&_0) {
None None
} else { } else {
Some(Mat2::new( self[1][1]/d, -self[0][1]/d, Some(Mat2::new( self[1][1]/d, -self[0][1]/d,
@ -197,33 +196,33 @@ pub impl<T:Copy Float> Mat2<T>: Matrix<T, Vec2<T>> {
#[inline(always)] #[inline(always)]
pure fn is_identity(&self) -> bool { pure fn is_identity(&self) -> bool {
// self.default_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here! // self.fuzzy_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here!
self.default_eq(&Mat2::identity()) self.fuzzy_eq(&Mat2::identity())
} }
#[inline(always)] #[inline(always)]
pure fn is_diagonal(&self) -> bool { pure fn is_diagonal(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
self[0][1].default_eq(&_0) && self[0][1].fuzzy_eq(&_0) &&
self[1][0].default_eq(&_0) self[1][0].fuzzy_eq(&_0)
} }
#[inline(always)] #[inline(always)]
pure fn is_rotated(&self) -> bool { pure fn is_rotated(&self) -> bool {
// !self.default_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here! // !self.fuzzy_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here!
!self.default_eq(&Mat2::identity()) !self.fuzzy_eq(&Mat2::identity())
} }
#[inline(always)] #[inline(always)]
pure fn is_symmetric(&self) -> bool { pure fn is_symmetric(&self) -> bool {
self[0][1].default_eq(&self[1][0]) && self[0][1].fuzzy_eq(&self[1][0]) &&
self[1][0].default_eq(&self[0][1]) self[1][0].fuzzy_eq(&self[0][1])
} }
#[inline(always)] #[inline(always)]
pure fn is_invertible(&self) -> bool { pure fn is_invertible(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
!self.determinant().default_eq(&_0) !self.determinant().fuzzy_eq(&_0)
} }
} }
@ -292,14 +291,6 @@ pub impl<T:Copy Float> Mat2<T>: FuzzyEq {
} }
} }
pub impl<T:Copy Float> Mat2<T>: DefaultEq {
#[inline(always)]
pure fn default_eq(&self, other: &Mat2<T>) -> bool {
self[0].default_eq(&other[0]) &&
self[1].default_eq(&other[1])
}
}
@ -443,7 +434,7 @@ pub impl<T:Copy Float> Mat3<T>: Matrix<T, Vec3<T>> {
pure fn inverse(&self) -> Option<Mat3<T>> { pure fn inverse(&self) -> Option<Mat3<T>> {
let d = self.determinant(); let d = self.determinant();
let _0 = cast(0); let _0 = cast(0);
if d.default_eq(&_0) { if d.fuzzy_eq(&_0) {
None None
} else { } else {
Some(Mat3::from_cols(self[1].cross(&self[2]).div_t(d), Some(Mat3::from_cols(self[1].cross(&self[2]).div_t(d),
@ -462,45 +453,45 @@ pub impl<T:Copy Float> Mat3<T>: Matrix<T, Vec3<T>> {
#[inline(always)] #[inline(always)]
pure fn is_identity(&self) -> bool { pure fn is_identity(&self) -> bool {
// self.default_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here! // self.fuzzy_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here!
self.default_eq(&Mat3::identity()) self.fuzzy_eq(&Mat3::identity())
} }
#[inline(always)] #[inline(always)]
pure fn is_diagonal(&self) -> bool { pure fn is_diagonal(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
self[0][1].default_eq(&_0) && self[0][1].fuzzy_eq(&_0) &&
self[0][2].default_eq(&_0) && self[0][2].fuzzy_eq(&_0) &&
self[1][0].default_eq(&_0) && self[1][0].fuzzy_eq(&_0) &&
self[1][2].default_eq(&_0) && self[1][2].fuzzy_eq(&_0) &&
self[2][0].default_eq(&_0) && self[2][0].fuzzy_eq(&_0) &&
self[2][1].default_eq(&_0) self[2][1].fuzzy_eq(&_0)
} }
#[inline(always)] #[inline(always)]
pure fn is_rotated(&self) -> bool { pure fn is_rotated(&self) -> bool {
// !self.default_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here! // !self.fuzzy_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here!
!self.default_eq(&Mat3::identity()) !self.fuzzy_eq(&Mat3::identity())
} }
#[inline(always)] #[inline(always)]
pure fn is_symmetric(&self) -> bool { pure fn is_symmetric(&self) -> bool {
self[0][1].default_eq(&self[1][0]) && self[0][1].fuzzy_eq(&self[1][0]) &&
self[0][2].default_eq(&self[2][0]) && self[0][2].fuzzy_eq(&self[2][0]) &&
self[1][0].default_eq(&self[0][1]) && self[1][0].fuzzy_eq(&self[0][1]) &&
self[1][2].default_eq(&self[2][1]) && self[1][2].fuzzy_eq(&self[2][1]) &&
self[2][0].default_eq(&self[0][2]) && self[2][0].fuzzy_eq(&self[0][2]) &&
self[2][1].default_eq(&self[1][2]) self[2][1].fuzzy_eq(&self[1][2])
} }
#[inline(always)] #[inline(always)]
pure fn is_invertible(&self) -> bool { pure fn is_invertible(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
!self.determinant().default_eq(&_0) !self.determinant().fuzzy_eq(&_0)
} }
} }
@ -612,15 +603,6 @@ pub impl<T:Copy Float> Mat3<T>: FuzzyEq {
} }
} }
pub impl<T:Copy Float> Mat3<T>: DefaultEq {
#[inline(always)]
pure fn default_eq(&self, other: &Mat3<T>) -> bool {
self[0].default_eq(&other[0]) &&
self[1].default_eq(&other[1]) &&
self[2].default_eq(&other[2])
}
}
@ -802,7 +784,7 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
pure fn inverse(&self) -> Option<Mat4<T>> { pure fn inverse(&self) -> Option<Mat4<T>> {
let d = self.determinant(); let d = self.determinant();
let _0 = cast(0); let _0 = cast(0);
if d.default_eq(&_0) { if d.fuzzy_eq(&_0) {
None None
} else { } else {
@ -866,59 +848,59 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
#[inline(always)] #[inline(always)]
pure fn is_identity(&self) -> bool { pure fn is_identity(&self) -> bool {
// self.default_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here! // self.fuzzy_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here!
self.default_eq(&Mat4::identity()) self.fuzzy_eq(&Mat4::identity())
} }
#[inline(always)] #[inline(always)]
pure fn is_diagonal(&self) -> bool { pure fn is_diagonal(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
self[0][1].default_eq(&_0) && self[0][1].fuzzy_eq(&_0) &&
self[0][2].default_eq(&_0) && self[0][2].fuzzy_eq(&_0) &&
self[0][3].default_eq(&_0) && self[0][3].fuzzy_eq(&_0) &&
self[1][0].default_eq(&_0) && self[1][0].fuzzy_eq(&_0) &&
self[1][2].default_eq(&_0) && self[1][2].fuzzy_eq(&_0) &&
self[1][3].default_eq(&_0) && self[1][3].fuzzy_eq(&_0) &&
self[2][0].default_eq(&_0) && self[2][0].fuzzy_eq(&_0) &&
self[2][1].default_eq(&_0) && self[2][1].fuzzy_eq(&_0) &&
self[2][3].default_eq(&_0) && self[2][3].fuzzy_eq(&_0) &&
self[3][0].default_eq(&_0) && self[3][0].fuzzy_eq(&_0) &&
self[3][1].default_eq(&_0) && self[3][1].fuzzy_eq(&_0) &&
self[3][2].default_eq(&_0) self[3][2].fuzzy_eq(&_0)
} }
#[inline(always)] #[inline(always)]
pure fn is_rotated(&self) -> bool { pure fn is_rotated(&self) -> bool {
// !self.default_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here! // !self.fuzzy_eq(&Matrix::identity()) // FIXME: there's something wrong with static functions here!
!self.default_eq(&Mat4::identity()) !self.fuzzy_eq(&Mat4::identity())
} }
#[inline(always)] #[inline(always)]
pure fn is_symmetric(&self) -> bool { pure fn is_symmetric(&self) -> bool {
self[0][1].default_eq(&self[1][0]) && self[0][1].fuzzy_eq(&self[1][0]) &&
self[0][2].default_eq(&self[2][0]) && self[0][2].fuzzy_eq(&self[2][0]) &&
self[0][3].default_eq(&self[3][0]) && self[0][3].fuzzy_eq(&self[3][0]) &&
self[1][0].default_eq(&self[0][1]) && self[1][0].fuzzy_eq(&self[0][1]) &&
self[1][2].default_eq(&self[2][1]) && self[1][2].fuzzy_eq(&self[2][1]) &&
self[1][3].default_eq(&self[3][1]) && self[1][3].fuzzy_eq(&self[3][1]) &&
self[2][0].default_eq(&self[0][2]) && self[2][0].fuzzy_eq(&self[0][2]) &&
self[2][1].default_eq(&self[1][2]) && self[2][1].fuzzy_eq(&self[1][2]) &&
self[2][3].default_eq(&self[3][2]) && self[2][3].fuzzy_eq(&self[3][2]) &&
self[3][0].default_eq(&self[0][3]) && self[3][0].fuzzy_eq(&self[0][3]) &&
self[3][1].default_eq(&self[1][3]) && self[3][1].fuzzy_eq(&self[1][3]) &&
self[3][2].default_eq(&self[2][3]) self[3][2].fuzzy_eq(&self[2][3])
} }
#[inline(always)] #[inline(always)]
pure fn is_invertible(&self) -> bool { pure fn is_invertible(&self) -> bool {
let _0 = cast(0); let _0 = cast(0);
!self.determinant().default_eq(&_0) !self.determinant().fuzzy_eq(&_0)
} }
} }
@ -981,13 +963,3 @@ pub impl<T:Copy Float> Mat4<T>: FuzzyEq {
self[3].fuzzy_eq(&other[3]) self[3].fuzzy_eq(&other[3])
} }
} }
pub impl<T:Copy Float> Mat4<T>: DefaultEq {
#[inline(always)]
pure fn default_eq(&self, other: &Mat4<T>) -> bool {
self[0].default_eq(&other[0]) &&
self[1].default_eq(&other[1]) &&
self[2].default_eq(&other[2]) &&
self[3].default_eq(&other[3])
}
}

13
src/quat.rs
View file

@ -11,7 +11,6 @@ use funs::common::*;
use funs::exponential::*; use funs::exponential::*;
use funs::triganomic::*; use funs::triganomic::*;
use mat::{Mat3, Mat4}; use mat::{Mat3, Mat4};
use num::default_eq::DefaultEq;
use num::kinds::{Float, Number}; use num::kinds::{Float, Number};
use vec::Vec3; use vec::Vec3;
@ -19,9 +18,9 @@ use vec::Vec3;
/// ///
/// The base quaternion trait /// The base quaternion trait
/// ///
pub trait Quaternion<T>: Dimensional<T>, ToPtr<T>, Eq, DefaultEq, Neg<self> {
static pure fn identity() -> self; /// The multiplicative identity static pure fn identity() -> self; /// The multiplicative identity
static pure fn zero() -> self; /// The additive identity static pure fn zero() -> self; /// The additive identity
pub trait Quaternion<T>: Dimensional<T>, ToPtr<T>, Eq, Neg<self> {
pure fn mul_t(&self, value: T) -> self; pure fn mul_t(&self, value: T) -> self;
pure fn div_t(&self, value: T) -> self; pure fn div_t(&self, value: T) -> self;
@ -293,16 +292,6 @@ pub impl<T:Copy FuzzyEq> Quat<T>: FuzzyEq {
} }
} }
pub impl<T:Copy DefaultEq> Quat<T>: DefaultEq {
#[inline(always)]
pure fn default_eq(&self, other: &Quat<T>) -> bool {
self[0].default_eq(&other[0]) &&
self[1].default_eq(&other[1]) &&
self[2].default_eq(&other[2]) &&
self[3].default_eq(&other[3])
}
}
// // Operator Overloads // // Operator Overloads
// pub impl<T, Result, RHS: QuatAddRHS<T, Result>> Quat<T>: Add<RHS,Result> { // pub impl<T, Result, RHS: QuatAddRHS<T, Result>> Quat<T>: Add<RHS,Result> {