42/42_INT_10_cube3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed RGB parsing

Browse Source
This commit is contained in:
Philippe BLAGOJEVIC
2022-05-04 16:53:38 +02:00
parent a6c61ec557
commit 6000629c17
5 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -80,7 +80,7 @@ RM_OBJS = rm -rf $(D_OBJS)
# flags # flags
CFLAGS = -Wall -Wextra -Werror $(INCLUDES) CFLAGS = -Wall -Wextra -Werror $(INCLUDES)
CFLAGS += -g3 -fsanitize=address CFLAGS += -g3
LFLAGS = -L$(D_LFT) -lft LFLAGS = -L$(D_LFT) -lft
LFLAGS += -L$(D_LMLX) -lm -lmlx -lXext -lX11 LFLAGS += -L$(D_LMLX) -lm -lmlx -lXext -lX11

6
libs/libft/srcs/ft_atoi.c
View File

@@ -6,7 +6,7 @@
/* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */ /* By: hulamy <marvin@42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2019/11/25 13:54:29 by hulamy #+# #+# */ /* Created: 2019/11/25 13:54:29 by hulamy #+# #+# */
/* Updated: 2022/05/04 14:09:01 by pblagoje ### ########.fr */ /* Updated: 2022/05/04 16:44:26 by pblagoje ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -29,5 +29,9 @@ int ft_atoi(const char *str)
i++; i++;
while (str[i] >= '0' && str[i] <= '9') while (str[i] >= '0' && str[i] <= '9')
nbr = nbr * 10 + (str[i++] - '0'); nbr = nbr * 10 + (str[i++] - '0');
while ((str[i] == ' ') || (str[i] > 8 && str[i] < 14))
i++;
if (str[i] != '\0')
return (-1);
return (nbr * negatif); return (nbr * negatif);
} }

2
maps/map_valid_03.cub
View File

@@ -4,7 +4,7 @@ WE ./textures/wood.xpm
EA ./textures/blue.xpm EA ./textures/blue.xpm
F 66, 66 , 66 F 66, 66 , 66
C 33,33 ,33 C 33 , 5 55 , 33
111111111111111111111111 111111111111111111111111
100000000000000000000001 100000000000000000000001

16
srcs/parsing/check_rgb.c
View File

@@ -6,7 +6,7 @@
/* By: pblagoje <pblagoje@student.42.fr> +#+ +:+ +#+ */ /* By: pblagoje <pblagoje@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/15 16:11:24 by pblagoje #+# #+# */ /* Created: 2022/04/15 16:11:24 by pblagoje #+# #+# */
/* Updated: 2022/05/04 12:58:13 by pblagoje ### ########.fr */ /* Updated: 2022/05/04 16:46:11 by pblagoje ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -51,19 +51,6 @@ static void set_rgb(int *plan, char **rgb)
*plan = 0 << 24 | r << 16 | g << 8 | b; *plan = 0 << 24 | r << 16 | g << 8 | b;
} }
/*void ft_free_2d(char **str)
{
int i;
i = 0;
while (str && str[i])
{
free(str[i]);
i++;
}
free(str);
}*/
int check_rgb(t_txt *txt, char *elem, char identifier) int check_rgb(t_txt *txt, char *elem, char identifier)
{ {
char **rgb; char **rgb;
@@ -78,5 +65,6 @@ int check_rgb(t_txt *txt, char *elem, char identifier)
set_rgb(&txt->rgb_floor, rgb); set_rgb(&txt->rgb_floor, rgb);
else else
set_rgb(&txt->rgb_ceiling, rgb); set_rgb(&txt->rgb_ceiling, rgb);
mb_free_2d((void **)rgb, ft_strlen_2d(rgb));
return (EXIT_SUCCESS); return (EXIT_SUCCESS);
} }

12
srcs/parsing/init_parsing.c
View File

@@ -6,7 +6,7 @@
/* By: pblagoje <pblagoje@student.42.fr> +#+ +:+ +#+ */ /* By: pblagoje <pblagoje@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2022/04/15 16:03:50 by pblagoje #+# #+# */ /* Created: 2022/04/15 16:03:50 by pblagoje #+# #+# */
/* Updated: 2022/05/04 13:14:21 by pblagoje ### ########.fr */ /* Updated: 2022/05/04 15:32:54 by pblagoje ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@@ -89,10 +89,7 @@ int fill_map(t_map *map, int fd)
map->content = (char **)mb_alloc((map->size_y + 1) * sizeof(char *)); map->content = (char **)mb_alloc((map->size_y + 1) * sizeof(char *));
if (!map->content) if (!map->content)
{ mb_exit("Error\nCouldn't allocate memory for map.\n", EXIT_FAILURE);
mb_free(map->tmp_str);
return (EXIT_FAILURE);
}
i = -1; i = -1;
while (++i < map->size_y) while (++i < map->size_y)
{ {
@@ -103,10 +100,7 @@ int fill_map(t_map *map, int fd)
} }
map->content[i] = (char *)mb_alloc((map->size_x + 1) * sizeof(char)); map->content[i] = (char *)mb_alloc((map->size_x + 1) * sizeof(char));
if (!map->content[i]) if (!map->content[i])
{ mb_exit("Error\nCouldn't allocate memory for row.\n", EXIT_FAILURE);
mb_free(map->tmp_str);
return (EXIT_FAILURE);
}
fill_row(map->content[i], map->tmp_str, map->size_x); fill_row(map->content[i], map->tmp_str, map->size_x);
mb_free(map->tmp_str); mb_free(map->tmp_str);
map->tmp_str = NULL; map->tmp_str = NULL;