X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=matrixlib.c;h=ed9d141341ce7b181dd6a42a49c4d518cff40988;hb=1fc1724d834066e2f69086d218101a2020c6a5b8;hp=2724ce6ad8878e10b2318b3a1ef49da56ce42b94;hpb=264666d8dd5ef7eec1acaafb211d7516e2eadae1;p=xonotic%2Fdarkplaces.git diff --git a/matrixlib.c b/matrixlib.c index 2724ce6a..ed9d1413 100644 --- a/matrixlib.c +++ b/matrixlib.c @@ -1318,34 +1318,34 @@ void Matrix4x4_FromArrayFloatD3D (matrix4x4_t *out, const float in[16]) #endif } -void Matrix4x4_ToArray12FloatGL(const matrix4x4_t *in, float out[12]) +void Matrix4x4_ToArray12FloatGL(const matrix4x4_t *in, float out[4][3]) { #ifdef MATRIX4x4_OPENGLORIENTATION - out[ 0] = in->m[0][0]; - out[ 1] = in->m[0][1]; - out[ 2] = in->m[0][2]; - out[ 3] = in->m[1][0]; - out[ 4] = in->m[1][1]; - out[ 5] = in->m[1][2]; - out[ 6] = in->m[2][0]; - out[ 7] = in->m[2][1]; - out[ 8] = in->m[2][2]; - out[ 9] = in->m[3][0]; - out[10] = in->m[3][1]; - out[11] = in->m[3][2]; + out[0][0] = in->m[0][0]; + out[0][1] = in->m[0][1]; + out[0][2] = in->m[0][2]; + out[1][0] = in->m[1][0]; + out[1][1] = in->m[1][1]; + out[1][2] = in->m[1][2]; + out[2][0] = in->m[2][0]; + out[2][1] = in->m[2][1]; + out[2][2] = in->m[2][2]; + out[3][0] = in->m[3][0]; + out[3][1] = in->m[3][1]; + out[3][2] = in->m[3][2]; #else - out[ 0] = in->m[0][0]; - out[ 1] = in->m[1][0]; - out[ 2] = in->m[2][0]; - out[ 3] = in->m[0][1]; - out[ 4] = in->m[1][1]; - out[ 5] = in->m[2][1]; - out[ 6] = in->m[0][2]; - out[ 7] = in->m[1][2]; - out[ 8] = in->m[2][2]; - out[ 9] = in->m[0][3]; - out[10] = in->m[1][3]; - out[11] = in->m[2][3]; + out[0][0] = in->m[0][0]; + out[0][1] = in->m[1][0]; + out[0][2] = in->m[2][0]; + out[1][0] = in->m[0][1]; + out[1][1] = in->m[1][1]; + out[1][2] = in->m[2][1]; + out[2][0] = in->m[0][2]; + out[2][1] = in->m[1][2]; + out[2][2] = in->m[2][2]; + out[3][0] = in->m[0][3]; + out[3][1] = in->m[1][3]; + out[3][2] = in->m[2][3]; #endif }