42_adjoly/cub3d
1
0
Fork 0
Code

「🏗️」 wip(DDA): Wall distance got 👌

Browse Source
This commit is contained in:
Adam JOLY
2024-10-08 13:59:37 +02:00
parent 1b5c1a4d01
commit 02cf47a5fe
5 changed files with 52 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
includes/game/typedef.h
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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 <stdbool.h>
/**
* @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

10
src/raycasting/dda/dda.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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
*

34
src/raycasting/dda/dist_dda.c Normal file
View File

@ -0,0 +1,34 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* dist_dda.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/08 13:26:19 by adjoly #+# #+# */
/* Updated: 2024/10/08 13:53:27 by adjoly ### ########.fr */
/* */
/* ************************************************************************** */
#include "game/dda.h"
#include <stddef.h>
#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);
}

4
src/raycasting/dda/setup_dda.c
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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;

4
src/raycasting/dda/while_dda.c
View File

@ -6,13 +6,13 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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)