From e36144ba0c3711611486328ff0bbdd9e3ea3486b Mon Sep 17 00:00:00 2001 From: whaffman Date: Wed, 28 May 2025 13:54:30 +0200 Subject: [PATCH] extra invalid maps --- .gitignore | 1 + maps/invalid/double_floor_texture.cub | 13 +++++++++++++ maps/invalid/double_sprite_identifier.cub | 15 +++++++++++++++ maps/invalid/extra_floor_token.cub | 14 ++++++++++++++ maps/invalid/extra_sprite_token.cub | 14 ++++++++++++++ maps/invalid/extra_wall_token.cub | 14 ++++++++++++++ maps/invalid/garbage_config_line.cub | 15 +++++++++++++++ maps/invalid/invalid_sprite_character.cub | 15 +++++++++++++++ maps/invalid/invalid_sprite_identifier_token.cub | 14 ++++++++++++++ maps/invalid/missing_floor_path.cub | 12 ++++++++++++ maps/invalid/missing_sprite_path.cub | 14 ++++++++++++++ maps/invalid/missing_wall_path.cub | 15 +++++++++++++++ maps/invalid/non-existing_floor_texture.cub | 12 ++++++++++++ maps/invalid/non-existing_sprite_texture.cub | 14 ++++++++++++++ maps/invalid/non-existing_texture.cub | 12 ++++++++++++ .../invalid/not_enclosed_map_extra_empty_tile.cub | 12 ++++++++++++ maps/invalid/sprite_outside_wall.cub | 14 ++++++++++++++ maps/invalid/unknown_existing_sprite.cub | 12 ++++++++++++ src/game.c | 2 +- src/main.c | 6 +++--- test.sh | 6 +++--- 21 files changed, 239 insertions(+), 7 deletions(-) create mode 100644 maps/invalid/double_floor_texture.cub create mode 100644 maps/invalid/double_sprite_identifier.cub create mode 100644 maps/invalid/extra_floor_token.cub create mode 100644 maps/invalid/extra_sprite_token.cub create mode 100644 maps/invalid/extra_wall_token.cub create mode 100644 maps/invalid/garbage_config_line.cub create mode 100644 maps/invalid/invalid_sprite_character.cub create mode 100644 maps/invalid/invalid_sprite_identifier_token.cub create mode 100644 maps/invalid/missing_floor_path.cub create mode 100644 maps/invalid/missing_sprite_path.cub create mode 100644 maps/invalid/missing_wall_path.cub create mode 100644 maps/invalid/non-existing_floor_texture.cub create mode 100644 maps/invalid/non-existing_sprite_texture.cub create mode 100644 maps/invalid/non-existing_texture.cub create mode 100644 maps/invalid/not_enclosed_map_extra_empty_tile.cub create mode 100644 maps/invalid/sprite_outside_wall.cub create mode 100644 maps/invalid/unknown_existing_sprite.cub diff --git a/.gitignore b/.gitignore index c36bda2..0cdb84f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ cub3D build/ .cache/ +test.log \ No newline at end of file diff --git a/maps/invalid/double_floor_texture.cub b/maps/invalid/double_floor_texture.cub new file mode 100644 index 0000000..a57c798 --- /dev/null +++ b/maps/invalid/double_floor_texture.cub @@ -0,0 +1,13 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +FT ./assets/tiles2.png +CT ./assets/ceiling64x64.png + +1111111 +1000001 +1N00001 +1111111 \ No newline at end of file diff --git a/maps/invalid/double_sprite_identifier.cub b/maps/invalid/double_sprite_identifier.cub new file mode 100644 index 0000000..65a0cca --- /dev/null +++ b/maps/invalid/double_sprite_identifier.cub @@ -0,0 +1,15 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a ./assets/battery.png +-c a ./assets/battery.png + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/extra_floor_token.cub b/maps/invalid/extra_floor_token.cub new file mode 100644 index 0000000..6517a68 --- /dev/null +++ b/maps/invalid/extra_floor_token.cub @@ -0,0 +1,14 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png a +CT ./assets/ceiling64x64.png + +-c a ./assets/battery.png + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/extra_sprite_token.cub b/maps/invalid/extra_sprite_token.cub new file mode 100644 index 0000000..1c75896 --- /dev/null +++ b/maps/invalid/extra_sprite_token.cub @@ -0,0 +1,14 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a ./assets/battery.png a + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/extra_wall_token.cub b/maps/invalid/extra_wall_token.cub new file mode 100644 index 0000000..29e69b2 --- /dev/null +++ b/maps/invalid/extra_wall_token.cub @@ -0,0 +1,14 @@ +NO ./assets/bricks2.png a +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a ./assets/battery.png + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/garbage_config_line.cub b/maps/invalid/garbage_config_line.cub new file mode 100644 index 0000000..f8710ac --- /dev/null +++ b/maps/invalid/garbage_config_line.cub @@ -0,0 +1,15 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a ./assets/battery.png +-f garbage + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/invalid_sprite_character.cub b/maps/invalid/invalid_sprite_character.cub new file mode 100644 index 0000000..c75798e --- /dev/null +++ b/maps/invalid/invalid_sprite_character.cub @@ -0,0 +1,15 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c A ./assets/battery.png + + +1111111 +1000001 +1N000A1 +1111111 \ No newline at end of file diff --git a/maps/invalid/invalid_sprite_identifier_token.cub b/maps/invalid/invalid_sprite_identifier_token.cub new file mode 100644 index 0000000..66bf774 --- /dev/null +++ b/maps/invalid/invalid_sprite_identifier_token.cub @@ -0,0 +1,14 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c aa ./assets/battery.png + +1111111 +1000001 +1N00001 +1111111 \ No newline at end of file diff --git a/maps/invalid/missing_floor_path.cub b/maps/invalid/missing_floor_path.cub new file mode 100644 index 0000000..aab1737 --- /dev/null +++ b/maps/invalid/missing_floor_path.cub @@ -0,0 +1,12 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT +C 100,100,200 + +1111111 +100W001 +1N00001 +1111111 \ No newline at end of file diff --git a/maps/invalid/missing_sprite_path.cub b/maps/invalid/missing_sprite_path.cub new file mode 100644 index 0000000..a8e6971 --- /dev/null +++ b/maps/invalid/missing_sprite_path.cub @@ -0,0 +1,14 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/missing_wall_path.cub b/maps/invalid/missing_wall_path.cub new file mode 100644 index 0000000..594e1f6 --- /dev/null +++ b/maps/invalid/missing_wall_path.cub @@ -0,0 +1,15 @@ +NO ./assets/bricks2.png +WE +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a ./assets/battery.png + + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/non-existing_floor_texture.cub b/maps/invalid/non-existing_floor_texture.cub new file mode 100644 index 0000000..50aabf4 --- /dev/null +++ b/maps/invalid/non-existing_floor_texture.cub @@ -0,0 +1,12 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./nonexistingtexture.png +CT ./assets/tiles1.png + +1111111 +1000001 +1N00001 +1111111 \ No newline at end of file diff --git a/maps/invalid/non-existing_sprite_texture.cub b/maps/invalid/non-existing_sprite_texture.cub new file mode 100644 index 0000000..d303b07 --- /dev/null +++ b/maps/invalid/non-existing_sprite_texture.cub @@ -0,0 +1,14 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a ./assets/nonexistingtexture.png + +1111111 +1000001 +1N000a1 +1111111 \ No newline at end of file diff --git a/maps/invalid/non-existing_texture.cub b/maps/invalid/non-existing_texture.cub new file mode 100644 index 0000000..6967488 --- /dev/null +++ b/maps/invalid/non-existing_texture.cub @@ -0,0 +1,12 @@ +NO ./nonexistingtexture.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +F 90,30,30 +C 100,100,200 + +1111111 +1000001 +1N00001 +1111111 \ No newline at end of file diff --git a/maps/invalid/not_enclosed_map_extra_empty_tile.cub b/maps/invalid/not_enclosed_map_extra_empty_tile.cub new file mode 100644 index 0000000..0d8d5c6 --- /dev/null +++ b/maps/invalid/not_enclosed_map_extra_empty_tile.cub @@ -0,0 +1,12 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +F 90,30,30 +C 100,100,200 + +1111111 +1000011 +1E00010 +1111111 \ No newline at end of file diff --git a/maps/invalid/sprite_outside_wall.cub b/maps/invalid/sprite_outside_wall.cub new file mode 100644 index 0000000..68cab91 --- /dev/null +++ b/maps/invalid/sprite_outside_wall.cub @@ -0,0 +1,14 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +FT ./assets/tiles1.png +CT ./assets/ceiling64x64.png + +-c a ./assets/battery.png + +1111111 +1000001 +1N00001a +1111111 \ No newline at end of file diff --git a/maps/invalid/unknown_existing_sprite.cub b/maps/invalid/unknown_existing_sprite.cub new file mode 100644 index 0000000..215c5c4 --- /dev/null +++ b/maps/invalid/unknown_existing_sprite.cub @@ -0,0 +1,12 @@ +NO ./assets/bricks2.png +WE ./assets/bricks2.png +SO ./assets/stonewall256.png +EA ./assets/bricksx64.png + +F 90,30,30 +C 100,100,200 + +1111111 +100o001 +1N00001 +1111111 \ No newline at end of file diff --git a/src/game.c b/src/game.c index 93d7fcf..3f1e870 100644 --- a/src/game.c +++ b/src/game.c @@ -6,7 +6,7 @@ /* By: whaffman +#+ */ /* +#+ */ /* Created: 2025/04/15 15:46:08 by qmennen #+# #+# */ -/* Updated: 2025/05/27 15:32:27 by whaffman ######## odam.nl */ +/* Updated: 2025/05/28 11:42:24 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ diff --git a/src/main.c b/src/main.c index 3c53d1d..9a51282 100644 --- a/src/main.c +++ b/src/main.c @@ -6,16 +6,16 @@ /* By: qmennen +#+ */ /* +#+ */ /* Created: 2025/04/15 16:01:29 by qmennen #+# #+# */ -/* Updated: 2025/05/23 14:59:06 by whaffman ######## odam.nl */ +/* Updated: 2025/05/28 11:40:58 by whaffman ######## odam.nl */ /* */ /* ************************************************************************** */ #include "cub3d.h" #include "glad.h" -int main(int argc, char **argv) +int main(int argc, char **argv) { - t_game *game; + t_game *game; errno = 0; game = NULL; diff --git a/test.sh b/test.sh index ff1232e..b9f2c97 100755 --- a/test.sh +++ b/test.sh @@ -14,7 +14,7 @@ LOG_FILE="test.log" # Iterate through all files in the invalid directory for file in "$INVALID_DIR"/*; do test_name=$(basename "$file" | sed -e 's/\..*$//') - echo -e "${bu}Testing $test_name...${reset}" + # echo -e "${bu}Testing $test_name...${reset}" # Run the file with ./cub3D and send SIGINT after 1 second timeout 1 ./cub3D "$file" > /dev/null 2>&1 if [ $? -eq 1 ]; then @@ -26,6 +26,6 @@ for file in "$INVALID_DIR"/*; do echo -e "${rb}KO!${reset} $test_name" echo "KO! $file" >> "$LOG_FILE" fi - echo "----------------------------------------" - echo "" + # echo "----------------------------------------" + # echo "" done \ No newline at end of file