M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix 2d matrix multiplication and 3d matrix inversion.

This commit is contained in:
Sébastien Crozet 2013-05-15 11:51:53 +02:00
parent cfe636c11b
commit c7059af99d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dim2/mat2.rs
View File

@ -60,7 +60,7 @@ impl<T:Copy + Mul<T, T> + Add<T, T>> Mul<Mat2<T>, Mat2<T>> for Mat2<T>
(self.m11 * other.m11 + self.m12 * other.m21, (self.m11 * other.m11 + self.m12 * other.m21,
self.m11 * other.m12 + self.m12 * other.m22, self.m11 * other.m12 + self.m12 * other.m22,
self.m21 * other.m11 + self.m22 * other.m21, self.m21 * other.m11 + self.m22 * other.m21,
self.m21 * other.m22 + self.m22 * other.m22) self.m21 * other.m12 + self.m22 * other.m22)
} }
} }

9
src/dim3/mat3.rs
View File

@ -51,13 +51,6 @@ impl<T:Copy + Zero> Zero for Mat3<T>
_0, _0, _0, _0, _0, _0,
_0, _0, _0) _0, _0, _0)
} }
// fn is_zero(&self) -> bool
// {
// self.m11.is_zero() && self.m12.is_zero() && self.m13.is_zero()
// && self.m21.is_zero() && self.m22.is_zero() && self.m23.is_zero()
// && self.m31.is_zero() && self.m32.is_zero() && self.m33.is_zero()
// }
} }
impl<T:Copy + Mul<T, T> + Add<T, T>> Mul<Mat3<T>, Mat3<T>> for Mat3<T> impl<T:Copy + Mul<T, T> + Add<T, T>> Mul<Mat3<T>, Mat3<T>> for Mat3<T>
@ -129,7 +122,7 @@ Inv for Mat3<T>
((self.m13 * self.m21 - self.m23 * self.m11) / det), ((self.m13 * self.m21 - self.m23 * self.m11) / det),
(minor_m21_m32 / det), (minor_m21_m32 / det),
((self.m12 * self.m31 - self.m31 * self.m11) / det), ((self.m12 * self.m31 - self.m32 * self.m11) / det),
((self.m11 * self.m22 - self.m21 * self.m12) / det) ((self.m11 * self.m22 - self.m21 * self.m12) / det)
) )
} }