From 00e8a73d14167568d54fe4c32d8d0fdc4d4af3fe Mon Sep 17 00:00:00 2001 From: Theo Champion Date: Tue, 12 Aug 2025 15:57:27 +0200 Subject: [PATCH] dev: improved sprites by creating a create_sprite function --- Makefile | 1 + src/sprites/create_sprite.c | 30 ++++++++++++++++++++++++++++ src/sprites/create_sprite.h | 21 ++++++++++++++++++++ src/utils/inits.c | 39 ++++++++----------------------------- 4 files changed, 60 insertions(+), 31 deletions(-) create mode 100644 src/sprites/create_sprite.c create mode 100644 src/sprites/create_sprite.h diff --git a/Makefile b/Makefile index f19824a..ebea878 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ SOURCEFILES = \ src/renderer/render.c \ src/sprites/sort_sprites.c \ src/sprites/sprite_caster.c \ + src/sprites/create_sprite.c \ OBJECTS = $(SOURCEFILES:.c=.o) NAME = cub3d diff --git a/src/sprites/create_sprite.c b/src/sprites/create_sprite.c new file mode 100644 index 0000000..7ab3830 --- /dev/null +++ b/src/sprites/create_sprite.c @@ -0,0 +1,30 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* create_sprite.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tchampio +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/08/12 15:43:19 by tchampio #+# #+# */ +/* Updated: 2025/08/12 15:53:05 by tchampio ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "sprite.h" +#include "../../libft/includes/libft.h" +#include "../cub3d_data.h" +#include "../utils/inits.h" + +t_sprite *create_sprite(t_cub3d_data *data, char *texture, + double x, double y) +{ + t_sprite *sprite; + + sprite = ft_calloc(sizeof(t_sprite), 1); + if (!sprite) + return (NULL); + sprite->x = x; + sprite->y = y; + sprite->image = load_single_texture(data, texture); + return (sprite); +} diff --git a/src/sprites/create_sprite.h b/src/sprites/create_sprite.h new file mode 100644 index 0000000..cb9f873 --- /dev/null +++ b/src/sprites/create_sprite.h @@ -0,0 +1,21 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* create_sprite.h :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: tchampio +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2025/08/12 15:49:25 by tchampio #+# #+# */ +/* Updated: 2025/08/12 15:53:12 by tchampio ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#ifndef CREATE_SPRITE_H +# define CREATE_SPRITE_H + +# include "../cub3d_data.h" + +t_sprite *create_sprite(t_cub3d_data *data, + char *filename, double x, double y); + +#endif // CREATE_SPRITE_H diff --git a/src/utils/inits.c b/src/utils/inits.c index 715d1cd..abd4811 100644 --- a/src/utils/inits.c +++ b/src/utils/inits.c @@ -6,7 +6,7 @@ /* By: kcolin +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/07/31 13:43:05 by kcolin #+# #+# */ -/* Updated: 2025/08/12 15:21:00 by tchampio ### ########.fr */ +/* Updated: 2025/08/12 15:55:51 by tchampio ### ########.fr */ /* */ /* ************************************************************************** */ @@ -15,6 +15,7 @@ #include "../../libft/includes/libft.h" #include "../../mlx/mlx.h" #include "../map/map_checker.h" +#include "../sprites/create_sprite.h" #include "frees.h" #include @@ -57,47 +58,23 @@ void place_base_sprites(t_cub3d_data *data, char **map) { int y; int x; - int currentsprite; + int c; y = 0; - currentsprite = 0; + c = 0; while (y < data->map->mapheight) { x = 0; while (x < (int)ft_strlen(map[y])) { if (map[y][x] == 'M') - { - data->sprite_list[currentsprite] = ft_calloc(sizeof(t_sprite), 1); - data->sprite_list[currentsprite]->image = load_single_texture(data, "ressources/box.xpm"); - data->sprite_list[currentsprite]->x = x + 0.5; - data->sprite_list[currentsprite]->y = y + 0.5; - currentsprite++; - } + data->sprite_list[c++] = create_sprite(data, "ressources/box.xpm", x + 0.5, y + 0.5); if (map[y][x] == 'Q') - { - data->sprite_list[currentsprite] = ft_calloc(sizeof(t_sprite), 1); - data->sprite_list[currentsprite]->image = load_single_texture(data, "ressources/revive.xpm"); - data->sprite_list[currentsprite]->x = x + 0.5; - data->sprite_list[currentsprite]->y = y + 0.5; - currentsprite++; - } + data->sprite_list[c++] = create_sprite(data, "ressources/revive.xpm", x + 0.5, y + 0.5); if (map[y][x] == 'J') - { - data->sprite_list[currentsprite] = ft_calloc(sizeof(t_sprite), 1); - data->sprite_list[currentsprite]->image = load_single_texture(data, "ressources/juggernog.xpm"); - data->sprite_list[currentsprite]->x = x + 0.5; - data->sprite_list[currentsprite]->y = y + 0.5; - currentsprite++; - } + data->sprite_list[c++] = create_sprite(data, "ressources/juggernog.xpm", x + 0.5, y + 0.5); if (map[y][x] == 'D') - { - data->sprite_list[currentsprite] = ft_calloc(sizeof(t_sprite), 1); - data->sprite_list[currentsprite]->image = load_single_texture(data, "ressources/doubletap.xpm"); - data->sprite_list[currentsprite]->x = x + 0.5; - data->sprite_list[currentsprite]->y = y + 0.5; - currentsprite++; - } + data->sprite_list[c++] = create_sprite(data, "ressources/doubletap.xpm", x + 0.5, y + 0.5); x++; } y++;