From fed4a4c3ab0fc392c6583ce1fc87c9e881619814 Mon Sep 17 00:00:00 2001 From: David M Date: Sun, 25 Jan 2015 21:21:27 +0100 Subject: In-place matrix multiplication In-place matrix multiplication (mat4x4_mul(m1, m1,m2)) and the operations that depends on it (mat4x4_rotate...) do not work. I think that this feature will be appreciated, even if it has a performance cost. --- linmath.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/linmath.h b/linmath.h index f852c00..2cf047d 100644 --- a/linmath.h +++ b/linmath.h @@ -140,12 +140,14 @@ static inline void mat4x4_scale_aniso(mat4x4 M, mat4x4 a, float x, float y, floa } static inline void mat4x4_mul(mat4x4 M, mat4x4 a, mat4x4 b) { + mat4x4 temp; int k, r, c; for(c=0; c<4; ++c) for(r=0; r<4; ++r) { - M[c][r] = 0.f; + temp[c][r] = 0.f; for(k=0; k<4; ++k) - M[c][r] += a[k][r] * b[c][k]; + temp[c][r] += a[k][r] * b[c][k]; } + mat4x4_dup(M, temp); } static inline void mat4x4_mul_vec4(vec4 r, mat4x4 M, vec4 v) { -- cgit v1.2.3