From 5560d4e2737472590f0a0663c4d2f3c18d09aad3 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 23 Mar 2006 11:41:34 +0000 Subject: [PATCH] fixed really stupid bug in Matrix4x4_Normalize - it was transposing the matrix (a legacy of the fact it was based on Invert_Simple) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6172 d7cf8633-e32d-0410-b094-e92efae38249 --- matrixlib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/matrixlib.c b/matrixlib.c index 5433aacc..210adbab 100644 --- a/matrixlib.c +++ b/matrixlib.c @@ -164,15 +164,15 @@ void Matrix4x4_Normalize (matrix4x4_t *out, matrix4x4_t *in1) // note: this is only designed to undo uniform scaling double scale = 1.0 / sqrt(in1->m[0][0] * in1->m[0][0] + in1->m[0][1] * in1->m[0][1] + in1->m[0][2] * in1->m[0][2]); out->m[0][0] = (float)(in1->m[0][0] * scale); - out->m[0][1] = (float)(in1->m[1][0] * scale); - out->m[0][2] = (float)(in1->m[2][0] * scale); + out->m[0][1] = (float)(in1->m[0][1] * scale); + out->m[0][2] = (float)(in1->m[0][2] * scale); out->m[0][3] = (float)(in1->m[0][3]); - out->m[1][0] = (float)(in1->m[0][1] * scale); + out->m[1][0] = (float)(in1->m[1][0] * scale); out->m[1][1] = (float)(in1->m[1][1] * scale); - out->m[1][2] = (float)(in1->m[2][1] * scale); + out->m[1][2] = (float)(in1->m[1][2] * scale); out->m[1][3] = (float)(in1->m[1][3]); - out->m[2][0] = (float)(in1->m[0][2] * scale); - out->m[2][1] = (float)(in1->m[1][2] * scale); + out->m[2][0] = (float)(in1->m[2][0] * scale); + out->m[2][1] = (float)(in1->m[2][1] * scale); out->m[2][2] = (float)(in1->m[2][2] * scale); out->m[2][3] = (float)(in1->m[2][3]); out->m[3][0] = 0; -- 2.39.2