FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in matrix transpose() and transpose3x3

Browse Source 
The diagonal elements were not copied from the source matrix.
This commit is contained in:
Tim Moore
2019-11-04 05:37:37 +01:00
committed by Robert Osfield
parent 46e17699b3
commit 5f1e33fcb3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osg/Matrix_implementation.cpp
View File

@@ -747,18 +747,22 @@ bool Matrix_implementation::transpose(const Matrix_implementation&mat){
Matrix_implementation tm(mat);
return transpose(tm);
}
_mat[0][0]=mat._mat[0][0];
_mat[0][1]=mat._mat[1][0];
_mat[0][2]=mat._mat[2][0];
_mat[0][3]=mat._mat[3][0];
_mat[1][0]=mat._mat[0][1];
_mat[1][1]=mat._mat[1][1];
_mat[1][2]=mat._mat[2][1];
_mat[1][3]=mat._mat[3][1];
_mat[2][0]=mat._mat[0][2];
_mat[2][1]=mat._mat[1][2];
_mat[2][2]=mat._mat[2][2];
_mat[2][3]=mat._mat[3][2];
_mat[3][0]=mat._mat[0][3];
_mat[3][1]=mat._mat[1][3];
_mat[3][2]=mat._mat[2][3];
_mat[3][3]=mat._mat[3][3];
return true;
}
@@ -767,12 +771,15 @@ bool Matrix_implementation::transpose3x3(const Matrix_implementation&mat){
Matrix_implementation tm(mat);
return transpose3x3(tm);
}
_mat[0][0]=mat._mat[0][0];
_mat[0][1]=mat._mat[1][0];
_mat[0][2]=mat._mat[2][0];
_mat[1][0]=mat._mat[0][1];
_mat[1][1]=mat._mat[1][1];
_mat[1][2]=mat._mat[2][1];
_mat[2][0]=mat._mat[0][2];
_mat[2][1]=mat._mat[1][2];
_mat[2][2]=mat._mat[2][2];
return true;
}