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

Remove comment and nested unsafe block

Browse source
This commit is contained in:
Brendan Zabarauskas 2012-12-10 11:47:36 +10:00
parent c8f3f1919a
commit 1fbe5203e1
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/mat.rs
View file

@ -1468,7 +1468,7 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
if d.fuzzy_eq(&_0) { if d.fuzzy_eq(&_0) {
None None
} else { } else {
// Gauss Jordan Elimination with partial pivoting // Gauss Jordan Elimination with partial pivoting
// So take this matrix, A, augmented with the identity // So take this matrix, A, augmented with the identity
// and essentially reduce [A|I] // and essentially reduce [A|I]
@ -1476,7 +1476,7 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
let mut A = *self; let mut A = *self;
// let mut I: Mat4<T> = Matrix::identity(); // FIXME: there's something wrong with static functions here! // let mut I: Mat4<T> = Matrix::identity(); // FIXME: there's something wrong with static functions here!
let mut I = Mat4::identity(); let mut I = Mat4::identity();
for uint::range(0, 4) |j| { for uint::range(0, 4) |j| {
// Find largest element in col j // Find largest element in col j
let mut i1 = j; let mut i1 = j;
@ -1486,27 +1486,22 @@ pub impl<T:Copy Float Sign> Mat4<T>: Matrix<T, Vec4<T>> {
} }
} }
// We need to use an unsafe block in order to use these inpure
// functions. This *should* be ok because A and I are never
// exposed to the outside world.
unsafe { unsafe {
// Swap columns i1 and j in A and I to // Swap columns i1 and j in A and I to
// put pivot on diagonal // put pivot on diagonal
A.swap_cols(i1, j); A.swap_cols(i1, j);
I.swap_cols(i1, j); I.swap_cols(i1, j);
// Scale col j to have a unit diagonal // Scale col j to have a unit diagonal
I.col_mut(j).div_self_t(&A[j][j]); I.col_mut(j).div_self_t(&A[j][j]);
A.col_mut(j).div_self_t(&A[j][j]); A.col_mut(j).div_self_t(&A[j][j]);
// Eliminate off-diagonal elems in col j of A, // Eliminate off-diagonal elems in col j of A,
// doing identical ops to I // doing identical ops to I
for uint::range(0, 4) |i| { for uint::range(0, 4) |i| {
if i != j { if i != j {
unsafe { I.col_mut(i).sub_self_v(&I[j].mul_t(A[i][j]));
I.col_mut(i).sub_self_v(&I[j].mul_t(A[i][j])); A.col_mut(i).sub_self_v(&A[j].mul_t(A[i][j]));
A.col_mut(i).sub_self_v(&A[j].mul_t(A[i][j]));
}
} }
} }
} }