From 646a95451deab54c6ea15cf431d372d07a9e9df6 Mon Sep 17 00:00:00 2001 From: Raphael Date: Wed, 20 Nov 2024 15:30:26 +0100 Subject: [PATCH] feat: adding the loading of texture --- includes/cub3d.h | 4 +++- includes/cub3d_struct.h | 4 ++-- includes/mlx_structs.h | 2 +- mlx_layer/mlx_load_texture.c | 42 ++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 mlx_layer/mlx_load_texture.c diff --git a/includes/cub3d.h b/includes/cub3d.h index fb034ff..b07c25c 100644 --- a/includes/cub3d.h +++ b/includes/cub3d.h @@ -6,7 +6,7 @@ /* By: rparodi +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/30 16:30:26 by rparodi #+# #+# */ -/* Updated: 2024/11/13 06:56:05 by bgoulard ### ########.fr */ +/* Updated: 2024/11/20 13:55:10 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -18,6 +18,8 @@ # define BONUS 0 # endif +# define TILES_SIZE 64 + # include /// @brief Createsa a blank map for rapahael to test the raycasting diff --git a/includes/cub3d_struct.h b/includes/cub3d_struct.h index 0e4e659..8516dd2 100644 --- a/includes/cub3d_struct.h +++ b/includes/cub3d_struct.h @@ -6,7 +6,7 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/11/08 23:55:29 by bgoulard #+# #+# */ -/* Updated: 2024/11/12 15:03:39 by rparodi ### ########.fr */ +/* Updated: 2024/11/20 15:13:28 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ @@ -64,7 +64,7 @@ typedef struct s_map t_ipoint size; t_tile *map; char **fraw; - t_img texture[4]; + t_img *texture[4]; t_color bg_colors[2]; } t_map; diff --git a/includes/mlx_structs.h b/includes/mlx_structs.h index 4a3b522..56abc25 100644 --- a/includes/mlx_structs.h +++ b/includes/mlx_structs.h @@ -6,7 +6,7 @@ /* By: bgoulard +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/11/10 05:33:08 by bgoulard #+# #+# */ -/* Updated: 2024/11/11 21:45:35 by bgoulard ### ########.fr */ +/* Updated: 2024/11/20 15:13:32 by rparodi ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/mlx_layer/mlx_load_texture.c b/mlx_layer/mlx_load_texture.c new file mode 100644 index 0000000..72d5bd0 --- /dev/null +++ b/mlx_layer/mlx_load_texture.c @@ -0,0 +1,42 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* mlx_load_texture.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: rparodi +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2024/11/20 12:25:45 by rparodi #+# #+# */ +/* Updated: 2024/11/20 15:20:23 by rparodi ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "cub3d.h" +#include "mlx_functions.h" + +t_img *mlx_load_image(t_info *info, char *path) +{ + t_img *image; + int size; + + size = TILES_SIZE; + image = mlx_xpm_file_to_image(info->mlx_ptr, path, &size, &size); + if (!image) + return (NULL); + return (image); +} + +bool mlx_load_all_textures(t_info *info) +{ + size_t i; + + i = 0; + info->map.texture[0] = mlx_load_image(info, "../textures/a.xpm"); + info->map.texture[1] = mlx_load_image(info, "../textures/b.xpm"); + while (i < 4) + { + if (!info->map.texture[i]) + return (false); + i++; + } + return (true); +}