rparodi/Cub3D
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: fix hole detection, fix norme mlx_struct.h + load_texture.c + error.c

Browse source
This commit is contained in:
Baptiste Goulard coderc de lacam 2024-12-20 15:04:48 +01:00
parent 6b11930534
commit c120ee5a5f
9 changed files with 17 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

61
parsing/blank_for_raph.c
View file

@ -1,61 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* blank_for_raph.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/13 06:44:42 by bgoulard #+# #+# */
/* Updated: 2024/12/01 18:51:20 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "cub3d_struct.h"
#include "ft_string.h"
#include <stdlib.h>
static t_tile char_to_tile(char c)
{
t_tile tile;
ft_bzero(&tile, sizeof(t_tile));
if (c == '1' || c == ' ')
return ((tile.tile_type = WALL, tile));
return ((tile.tile_type = EMPTY, tile));
}
/// @brief Createsa a blank map for rapahael to test the raycasting
/// @param info The structure containing the information about the game
/// @return void
/// @note based on map:
/// 11111
/// 10001
/// 10S01
/// 10001
/// 10111
/// 111
/// @note The blank does not fill in the textures.
void blank(t_info *info)
{
int i;
i = 0;
info->map.size.x = 5;
info->map.size.y = 6;
info->map.fraw = malloc(sizeof(char *) * 6);
info->map.fraw[0] = ft_strdup("11111");
info->map.fraw[1] = ft_strdup("10001");
info->map.fraw[2] = ft_strdup("10S01");
info->map.fraw[3] = ft_strdup("10001");
info->map.fraw[4] = ft_strdup("10111");
info->map.fraw[5] = ft_strdup("11111");
info->map.map = ft_calloc(sizeof(t_tile), \
(info->map.size.y * info->map.size.x));
while (i < info->map.size.y * info->map.size.x)
{
info->map.map[i] = char_to_tile (\
info->map.fraw[i / info->map.size.x][i % info->map.size.x]);
i++;
}
}

4
parsing/load_textures.c
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/01 17:46:52 by bgoulard #+# #+# */
/* Updated: 2024/12/20 13:24:17 by bgoulard ### ########.fr */
/* Updated: 2024/12/20 14:47:18 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -20,7 +20,7 @@
#include <stdbool.h>
#include <stdio.h>
static bool no_leaks(t_info *inf, t_texture *texture, enum e_error error)
static bool no_leaks(t_info *inf, t_texture *texture, enum e_error error)
{
if (texture->img != NULL)
mlx_destroy_image(inf->mlx_ptr, texture->img);

4
parsing/load_tiles.c
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/01 17:47:15 by bgoulard #+# #+# */
/* Updated: 2024/12/19 22:32:16 by bgoulard ### ########.fr */
/* Updated: 2024/12/20 14:46:40 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -47,7 +47,7 @@ int str_to_tile(const char *str, t_tile *tile, size_t size)
i++;
}
while (i < size)
tile[i++].tile_type = WALL;
tile[i++].tile_type = NONE;
return (0);
}

4
parsing/traverse_map.c
View file

@ -6,7 +6,7 @@
/* By: bgoulard <bgoulard@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/01 17:49:12 by bgoulard #+# #+# */
/* Updated: 2024/12/16 09:45:25 by bgoulard ### ########.fr */
/* Updated: 2024/12/20 14:49:43 by bgoulard ### ########.fr */
/* */
/* ************************************************************************** */
@ -33,6 +33,8 @@ bool flood_fill(t_tile *tiles, t_ipoint pos, t_ipoint maxs)
current = c3_get_cell(tiles, maxs, pos);
if (current->tile_visited == true || current->tile_type == WALL)
return (true);
if (current->tile_type == NONE)
return (false);
current->tile_visited = true;
i = 0;
while (i != (sizeof(to_check) / sizeof(to_check[0])))