willem/cub3d
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

visted view

Browse Source
This commit is contained in:
whaffman 2025-05-22 18:53:23 +02:00
parent 5a17615729
commit 3faa63104d
5 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
inc/player.h
View File

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* player.h :+: :+: :+: */ /* player.h :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2025/04/15 18:53:27 by qmennen #+# #+# */ /* Created: 2025/04/15 18:53:27 by qmennen #+# #+# */
/* Updated: 2025/05/22 13:57:05 by qmennen ### ########.fr */ /* Updated: 2025/05/22 18:48:50 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -17,5 +17,6 @@
int player_create(t_game **game); int player_create(t_game **game);
void player_update(t_game *game, double delta_time); void player_update(t_game *game, double delta_time);
void visit_area(t_game *game);
#endif #endif

16
src/main.c
View File

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* main.c :+: :+: :+: */ /* main.c :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ /* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */
/* Updated: 2025/05/22 17:29:23 by qmennen ### ########.fr */ /* Updated: 2025/05/22 18:46:08 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -16,7 +16,7 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
t_game *game; t_game *game;
errno = 0; errno = 0;
game = NULL; game = NULL;
if (!valid_arguments(argc, argv)) if (!valid_arguments(argc, argv))

15
src/map/map_create.c
View File

@ -1,12 +1,12 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* map_create.c :+: :+: :+: */ /* map_create.c :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2025/04/23 12:21:13 by whaffman #+# #+# */ /* Created: 2025/04/23 12:21:13 by whaffman #+# #+# */
/* Updated: 2025/05/22 14:16:54 by qmennen ### ########.fr */ /* 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); grid_free((*game)->map->grid, (*game)->map->height);
(*game)->map->grid = grid; (*game)->map->grid = grid;
//print_config((*game)->map);
return (SUCCESS); return (SUCCESS);
} }

4
src/render/dda.c
View File

@ -6,7 +6,7 @@
/* By: whaffman <whaffman@student.codam.nl> +#+ */ /* By: whaffman <whaffman@student.codam.nl> +#+ */
/* +#+ */ /* +#+ */
/* Created: 2025/05/02 11:58:09 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 < 0
|| map_pos.y >= map->height) || map_pos.y >= map->height)
printf("Out of bounds: %d %d\n", map_pos.x, map_pos.y); 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); hit = (map->grid[map_pos.y][map_pos.x] == TILE_WALL);
} }
return (side); return (side);

26
src/shader/shaders.c
View File

@ -1,22 +1,22 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* */ /* */
/* ::: :::::::: */ /* :::::::: */
/* shaders.c :+: :+: :+: */ /* shaders.c :+: :+: */
/* +:+ +:+ +:+ */ /* +:+ */
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+ */
/* Created: 2025/05/08 18:27:59 by qmennen #+# #+# */ /* Created: 2025/05/08 18:27:59 by qmennen #+# #+# */
/* Updated: 2025/05/22 16:32:21 by qmennen ### ########.fr */ /* Updated: 2025/05/22 18:45:29 by whaffman ######## odam.nl */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
# include "cub3d.h" #include "cub3d.h"
# include "glad.h" #include "glad.h"
extern char *vert_shader; extern char *vert_shader;
extern char *frag_shader; extern char *frag_shader;
char *read_shader(int type) char *read_shader(int type)
{ {
char *shader; char *shader;
char *target; char *target;
@ -53,4 +53,4 @@ int shader_init(t_game **game)
if (!frag_shader) if (!frag_shader)
return (FAILURE); return (FAILURE);
return (SUCCESS); return (SUCCESS);
} }