logistic-bot/cub3d
1
0
Fork 0
mirror of https://codeberg.org/ACME-Corporation/cub3d.git synced 2025-12-06 01:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added flood fill algorithm finally, to check for holes in map

Browse source
This commit is contained in:
Theo Champion 2025-06-24 10:41:50 +02:00
parent 321ef3db7c
commit f9825feeea
3 changed files with 44 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ressources/bad_maps/wrongmap_hole_map.cub Normal file
View file

@ -0,0 +1,22 @@
NO ./path_to_the_north_texture
SO ./path_to_the_south_texture
WE ./path_to_the_west_texture
EA ./path_to_the_east_texture
F 220,100,0
C 225,30,0
1111111111111111111111111
1000000000110000000000001
1011000001110000000000001
1001000000000000000000001
111111111011000001110000000000001
100 00000011000001110111110111111
11110111111111011100000010001
11110111111111011101010010001
11000000110101011100000010001
10000000000000001100000010001
10000000000000001101010010001
11000001110101011111011110N0111
11110111 1110101 101111010001
11111111 1111111 111111111111

8
src/main.c
View file

@ -6,7 +6,7 @@
/* By: tchampio <tchampio@student.42lehavre. +#+ +:+ +#+ */ /* By: tchampio <tchampio@student.42lehavre. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/05/06 13:16:11 by tchampio #+# #+# */ /* Created: 2025/05/06 13:16:11 by tchampio #+# #+# */
/* Updated: 2025/06/22 00:17:39 by tchampio ### ########.fr */ /* Updated: 2025/06/24 10:40:02 by tchampio ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -85,12 +85,12 @@ void draw_map(t_mapdata *map, t_mlx_data *data)
int j; int j;
i = 0; i = 0;
while (map->map[i]) while (map->mapflood[i])
{ {
j = 0; j = 0;
while (map->map[i][j]) while (map->mapflood[i][j])
{ {
if (map->map[i][j] == '1') if (map->mapflood[i][j] == '1')
draw_2d_wall(map->f_color, data, 10, 10 * j, 10 * i); draw_2d_wall(map->f_color, data, 10, 10 * j, 10 * i);
else if (ft_strchr("NSEW", map->map[i][j])) else if (ft_strchr("NSEW", map->map[i][j]))
draw_2d_wall(0x00FF0000, data, 10, 10 * j, 10 * i); draw_2d_wall(0x00FF0000, data, 10, 10 * j, 10 * i);

19
src/map/map_checker.c
View file

@ -6,7 +6,7 @@
/* By: tchampio <tchampio@student.42lehavre. +#+ +:+ +#+ */ /* By: tchampio <tchampio@student.42lehavre. +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2025/06/06 17:54:42 by tchampio #+# #+# */ /* Created: 2025/06/06 17:54:42 by tchampio #+# #+# */
/* Updated: 2025/06/21 19:40:13 by tchampio ### ########.fr */ /* Updated: 2025/06/24 10:40:30 by tchampio ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -53,6 +53,20 @@ void free_tab_length(char **tab, int length)
free(tab); free(tab);
} }
void flood_fill(t_mapdata *map, int x, int y)
{
if (map->mapflood[y][x] == '1')
return ;
if (map->mapflood[y][x] == ' ' || map->mapflood[y][x] == '\n')
map->isvalid = false;
map->mapflood[y][x] = '1';
flood_fill(map, x + 1, y);
flood_fill(map, x, y + 1);
flood_fill(map, x - 1, y);
flood_fill(map, x, y - 1);
}
bool check_cubfile(char *file, t_mapdata *map) bool check_cubfile(char *file, t_mapdata *map)
{ {
int fd; int fd;
@ -75,5 +89,8 @@ bool check_cubfile(char *file, t_mapdata *map)
if (!check_bare_minimum(map)) if (!check_bare_minimum(map))
return (close(fd), false); return (close(fd), false);
map->isvalid = true; map->isvalid = true;
flood_fill(map, map->startx, map->starty);
if (!map->isvalid)
return (close(fd), ft_strlcpy(map->error, "Map has holes!", 16), false);
return (true); return (true);
} }