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

Remove unnecessary type parameter

Browse source
This commit is contained in:
Brendan Zabarauskas 2012-11-05 17:03:32 +10:00
parent a1a31907d7
commit 8bab3a96ce
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/matrix.rs
View file

@ -53,10 +53,7 @@ pub trait Matrix<T, ColV, RowV> {
pure fn mul_v(other: &ColV) -> ColV; pure fn mul_v(other: &ColV) -> ColV;
} }
// pub trait SquareMatrix<T> {
// NxN Matrix
//
pub trait SquareMatrix<T, V> {
pure fn add_m(other: &self) -> self; pure fn add_m(other: &self) -> self;
pure fn sub_m(other: &self) -> self; pure fn sub_m(other: &self) -> self;
pure fn mul_m(other: &self) -> self; pure fn mul_m(other: &self) -> self;
@ -175,7 +172,7 @@ pub impl<T:Copy Num NumCast> Mat2<T>: Matrix<T, Vec2<T>, Vec2<T>> {
} }
} }
pub impl<T:Copy Num NumCast FuzzyEq> Mat2<T>: SquareMatrix<T, Vec2<T>> { pub impl<T:Copy Num NumCast FuzzyEq> Mat2<T>: SquareMatrix<T> {
#[inline(always)] #[inline(always)]
pure fn add_m(other: &Mat2<T>) -> Mat2<T> { pure fn add_m(other: &Mat2<T>) -> Mat2<T> {
Mat2::from_cols(self[0].add_v(&other[0]), Mat2::from_cols(self[0].add_v(&other[0]),
@ -390,7 +387,7 @@ pub impl<T:Copy Num NumCast> Mat3<T>: Matrix<T, Vec3<T>, Vec3<T>> {
} }
} }
pub impl<T:Copy Num NumCast FuzzyEq> Mat3<T>: SquareMatrix<T, Vec3<T>> { pub impl<T:Copy Num NumCast FuzzyEq> Mat3<T>: SquareMatrix<T> {
#[inline(always)] #[inline(always)]
pure fn add_m(other: &Mat3<T>) -> Mat3<T> { pure fn add_m(other: &Mat3<T>) -> Mat3<T> {
Mat3::from_cols(self[0].add_v(&other[0]), Mat3::from_cols(self[0].add_v(&other[0]),
@ -693,7 +690,7 @@ pub impl<T:Copy Num NumCast> Mat4<T>: Matrix<T, Vec4<T>, Vec4<T>> {
} }
} }
pub impl<T:Copy Num NumCast FuzzyEq> Mat4<T>: SquareMatrix<T, Vec4<T>> { pub impl<T:Copy Num NumCast FuzzyEq> Mat4<T>: SquareMatrix<T> {
#[inline(always)] #[inline(always)]
pure fn add_m(other: &Mat4<T>) -> Mat4<T> { pure fn add_m(other: &Mat4<T>) -> Mat4<T> {
Mat4::from_cols(self[0].add_v(&other[0]), Mat4::from_cols(self[0].add_v(&other[0]),