From 50896285f039fa85f6009cac03107c2a45310cdd Mon Sep 17 00:00:00 2001
From: Adam JOLY <adjoly@student.42angouleme.fr>
Date: Mon, 11 Nov 2024 13:51:56 +0100
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E2=9C=8F=EF=B8=8F=E3=80=8D=20norm:=20?=
=?UTF-8?q?Normed=20keys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
includes/game/game.h | 4 +++-
src/cub3d.c | 42 +++----------------------------------
src/utils/movement.c | 49 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 55 insertions(+), 40 deletions(-)
create mode 100644 src/utils/movement.c
diff --git a/includes/game/game.h b/includes/game/game.h
index ec4cc62..ef582c1 100644
--- a/includes/game/game.h
+++ b/includes/game/game.h
@@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/11 16:38:40 by adjoly #+# #+# */
-/* Updated: 2024/11/11 13:27:55 by adjoly ### ########.fr */
+/* Updated: 2024/11/11 13:49:39 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@@ -65,6 +65,8 @@ typedef struct s_render
int key_down(int key, void *param);
int key_up(int key, void *param);
int window_event(int event, void *param);
+void move_right_left(t_render *render, bool right);
+void move_for_back(t_render *render, bool forward);
/**
* @brief This function is here to change the direction of the player
diff --git a/src/cub3d.c b/src/cub3d.c
index 49271ba..96c6d66 100644
--- a/src/cub3d.c
+++ b/src/cub3d.c
@@ -6,7 +6,7 @@
/* By: madumerg <madumerg@42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/04 16:58:27 by madumerg #+# #+# */
-/* Updated: 2024/11/11 13:37:32 by adjoly ### ########.fr */
+/* Updated: 2024/11/11 13:49:05 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
@@ -20,43 +20,6 @@
#include <stdlib.h>
#include "utils.h"
-void move_for_back(t_render *render, bool forward)
-{
- if (forward)
- {
- render->player->coord.x += PLAYER_SPEED * \
- cos(render->player->direction);
- render->player->coord.y += PLAYER_SPEED * \
- -sin(render->player->direction);
- }
- else
- {
- render->player->coord.x -= PLAYER_SPEED * \
- cos(render->player->direction);
- render->player->coord.y -= PLAYER_SPEED * \
- -sin(render->player->direction);
- }
-}
-
-void move_right_left(t_render *render, bool right)
-{
- if (right)
- {
- render->player->coord.x += PLAYER_SPEED * \
- sin(render->player->direction);
- render->player->coord.y += PLAYER_SPEED * \
- cos(render->player->direction);
- }
- else
- {
- render->player->coord.x -= PLAYER_SPEED * \
- sin(render->player->direction);
- render->player->coord.y -= PLAYER_SPEED * \
- cos(render->player->direction);
- }
-}
-
-
int loop(void *param)
{
t_render *render;
@@ -97,7 +60,8 @@ void event_hook(t_render *render)
{
mlx_on_event(render->mlx, render->win, MLX_KEYDOWN, key_down, render);
mlx_on_event(render->mlx, render->win, MLX_KEYUP, key_up, render);
- mlx_on_event(render->mlx, render->win, MLX_WINDOW_EVENT, window_event, render);
+ mlx_on_event(render->mlx, render->win, MLX_WINDOW_EVENT, \
+ window_event, render);
}
int main(int ac, char **av)
diff --git a/src/utils/movement.c b/src/utils/movement.c
new file mode 100644
index 0000000..b7a5583
--- /dev/null
+++ b/src/utils/movement.c
@@ -0,0 +1,49 @@
+/* ************************************************************************** */
+/* */
+/* ::: :::::::: */
+/* movement.c :+: :+: :+: */
+/* +:+ +:+ +:+ */
+/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
+/* +#+#+#+#+#+ +#+ */
+/* Created: 2024/11/11 13:48:35 by adjoly #+# #+# */
+/* Updated: 2024/11/11 13:48:44 by adjoly ### ########.fr */
+/* */
+/* ************************************************************************** */
+
+#include "game/game.h"
+
+void move_for_back(t_render *render, bool forward)
+{
+ if (forward)
+ {
+ render->player->coord.x += PLAYER_SPEED * \
+ cos(render->player->direction);
+ render->player->coord.y += PLAYER_SPEED * \
+ -sin(render->player->direction);
+ }
+ else
+ {
+ render->player->coord.x -= PLAYER_SPEED * \
+ cos(render->player->direction);
+ render->player->coord.y -= PLAYER_SPEED * \
+ -sin(render->player->direction);
+ }
+}
+
+void move_right_left(t_render *render, bool right)
+{
+ if (right)
+ {
+ render->player->coord.x += PLAYER_SPEED * \
+ sin(render->player->direction);
+ render->player->coord.y += PLAYER_SPEED * \
+ cos(render->player->direction);
+ }
+ else
+ {
+ render->player->coord.x -= PLAYER_SPEED * \
+ sin(render->player->direction);
+ render->player->coord.y -= PLAYER_SPEED * \
+ cos(render->player->direction);
+ }
+}