From 02cf47a5fe4faaf0ffd3ea77020ca0256aaaa099 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Tue, 8 Oct 2024 13:59:37 +0200 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=F0=9F=8F=97=EF=B8=8F=E3=80=8D=20wip(D?= =?UTF-8?q?DA):=20Wall=20distance=20got=20:ok=5Fhand:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- includes/game/typedef.h | 17 ++++++++++------- src/raycasting/dda/dda.c | 10 ++++------ src/raycasting/dda/dist_dda.c | 34 ++++++++++++++++++++++++++++++++++ src/raycasting/dda/setup_dda.c | 4 ++-- src/raycasting/dda/while_dda.c | 4 ++-- 5 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 src/raycasting/dda/dist_dda.c diff --git a/includes/game/typedef.h b/includes/game/typedef.h index b0e4435..ef15a02 100644 --- a/includes/game/typedef.h +++ b/includes/game/typedef.h @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/04 14:28:24 by adjoly #+# #+# */ -/* Updated: 2024/10/06 19:03:26 by adjoly ### ########.fr */ +/* Updated: 2024/10/08 13:43:59 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -16,6 +16,15 @@ # include "parsing.h" # include +/** + * @brief Enum for the wall side that has been hit + */ +typedef enum s_wall_side +{ + HORIZONTAL, + VERTICAL +} t_wall_side; + typedef struct s_coord_f { float x; @@ -44,11 +53,6 @@ typedef struct s_cub t_player player; } t_cub; -typedef enum s_wall_side -{ - HORIZONTAL, - VERTICAL -} t_wall_side; typedef struct s_dda { @@ -58,7 +62,6 @@ typedef struct s_dda t_step step; t_wall_side wall_side; bool wall_hit; - } t_dda; #endif diff --git a/src/raycasting/dda/dda.c b/src/raycasting/dda/dda.c index 6683c9f..d826ac4 100644 --- a/src/raycasting/dda/dda.c +++ b/src/raycasting/dda/dda.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/07 16:55:09 by adjoly #+# #+# */ -/* Updated: 2024/10/07 19:04:07 by adjoly ### ########.fr */ +/* Updated: 2024/10/08 13:59:15 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,20 +15,18 @@ void dda(t_player *player, char **map) { - t_dda dda[800]; + t_dda dda[WINDOW_X / RAY_SIZE]; t_coord map_coord; + float *wall_dist; setup_dda(&dda, player); map_coord.x = player->coords.x - player->coords.x % MAP_CHUNK_SIZE; map_coord.y = player->coords.y - player->coords.y % MAP_CHUNK_SIZE; while_dda(&dda, map, map_coord); - + wall_dist = dist_dda(dda); } /** -* calculate distance from wall -* perp_wall_dist = (map_y - player_y + (1 - step_y) / 2) / ray_dir_y -* * calculate size on screen * screen_height / per_wall_dist * diff --git a/src/raycasting/dda/dist_dda.c b/src/raycasting/dda/dist_dda.c new file mode 100644 index 0000000..9127d3e --- /dev/null +++ b/src/raycasting/dda/dist_dda.c @@ -0,0 +1,34 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* dist_dda.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: adjoly +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/10/08 13:26:19 by adjoly #+# #+# */ +/* Updated: 2024/10/08 13:53:27 by adjoly ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "game/dda.h" +#include +#include "game/settings.h" + +float *dist_dda(t_dda dda[WINDOW_X / RAY_SIZE]) +{ + size_t i; + float wall_dist; + + wall_dist = ft_calloc(WINDOW_X / RAY_SIZE, sizeof(float)); + if (!wall_dist) + return (NULL); + while (dda[i]) + { + if (dda[i].wall_side == HORIZONTAL) + wall_dist[i] = dda[i].side_dist.x - dda[i].delta_dist.x; + else + wall_dist[i] = dda[i].side_dist.y - dda[i].delta_dist.y; + i++; + } + return (wall_dist); +} diff --git a/src/raycasting/dda/setup_dda.c b/src/raycasting/dda/setup_dda.c index b9aef2f..458b987 100644 --- a/src/raycasting/dda/setup_dda.c +++ b/src/raycasting/dda/setup_dda.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/30 23:47:14 by adjoly #+# #+# */ -/* Updated: 2024/10/07 19:05:59 by adjoly ### ########.fr */ +/* Updated: 2024/10/08 13:28:24 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,7 +40,7 @@ void get_side_dist(t_dda *dda, t_coord incell_coords, t_player *player) } } -void setup_dda(t_dda (*dda)[800], t_player *player) +void setup_dda(t_dda (*dda)[WINDOW_X / RAY_SIZE], t_player *player) { size_t i; t_coord incell_coords; diff --git a/src/raycasting/dda/while_dda.c b/src/raycasting/dda/while_dda.c index 91896f2..c7bd25a 100644 --- a/src/raycasting/dda/while_dda.c +++ b/src/raycasting/dda/while_dda.c @@ -6,13 +6,13 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/06 18:46:56 by adjoly #+# #+# */ -/* Updated: 2024/10/07 17:08:57 by adjoly ### ########.fr */ +/* Updated: 2024/10/08 13:28:33 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ #include "game/dda.h" -void while_dda(t_dda (*dda)[800], char **map, t_coord map_coord) +void while_dda(t_dda (*dda)[WINDOW_X / RAY_SIZE], char **map, t_coord map_coord) { dda->wall_hit = false; while (!dda->wall_hit)