42_adjoly/FDF
Archived
1
0
Fork 0
Code

parsing near finished

Browse Source
This commit is contained in:
Adam Joly
2023-12-20 14:14:35 +01:00
parent 11e3eef876
commit dbadd42c07
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdf.h
View File

@ -6,7 +6,7 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/12/11 05:10:42 by adjoly #+# #+# */ /* Created: 2023/12/11 05:10:42 by adjoly #+# #+# */
/* Updated: 2023/12/18 14:18:16 by adjoly ### ########.fr */ /* Updated: 2023/12/20 10:21:53 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -33,7 +33,7 @@ typedef struct s_map
{ {
int y; int y;
char *color; char *color;
} j t_map; } t_map;
int ft_read_map(int fd, char **map); int ft_read_map(int fd, char **map);
size_t ft_countline_fd(int fd); size_t ft_countline_fd(int fd);

33
maps_reader.c
View File

@ -6,12 +6,13 @@
/* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */ /* By: adjoly <adjoly@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2023/12/12 05:19:39 by adjoly #+# #+# */ /* Created: 2023/12/12 05:19:39 by adjoly #+# #+# */
/* Updated: 2023/12/18 17:18:43 by adjoly ### ########.fr */ /* Updated: 2023/12/20 10:43:54 by adjoly ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
#include "fdf.h" #include "fdf.h"
#include "libft/libft.h" #include "libft/libft.h"
#include <chrono>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
void ft_putstr(char *s){int i = 0;while(s[i]){write(1, &s[i], 1);i++;}} void ft_putstr(char *s){int i = 0;while(s[i]){write(1, &s[i], 1);i++;}}
@ -81,22 +82,31 @@ char **ft_getmap(char *file)
return (map); return (map);
} }
t_map *ft_split_height_color(char *tmp) t_map ft_split_height_color(char *tmp)
{ {
t_map *height_color; t_map height_color;
int i; int i;
while (tmp[i]) height_color.y = ft_atoi(tmp);
{ while (tmp[i] && tmp[i] != ',')
i++; i++;
if (tmp[i] == ',')
{
i++;
height_color.color = ft_strdup(&tmp[i]);
return (height_color);
}
else
{
height_color.color = ft_strdup("0xFFFFFF");
return (height_color);
} }
return ();
} }
t_map **ft_parse_map(char **mapfile) t_map **ft_parse_map(char **mapfile)
{ {
int z; int z;
int x;
int line_count; int line_count;
char **tmp; char **tmp;
t_map **parsed_map; t_map **parsed_map;
@ -107,13 +117,16 @@ t_map **ft_parse_map(char **mapfile)
while (mapfile[z]) while (mapfile[z])
{ {
tmp = ft_split(mapfile[z], 32); tmp = ft_split(mapfile[z], 32);
parsed_map[z] = ft_split_height_color(tmp); x = 0;
while (tmp[x])
{
parsed_map[z][x] = ft_split_height_color(tmp[x]);
x++;
}
} }
return (parsed_map); return (parsed_map);
} }
int main(int ac, char **av) int main(int ac, char **av)
{ {
(void)ac; (void)ac;