42_adjoly/cub3d
1
0
Fork 0
Code

「🏗️」 wip(DDA): Started puting everything together

Browse Source
This commit is contained in:
Adam JOLY
2024-10-07 19:07:28 +02:00
parent c7fd02590a
commit 1b5c1a4d01
6 changed files with 92 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -1,3 +1,15 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Makefile :+: :+: :+: #
# +:+ +:+ +:+ #
# By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/07 16:02:18 by adjoly #+# #+# #
# Updated: 2024/10/07 16:02:44 by adjoly ### ########.fr #
# #
# **************************************************************************** #
SHELL = bash SHELL = bash
NAME = cub3D NAME = cub3D
@ -28,8 +40,8 @@ LIB = libft/libft.a \
$(NAME): $(OBJS) $(NAME): $(OBJS)
@make -sj -C $(LIBFT_DIR) @make -sj -C $(LIBFT_DIR)
@echo "✅ Libft compiled" @echo "✅ Libft compiled"
@make -sj -C $(MACRO_DIR) @#@make -sj -C $(MACRO_DIR)
@echo "✅ MacroLibX compiled" @#@echo "✅ MacroLibX compiled"
@$(CC) $(OBJS) $(LIB) -o $(NAME) $(FLAGS) @$(CC) $(OBJS) $(LIB) -o $(NAME) $(FLAGS)
@echo "✅ Compiled" @echo "✅ Compiled"
@ -41,14 +53,14 @@ all: $(NAME)
clean: clean:
@make -sC $(LIBFT_DIR) clean @make -sC $(LIBFT_DIR) clean
@make -sC $(MACRO_DIR) clean > /dev/null @#@make -sC $(MACRO_DIR) clean > /dev/null
@rm -f $(OBJS) @rm -f $(OBJS)
fclean: clean fclean: clean
@make -sC $(LIBFT_DIR) fclean @make -sC $(LIBFT_DIR) fclean
@echo "🧹 Libft Cleaned" @echo "🧹 Libft Cleaned"
@make -sC $(MACRO_DIR) fclean > /dev/null @#@make -sC $(MACRO_DIR) fclean > /dev/null
@echo "🧹 MacroLibX Cleaned" @#@echo "🧹 MacroLibX Cleaned"
@rm -f $(NAME) @rm -f $(NAME)
@rm -Rf $(OBJSDIR) @rm -Rf $(OBJSDIR)
@echo "🧹 Cleaned" @echo "🧹 Cleaned"

21
includes/game/dda.h
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/04 14:04:10 by adjoly #+# #+# */ /* Created: 2024/10/04 14:04:10 by adjoly #+# #+# */
/* Updated: 2024/10/06 18:48:38 by adjoly ### ########.fr */ /* Updated: 2024/10/07 17:42:00 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -23,4 +23,23 @@
*/ */
void get_ray_angle(t_player *player, t_dda (*dda)[800]); void get_ray_angle(t_player *player, t_dda (*dda)[800]);
/**
* @brief Function used to setup all the dda variable prior to casting
* the rays
*
* @param player The address of the t_player struct
* @param dda The address of the t_dda struct
*
*/
void setup_dda(t_dda (*dda)[800], t_player *player);
/**
* @brief Function used to cast all the rays
*
* @param dda The address of the t_dda struct
* @param map The map as a char **
* @param map_coord The coordinate of the player on the map_grid
*/
void while_dda(t_dda (*dda)[800], char **map, t_coord map_coord);
#endif #endif

37
src/raycasting/dda/dda.c Normal file
View File

@ -0,0 +1,37 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* dda.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* 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 */
/* */
/* ************************************************************************** */
#include "game/dda.h"
#include "game/settings.h"
void dda(t_player *player, char **map)
{
t_dda dda[800];
t_coord map_coord;
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);
}
/**
* 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
*
* print on screen
*
*/

7
src/raycasting/get_ray_angle.c → src/raycasting/dda/get_ray_angle.c
View File

@ -6,11 +6,14 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/29 15:26:29 by adjoly #+# #+# */ /* Created: 2024/09/29 15:26:29 by adjoly #+# #+# */
/* Updated: 2024/10/06 17:58:04 by adjoly ### ########.fr */ /* Updated: 2024/10/07 19:06:47 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "game/game.h" #include "game/dda.h"
#include "game/settings.h"
#include <math.h>
#include <stdint.h>
void get_ray_angle(t_player *player, t_dda (*dda)[800]) void get_ray_angle(t_player *player, t_dda (*dda)[800])
{ {

17
src/raycasting/setup_dda.c → src/raycasting/dda/setup_dda.c
View File

@ -6,11 +6,13 @@
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/30 23:47:14 by adjoly #+# #+# */ /* Created: 2024/09/30 23:47:14 by adjoly #+# #+# */
/* Updated: 2024/10/06 19:02:43 by adjoly ### ########.fr */ /* Updated: 2024/10/07 19:05:59 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "game/game.h" #include "game/settings.h"
#include "game/dda.h"
#include <stdlib.h>
#include <stdbool.h> #include <stdbool.h>
#include <math.h> #include <math.h>
@ -38,21 +40,20 @@ void get_side_dist(t_dda *dda, t_coord incell_coords, t_player *player)
} }
} }
void setup_dda(t_player *player) void setup_dda(t_dda (*dda)[800], t_player *player)
{ {
t_dda dda[WINDOW_X / RAY_SIZE];
size_t i; size_t i;
t_coord incell_coords; t_coord incell_coords;
i = 0; i = 0;
get_ray_angle(player, &dda); get_ray_angle(player, dda);
incell_coords.x = player->coords.x % MAP_CHUNK_SIZE; incell_coords.x = player->coords.x % MAP_CHUNK_SIZE;
incell_coords.y = player->coords.y % MAP_CHUNK_SIZE; incell_coords.y = player->coords.y % MAP_CHUNK_SIZE;
while (i < WINDOW_X / RAY_SIZE) while (i < WINDOW_X / RAY_SIZE)
{ {
dda[i].delta_dist.x = abs((int)(MAP_CHUNK_SIZE / dda[i].ray_dir.x)); dda[i]->delta_dist.x = abs((int)(MAP_CHUNK_SIZE / dda[i]->ray_dir.x));
dda[i].delta_dist.y = abs((int)(MAP_CHUNK_SIZE / dda[i].ray_dir.y)); dda[i]->delta_dist.y = abs((int)(MAP_CHUNK_SIZE / dda[i]->ray_dir.y));
get_side_dist(&dda[i], incell_coords, player); get_side_dist(dda[i], incell_coords, player);
i++; i++;
} }
} }

8
src/raycasting/dda_while.c → src/raycasting/dda/while_dda.c
View File

@ -1,18 +1,18 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* ::: :::::::: */
/* dda_while.c :+: :+: :+: */ /* while_dda.c :+: :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ +:+ +:+ */
/* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/06 18:46:56 by adjoly #+# #+# */ /* Created: 2024/10/06 18:46:56 by adjoly #+# #+# */
/* Updated: 2024/10/06 19:05:11 by adjoly ### ########.fr */ /* Updated: 2024/10/07 17:08:57 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "game/game.h" #include "game/dda.h"
void dda_while(t_dda *dda, char **map, t_coord map_coord) void while_dda(t_dda (*dda)[800], char **map, t_coord map_coord)
{ {
dda->wall_hit = false; dda->wall_hit = false;
while (!dda->wall_hit) while (!dda->wall_hit)