ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-24 02:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:TTimo/GtkRadiant

Browse source
This commit is contained in:
TTimo 2017-01-01 09:08:45 -06:00
commit 1d0feb0a4a
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/mathlib/m4x4.c
View file

@ -702,27 +702,31 @@ void m4_submat( m4x4_t mr, m3x3_t mb, int i, int j ){
idst = 0; idst = 0;
for ( ti = 0; ti < 4; ti++ ) for ( ti = 0; ti < 4; ti++ )
{ {
if ( ti == i ) {
continue;
}
if ( ti < i ) { if ( ti < i ) {
idst = ti; idst = ti;
} }
else else
if ( ti > i ) { {
idst = ti - 1; idst = ti - 1;
} }
for ( tj = 0; tj < 4; tj++ ) for ( tj = 0; tj < 4; tj++ )
{ {
if ( tj == j ) {
continue;
}
if ( tj < j ) { if ( tj < j ) {
jdst = tj; jdst = tj;
} }
else else
if ( tj > j ) { {
jdst = tj - 1; jdst = tj - 1;
} }
if ( ti != i && tj != j ) { mb[idst * 3 + jdst] = mr[ti * 4 + tj ];
mb[idst * 3 + jdst] = mr[ti * 4 + tj ];
}
} }
} }
} }

6
libs/splines/math_matrix.h
View file

@ -84,7 +84,11 @@ ID_INLINE mat3_t::mat3_t() {
} }
ID_INLINE mat3_t::mat3_t( float src[ 3 ][ 3 ] ) { ID_INLINE mat3_t::mat3_t( float src[ 3 ][ 3 ] ) {
memcpy( mat, src, sizeof( src ) ); for( unsigned int i = 0; i < 3; i++ ) {
mat[i].x = src[i][0];
mat[i].y = src[i][1];
mat[i].z = src[i][2];
}
} }
ID_INLINE mat3_t::mat3_t( idVec3 const &x, idVec3 const &y, idVec3 const &z ) { ID_INLINE mat3_t::mat3_t( idVec3 const &x, idVec3 const &y, idVec3 const &z ) {