From b08325fc4a184f9963035eb0df51e3d9aa31037d Mon Sep 17 00:00:00 2001 From: Learn OpenGL ES Date: Thu, 7 Nov 2013 20:47:36 -0500 Subject: Fix bug with invert matrix (was copying one float instead of all floats). --- linmath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linmath.h b/linmath.h index 97f4e17..016102a 100644 --- a/linmath.h +++ b/linmath.h @@ -298,7 +298,7 @@ static inline void mat4x4_invert(mat4x4 T, mat4x4 M) R[3][1] = M[0][0]*(M[2][1]*M[3][2] - M[2][2]*M[3][1]) - M[2][0]*(M[0][1]*M[3][2] - M[0][2]*M[3][1]) - M[3][0]*(M[0][2]*M[2][1] - M[0][1]*M[2][2]); R[3][2] = M[0][0]*(M[1][2]*M[3][1] - M[1][1]*M[3][2]) - M[1][0]*(M[0][2]*M[3][1] - M[0][1]*M[3][2]) - M[3][0]*(M[0][1]*M[1][2] - M[0][2]*M[1][1]); R[3][3] = M[0][0]*(M[1][1]*M[2][2] - M[1][2]*M[2][1]) - M[1][0]*(M[0][1]*M[2][2] - M[0][2]*M[2][1]) - M[2][0]*(M[0][2]*M[1][1] - M[0][1]*M[1][2]); - memcpy(T, R, sizeof(T)); + memcpy(T, R, sizeof(R)); } static inline void mat4x4_frustum(mat4x4 M, float l, float r, float b, float t, float n, float f) { -- cgit v1.2.3-54-g00ecf From 9cf2c119735361daa38728c618e5f7f174e73aa0 Mon Sep 17 00:00:00 2001 From: Learn OpenGL ES Date: Thu, 7 Nov 2013 20:49:27 -0500 Subject: Fix another instance of sizeof ptr instead of array. --- linmath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linmath.h b/linmath.h index 016102a..e5431d6 100644 --- a/linmath.h +++ b/linmath.h @@ -459,7 +459,7 @@ static inline void quat_mul_vec3(vec3 r, quat q, vec3 v) quat_norm(q_, q_); quat_mul(q_, v_, q_); quat_mul(q_, q, q_); - memcpy(r, q_, sizeof(r)); + memcpy(r, q_, sizeof(q_)); } static inline void mat4x4_from_quat(mat4x4 M, quat q) { -- cgit v1.2.3-54-g00ecf From 7ae993be3054935476dc1d997a61b4684d72d6b0 Mon Sep 17 00:00:00 2001 From: Learn OpenGL ES Date: Thu, 7 Nov 2013 21:12:12 -0500 Subject: Fix bug with mat4x4_translate_in_place introduced in 34cd9df850faf0bf6b9182b3500406351ad68ae0 --- linmath.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linmath.h b/linmath.h index e5431d6..1dc2368 100644 --- a/linmath.h +++ b/linmath.h @@ -192,7 +192,7 @@ static inline void mat4x4_translate(mat4x4 T, float x, float y, float z) } static inline void mat4x4_translate_in_place(mat4x4 M, float x, float y, float z) { - vec4 t = {x, y, z, 1}; + vec4 t = {x, y, z, 0}; vec4 r; int i; for (i = 0; i < 4; ++i) { -- cgit v1.2.3-54-g00ecf