diff --git a/include/cglm-affine-mat.h b/include/cglm-affine-mat.h index c30a086..98f92db 100644 --- a/include/cglm-affine-mat.h +++ b/include/cglm-affine-mat.h @@ -24,20 +24,15 @@ glm_mul(mat4 m1, mat4 m2, mat4 dest) { #elif defined( __SSE__ ) || defined( __SSE2__ ) glm_mul_sse2(m1, m2, dest); #else - float a00, a01, a02, a03, b00, b01, b02, - a10, a11, a12, a13, b10, b11, b12, - a20, a21, a22, a23, b20, b21, b22, - a30, a31, a32, a33, b30, b31, b32, b33; + float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], a03 = m1[0][3], + a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], a13 = m1[1][3], + a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2], a23 = m1[2][3], + a30 = m1[3][0], a31 = m1[3][1], a32 = m1[3][2], a33 = m1[3][3], - a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], a03 = m1[0][3], - a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], a13 = m1[1][3], - a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2], a23 = m1[2][3], - a30 = m1[3][0], a31 = m1[3][1], a32 = m1[3][2], a33 = m1[3][3]; - - b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], - b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], - b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2], - b30 = m2[3][0], b31 = m2[3][1], b32 = m2[3][2], b33 = m2[3][3]; + b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], + b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], + b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2], + b30 = m2[3][0], b31 = m2[3][1], b32 = m2[3][2], b33 = m2[3][3]; dest[0][0] = a00 * b00 + a10 * b01 + a20 * b02; dest[0][1] = a01 * b00 + a11 * b01 + a21 * b02; diff --git a/include/cglm-mat.h b/include/cglm-mat.h index 87644ef..536cbd0 100644 --- a/include/cglm-mat.h +++ b/include/cglm-mat.h @@ -185,20 +185,15 @@ glm_mat4_mul(mat4 m1, mat4 m2, mat4 dest) { #elif defined( __SSE__ ) || defined( __SSE2__ ) glm_mat4_mul_sse2(m1, m2, dest); #else - float a00, a01, a02, a03, b00, b01, b02, b03, - a10, a11, a12, a13, b10, b11, b12, b13, - a20, a21, a22, a23, b20, b21, b22, b23, - a30, a31, a32, a33, b30, b31, b32, b33; + float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], a03 = m1[0][3], + a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], a13 = m1[1][3], + a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2], a23 = m1[2][3], + a30 = m1[3][0], a31 = m1[3][1], a32 = m1[3][2], a33 = m1[3][3], - a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], a03 = m1[0][3], - a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], a13 = m1[1][3], - a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2], a23 = m1[2][3], - a30 = m1[3][0], a31 = m1[3][1], a32 = m1[3][2], a33 = m1[3][3]; - - b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], b03 = m2[0][3], - b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], b13 = m2[1][3], - b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2], b23 = m2[2][3], - b30 = m2[3][0], b31 = m2[3][1], b32 = m2[3][2], b33 = m2[3][3]; + b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], b03 = m2[0][3], + b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], b13 = m2[1][3], + b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2], b23 = m2[2][3], + b30 = m2[3][0], b31 = m2[3][1], b32 = m2[3][2], b33 = m2[3][3]; dest[0][0] = a00 * b00 + a10 * b01 + a20 * b02 + a30 * b03; dest[0][1] = a01 * b00 + a11 * b01 + a21 * b02 + a31 * b03; @@ -388,15 +383,10 @@ glm_mat4_det(mat4 mat) { #else /* [square] det(A) = det(At) */ float t[6]; - float a, b, c, d, - e, f, g, h, - i, j, k, l, - m, n, o, p; - - a = mat[0][0], b = mat[0][1], c = mat[0][2], d = mat[0][3], - e = mat[1][0], f = mat[1][1], g = mat[1][2], h = mat[1][3], - i = mat[2][0], j = mat[2][1], k = mat[2][2], l = mat[2][3], - m = mat[3][0], n = mat[3][1], o = mat[3][2], p = mat[3][3]; + float a = mat[0][0], b = mat[0][1], c = mat[0][2], d = mat[0][3], + e = mat[1][0], f = mat[1][1], g = mat[1][2], h = mat[1][3], + i = mat[2][0], j = mat[2][1], k = mat[2][2], l = mat[2][3], + m = mat[3][0], n = mat[3][1], o = mat[3][2], p = mat[3][3]; t[0] = k * p - o * l; t[1] = j * p - n * l; @@ -430,15 +420,10 @@ glm_mat4_inv(mat4 mat, mat4 dest) { #else float t[6]; float det; - float a, b, c, d, - e, f, g, h, - i, j, k, l, - m, n, o, p; - - a = mat[0][0], b = mat[0][1], c = mat[0][2], d = mat[0][3], - e = mat[1][0], f = mat[1][1], g = mat[1][2], h = mat[1][3], - i = mat[2][0], j = mat[2][1], k = mat[2][2], l = mat[2][3], - m = mat[3][0], n = mat[3][1], o = mat[3][2], p = mat[3][3]; + float a = mat[0][0], b = mat[0][1], c = mat[0][2], d = mat[0][3], + e = mat[1][0], f = mat[1][1], g = mat[1][2], h = mat[1][3], + i = mat[2][0], j = mat[2][1], k = mat[2][2], l = mat[2][3], + m = mat[3][0], n = mat[3][1], o = mat[3][2], p = mat[3][3]; t[0] = k * p - o * l; t[1] = j * p - n * l; t[2] = j * o - n * k; t[3] = i * p - m * l; t[4] = i * o - m * k; t[5] = i * n - m * j; diff --git a/include/cglm-mat3.h b/include/cglm-mat3.h index cf8275a..528ea81 100644 --- a/include/cglm-mat3.h +++ b/include/cglm-mat3.h @@ -79,17 +79,13 @@ glm_mat3_mul(mat3 m1, mat3 m2, mat3 dest) { #if defined( __SSE__ ) || defined( __SSE2__ ) glm_mat3_mul_sse2(m1, m2, dest); #else - float a00, a01, a02, b00, b01, b02, - a10, a11, a12, b10, b11, b12, - a20, a21, a22, b20, b21, b22; + float a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], + a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], + a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2], - a00 = m1[0][0], a01 = m1[0][1], a02 = m1[0][2], - a10 = m1[1][0], a11 = m1[1][1], a12 = m1[1][2], - a20 = m1[2][0], a21 = m1[2][1], a22 = m1[2][2], - - b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], - b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], - b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2], + b00 = m2[0][0], b01 = m2[0][1], b02 = m2[0][2], + b10 = m2[1][0], b11 = m2[1][1], b12 = m2[1][2], + b20 = m2[2][0], b21 = m2[2][1], b22 = m2[2][2], dest[0][0] = a00 * b00 + a10 * b01 + a20 * b02; dest[0][1] = a01 * b00 + a11 * b01 + a21 * b02; @@ -191,13 +187,9 @@ glm_mat3_scale(mat3 m, float s) { CGLM_INLINE float glm_mat3_det(mat3 mat) { - float a, b, c, - d, e, f, - g, h, i; - - a = mat[0][0], b = mat[0][1], c = mat[0][2], - d = mat[1][0], e = mat[1][1], f = mat[1][2], - g = mat[2][0], h = mat[2][1], i = mat[2][2]; + float a = mat[0][0], b = mat[0][1], c = mat[0][2], + d = mat[1][0], e = mat[1][1], f = mat[1][2], + g = mat[2][0], h = mat[2][1], i = mat[2][2]; return a * (e * i - h * f) - d * (b * i - c * h) + g * (b * f - c * e); } @@ -212,13 +204,9 @@ CGLM_INLINE void glm_mat3_inv(mat3 mat, mat3 dest) { float det; - float a, b, c, - d, e, f, - g, h, i; - - a = mat[0][0], b = mat[0][1], c = mat[0][2], - d = mat[1][0], e = mat[1][1], f = mat[1][2], - g = mat[2][0], h = mat[2][1], i = mat[2][2]; + float a = mat[0][0], b = mat[0][1], c = mat[0][2], + d = mat[1][0], e = mat[1][1], f = mat[1][2], + g = mat[2][0], h = mat[2][1], i = mat[2][2]; dest[0][0] = e * i - f * h; dest[0][1] = -(b * i - h * c);