diff --git a/inc/player.h b/inc/player.h index c930b22..8b32cc8 100644 --- a/inc/player.h +++ b/inc/player.h @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* player.h :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/15 18:53:27 by qmennen #+# #+# */ -/* Updated: 2025/05/22 13:57:05 by qmennen ### ########.fr */ +/* :::::::: */ +/* player.h :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/04/15 18:53:27 by qmennen #+# #+# */ +/* Updated: 2025/05/22 18:48:50 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -17,5 +17,6 @@ int player_create(t_game **game); void player_update(t_game *game, double delta_time); +void visit_area(t_game *game); #endif diff --git a/src/main.c b/src/main.c index 9371c91..c683b84 100644 --- a/src/main.c +++ b/src/main.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* main.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ -/* Updated: 2025/05/22 17:29:23 by qmennen ### ########.fr */ +/* :::::::: */ +/* main.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ +/* Updated: 2025/05/22 18:46:08 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -16,7 +16,7 @@ int main(int argc, char **argv) { t_game *game; - + errno = 0; game = NULL; if (!valid_arguments(argc, argv)) diff --git a/src/map/map_create.c b/src/map/map_create.c index 3a4995a..1724649 100644 --- a/src/map/map_create.c +++ b/src/map/map_create.c @@ -1,12 +1,12 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* map_create.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/04/23 12:21:13 by whaffman #+# #+# */ -/* Updated: 2025/05/22 14:16:54 by qmennen ### ########.fr */ +/* :::::::: */ +/* map_create.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/04/23 12:21:13 by whaffman #+# #+# */ +/* Updated: 2025/05/22 18:45:53 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -54,7 +54,6 @@ static int map_validate_and_finalize(t_game **game, t_tile **grid) } grid_free((*game)->map->grid, (*game)->map->height); (*game)->map->grid = grid; - //print_config((*game)->map); return (SUCCESS); } diff --git a/src/render/dda.c b/src/render/dda.c index 8135bbc..510fecf 100644 --- a/src/render/dda.c +++ b/src/render/dda.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/05/02 11:58:09 by whaffman #+# #+# */ -/* Updated: 2025/05/14 19:26:07 by whaffman ######## odam.nl */ +/* Updated: 2025/05/22 18:50:43 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ @@ -72,6 +72,8 @@ int dda_main(t_vec2 ray_dir, t_vec2_int map_pos, t_vec2 *side_dist, t_map *map) || map_pos.y < 0 || map_pos.y >= map->height) printf("Out of bounds: %d %d\n", map_pos.x, map_pos.y); + if (map->grid[map_pos.y][map_pos.x] == TILE_EMPTY) + map->grid[map_pos.y][map_pos.x] = TILE_VISITED; hit = (map->grid[map_pos.y][map_pos.x] == TILE_WALL); } return (side); diff --git a/src/shader/shaders.c b/src/shader/shaders.c index 1a4573a..7d775f4 100644 --- a/src/shader/shaders.c +++ b/src/shader/shaders.c @@ -1,22 +1,22 @@ /* ************************************************************************** */ /* */ -/* ::: :::::::: */ -/* shaders.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: qmennen +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2025/05/08 18:27:59 by qmennen #+# #+# */ -/* Updated: 2025/05/22 16:32:21 by qmennen ### ########.fr */ +/* :::::::: */ +/* shaders.c :+: :+: */ +/* +:+ */ +/* By: qmennen +#+ */ +/* +#+ */ +/* Created: 2025/05/08 18:27:59 by qmennen #+# #+# */ +/* Updated: 2025/05/22 18:45:29 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ -# include "cub3d.h" -# include "glad.h" +#include "cub3d.h" +#include "glad.h" -extern char *vert_shader; -extern char *frag_shader; +extern char *vert_shader; +extern char *frag_shader; -char *read_shader(int type) +char *read_shader(int type) { char *shader; char *target; @@ -53,4 +53,4 @@ int shader_init(t_game **game) if (!frag_shader) return (FAILURE); return (SUCCESS); -} \ No newline at end of file +}