Added model center translation

2 files changed, 26 insertions, 16 deletions

diff --git a/vendor/libftm/inc/libftm_vec3.h b/vendor/libftm/inc/libftm_vec3.h
index e9df2c7..c40d6c8 100644
--- a/vendor/libftm/inc/libftm_vec3.h
+++ b/vendor/libftm/inc/libftm_vec3.h
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/05/12 11:02:29 by charles           #+#    #+#             */
-/*   Updated: 2020/05/12 11:04:08 by charles          ###   ########.fr       */
+/*   Updated: 2020/05/13 11:13:12 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,7 +15,16 @@
 
 typedef struct
 {
-	float	v[3];
+	union
+	{
+		float	v[3];
+		struct
+		{
+			float	x;
+			float	y;
+			float	z;
+		};
+	};
 }			t_ftmvec3;
 
 t_ftmvec3	*ftm_vec3init(t_ftmvec3 *vec3, float x, float y, float z);
diff --git a/vendor/libftm/src/mat4/ftm_mat4rotate.c b/vendor/libftm/src/mat4/ftm_mat4rotate.c
index 6d0432e..0d9f32b 100644
--- a/vendor/libftm/src/mat4/ftm_mat4rotate.c
+++ b/vendor/libftm/src/mat4/ftm_mat4rotate.c
@@ -6,7 +6,7 @@
 /*   By: charles <charles.cabergs@gmail.com>        +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/05/12 11:44:18 by charles           #+#    #+#             */
-/*   Updated: 2020/05/12 17:07:23 by charles          ###   ########.fr       */
+/*   Updated: 2020/05/12 19:52:55 by charles          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -41,6 +41,7 @@ t_ftmmat4	*ftm_mat4rotate(t_ftmmat4 *mat4, float theta, t_ftmvec3 *axis)
 	float		z;
 	float		sin_t;
 	float		cos_t;
+	float		m_cos_t;
 	t_ftmmat4	rot;
 
 	x = axis->v[0];
@@ -48,23 +49,23 @@ t_ftmmat4	*ftm_mat4rotate(t_ftmmat4 *mat4, float theta, t_ftmvec3 *axis)
 	z = axis->v[2];
 	sin_t = sinf(theta);
 	cos_t = cosf(theta);
-	ftm_mat4init_fill(&rot, 0.0);
-	ftm_mat4set(&rot, 0, 0, cos_t + x * x * (1 - cos_t));
-	ftm_mat4set(&rot, 1, 0, y * x * (1 - cos_t) + z * sin_t);
-	ftm_mat4set(&rot, 2, 0, z * x * (1 - cos_t) + y * sin_t);
+	m_cos_t = 1.0 - cos_t;
+	ftm_mat4init_eye(&rot, 1.0);
+	ftm_mat4set(&rot, 0, 0, cos_t + x * x * m_cos_t);
+	ftm_mat4set(&rot, 1, 0, y * x * m_cos_t + z * sin_t);
+	ftm_mat4set(&rot, 2, 0, z * x * m_cos_t - y * sin_t);
 	ftm_mat4set(&rot, 3, 0, 0.0);
 
-	ftm_mat4set(&rot, 0, 1, x * y * (1 - cos_t) - z * sin_t);
-	ftm_mat4set(&rot, 1, 1, cos_t + y * y * (1 - cos_t));
-	ftm_mat4set(&rot, 2, 1, z * y * (1 - cos_t) + x * sin_t);
-	ftm_mat4set(&rot, 3, 1, 0);
+	ftm_mat4set(&rot, 0, 1, x * y * m_cos_t - z * sin_t);
+	ftm_mat4set(&rot, 1, 1, cos_t + y * y * m_cos_t);
+	ftm_mat4set(&rot, 2, 1, z * y * m_cos_t + x * sin_t);
+	ftm_mat4set(&rot, 3, 1, 0.0);
 
-	ftm_mat4set(&rot, 0, 2, x * z * (1 - cos_t) + y * sin_t);
-	ftm_mat4set(&rot, 1, 2, y * z * (1 - cos_t) - x * sin_t);
-	ftm_mat4set(&rot, 2, 2, cos_t + z * z * (1 - cos_t));
-	ftm_mat4set(&rot, 3, 2, 0);
+	ftm_mat4set(&rot, 0, 2, x * z * m_cos_t + y * sin_t);
+	ftm_mat4set(&rot, 1, 2, y * z * m_cos_t - x * sin_t);
+	ftm_mat4set(&rot, 2, 2, cos_t + z * z * m_cos_t);
+	ftm_mat4set(&rot, 3, 2, 0.0);
 
-	ftm_mat4set(&rot, 3, 3, 1.0);
 	ftm_mat4mul(mat4, &rot);
 	return (mat4);
 }