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

testing

Browse Source
This commit is contained in:
Quinten Mennen 2025-06-04 19:41:29 +02:00
parent ff649d01cc
commit 505bd42bb3
9 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -6,12 +6,12 @@
# By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ # # By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/15 11:48:46 by whaffman #+# #+# # # Created: 2024/10/15 11:48:46 by whaffman #+# #+# #
# Updated: 2025/06/04 18:16:27 by qmennen ### ########.fr # # Updated: 2025/06/04 18:59:44 by qmennen ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
NAME = cub3D NAME = cub3D
-include flags.mk FLAGS = ""
DIST_PATH = dist DIST_PATH = dist
SRC_PATH = src SRC_PATH = src

6
inc/cub3d.h
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/15 12:22:29 by qmennen #+# #+# */ /* Created: 2025/04/15 12:22:29 by qmennen #+# #+# */
/* Updated: 2025/06/03 22:09:53 by qmennen ### ########.fr */ /* Updated: 2025/06/04 18:54:18 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -24,6 +24,10 @@
# define FULLSCREEN 1 # define FULLSCREEN 1
#endif #endif
#ifndef START_STATE
# define START_STATE GAME_STATE_MENU
#endif
# ifndef M_PI # ifndef M_PI
# define M_PI 3.14159265358979323846 # define M_PI 3.14159265358979323846
# endif # endif

4
inc/game_manager.h
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/27 13:40:20 by qmennen #+# #+# */ /* Created: 2025/05/27 13:40:20 by qmennen #+# #+# */
/* Updated: 2025/05/27 18:34:07 by qmennen ### ########.fr */ /* Updated: 2025/06/04 18:52:58 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -15,7 +15,7 @@
# include "cub3d.h" # include "cub3d.h"
t_game_manager *game_manager_create(t_game *game); t_game_manager *game_manager_create(t_game *game, int state);
void game_manager_display(t_game_manager *manager); void game_manager_display(t_game_manager *manager);
void game_manager_update(void *param); void game_manager_update(void *param);
void game_manager_select(t_game_manager *manager); void game_manager_select(t_game_manager *manager);

12
maps/invalid/door_no_sprite.cub Normal file
View File

@ -0,0 +1,12 @@
NO ./assets/bricks2.png
WE ./assets/bricks2.png
SO ./assets/stonewall256.png
EA ./assets/bricksx64.png
F 30,130,130
C 100,100,200
1111111
10D0001
1N00001
1111111

3
src/game/player.c
View File

@ -6,7 +6,7 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/04/15 18:53:19 by qmennen #+# #+# */ /* Created: 2025/04/15 18:53:19 by qmennen #+# #+# */
/* Updated: 2025/06/04 18:42:13 by qmennen ### ########.fr */ /* Updated: 2025/06/04 18:49:17 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -34,7 +34,6 @@ void interact_door(t_game *game)
t_vec2_int pos; t_vec2_int pos;
pos = vec2_to_int(add(game->player->pos, game->player->dir)); pos = vec2_to_int(add(game->player->pos, game->player->dir));
printf("Tile to flash: (%d, %d), type %d\n", pos.x, pos.y, game->map->grid[pos.y][pos.x]);
if (game->map->grid[pos.y][pos.x] == TILE_DOOR) if (game->map->grid[pos.y][pos.x] == TILE_DOOR)
{ {
game->map->grid[pos.y][pos.x] = TILE_EMPTY; game->map->grid[pos.y][pos.x] = TILE_EMPTY;

14
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/06/04 17:08:16 by whaffman ######## odam.nl */ /* Updated: 2025/06/04 18:53:54 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -27,7 +27,7 @@ int main(int argc, char **argv)
game_free(game); game_free(game);
return (EXIT_FAILURE); return (EXIT_FAILURE);
} }
manager = game_manager_create(game); manager = game_manager_create(game, START_STATE);
manager->menu = create_main_menu(manager); manager->menu = create_main_menu(manager);
manager->end_screen = create_end_screen(manager); manager->end_screen = create_end_screen(manager);
manager->active_menu = &manager->menu; manager->active_menu = &manager->menu;

6
src/manager/game_manager.c
View File

@ -6,13 +6,13 @@
/* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */ /* By: qmennen <qmennen@student.codam.nl> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/27 13:48:18 by qmennen #+# #+# */ /* Created: 2025/05/27 13:48:18 by qmennen #+# #+# */
/* Updated: 2025/06/03 20:49:50 by qmennen ### ########.fr */ /* Updated: 2025/06/04 18:52:53 by qmennen ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "game_manager.h" #include "game_manager.h"
t_game_manager *game_manager_create(t_game *game) t_game_manager *game_manager_create(t_game *game, int state)
{ {
t_game_manager *manager; t_game_manager *manager;
@ -21,7 +21,7 @@ t_game_manager *game_manager_create(t_game *game)
return (NULL); return (NULL);
manager->game = game; manager->game = game;
manager->menu = NULL; manager->menu = NULL;
manager->state = GAME_STATE_MENU; manager->state = state;
game->manager = manager; game->manager = manager;
return (manager); return (manager);
} }

3
test.cub
View File

@ -6,7 +6,6 @@ WE ./assets/bricks2.png
SO ./assets/stonewall256.png SO ./assets/stonewall256.png
EA ./assets/bricksx64.png EA ./assets/bricksx64.png
D ./assets/door.png
F 90,30,30 F 90,30,30
@ -21,7 +20,7 @@ CT ./assets/ceiling64x64.png
-s p ./assets/plant.png -s p ./assets/plant.png
-s m ./assets/broken_mirror.png -s m ./assets/broken_mirror.png
-s t ./assets/test.png -s t ./assets/test.png
-s e ./assets/flying_eye.png -e e ./assets/flying_eye.png
1111111 111 1111 111111 1111111111 111111 1111111 111 1111 111111 1111111111 111111
1000001110111001 100001 1000000001 10001 1000001110111001 100001 1000000001 10001

3
test.sh
View File

@ -11,6 +11,9 @@ LOG_FILE="test.log"
# Overwrite the log file # Overwrite the log file
> "$LOG_FILE" > "$LOG_FILE"
make fclean
make FLAGS+= FLAGS+=" -D START_STATE=GAME_STATE_PLAYING"
# Iterate through all files in the invalid directory # Iterate through all files in the invalid directory
for file in "$INVALID_DIR"/*; do for file in "$INVALID_DIR"/*; do
test_name=$(basename "$file" | sed -e 's/\..*$//') test_name=$(basename "$file" | sed -e 's/\..*$//')