From 72791c5d4e265c97321144d0d926e9489d42ae91 Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Sat, 6 Jan 2024 11:10:54 +0100 Subject: [PATCH] aborted fuck it :sob: --- a.out | Bin 26408 -> 26480 bytes maps_reader.c | 96 ++++++-------------------------------------------- pyramide.fdf | 2 +- 3 files changed, 12 insertions(+), 86 deletions(-) diff --git a/a.out b/a.out index 91644eb00f8493680da5ae882ddd4c11250f31ce..94d7a64c558380f569458b253544d0d75174d2f0 100755 GIT binary patch delta 3320 zcmZWs3s6+&6~6zyd-s9j0xm8fxC=gb2+JebQcZNJY`9s=6qUznbbRoTHjbjA#f}8+ zVhY8i;!jLsW{l3%Hce>)uBl8q6^vTZI6fw6N+vUvRBSJ5;$l`M#?0;a-+S4}^v>-4 z{{NiseCOPA{(I54FO%S9vOkS=l_7u^_tJc8q-HqY3| zRK!Ys2348&DM$U>>QWb{eMMwvv9St(=j8W&p?%5QX^r z2`gx%lU2q_y!@CgJa{P8BPWm8RhORgykS7A3w!_B($#0I4tm8lC()!n1A8)rF7O1c zem8jSO^@Z(0*#KXp8fC2EY+qMJbpM~*X^bqY&;E|%l^a2hyyE{@RuQ8i|Jf&2`-8c$%nKKpoW zEfByM&}%k?&8+yoB;ARI9E)P^Vbwi6QUG^ue=Pc*v-(V}%j#%hkHA?SMI0CCo)$;= z&_jCBp3R?mNWZmzMTEeuxb=k8(~^Wr;-kkB*6|NQ^m<}KAZ7Yr32_Aem6%E5?~SU{ z7#o2K9-&E=tnW1i<ls`8D9S6FtyKpfq1EZ?oxj2 z2K{vIqNuX*Q1;P~|9FGW&Rjq?2G(U}3kP!S)^*#eYa_VLn`)dJf3~S6g2w0kpqWe; z7NjB5EJU2Wt|%L^&L2{gB49Pp$9!KXN++-dcmi1TZ$4n@>(n?2j9b|w;=Q&6n z&BZ;AF3oc!7od4rXckvECF&)9aimd5Ba=;LE)k~5uuHT9++Ny~=V*>YLz5?P6T@6K zpfof(gt)L4f0s$ATKnKPqw#Ad_*aJgT`U*;*%S0L!upp8m%{llG1mk_dYEtr_By)d zDMzw|IWC&OnjdCmVytzv=P3snqu0QV!-&sKD5*bO(mrs}uzW{y8V3LK39Onh>k?Rv zbZI_o(iX;LZ{7rMOPHI9L-9K80rzcs4fjDhiiiRnpCc0@-V8@{A)=S&&T|w>I3#Jv z6>hFDlV>zGs5@Z!LW+|4q{;?WL>nZ|QXTD>hg|m+<-I3a{5#=XKLKliUYmyl5*VFl zG9Or2Kth2ZEj-9abl_0&*@zS9XKn|{px?OflPr3-(A8Ww1~aL&padh|vGx($`ShLd zJln09t@%nHv)#(+*m0&In;XD!d+{R`@38w;#uNFDT`#M<2Y6WQ>P;9W*{Unnv0;&h z@odMrW^A{!K+aSj>jrS#F8oNvU)bHxl0l?VR(Ib)5=GWWG0DBmhh5!q=6gvmvRY04 zYnB{7-*m=oW$8FmP}gU#0IBF_QLjE&u2tDMlNnzfuX&ET(a6~H~KOU%XHE7}>={Iw{Y6m4rn!RTb<6(TQe{XmHFiIE73@`@2g zzsO_B89QmB_kFURUh^g|6rdVm^ofGG7Kz>!WydRv%4V@(MZ?=vs1`knX^yl9dAO=S5m?Fa$1@ULx^poo?1wPJP{h`IrdL zS-F1Nv&>Ge(hJM}Nuub{<;7$b9a)}@p2nADv!;8?Tzu3F`pdEzcro56tBfyAaU-7N zW~+CO+ksKVK)Ly-BVu7m(HXY%XeUSg%$Srp&1%= z7Ybt60-OX*ZVSB5B)4k)y?Vz-U-#D2qZPkMc=BaqgoC;lM<%b*mBMAX)vz1to#RgG z?(Yvg{Z-|{yqsi>_8XmcL#G`{)$Hom3BE6N``S!;uhK<=G}%`ie>FuT?F4~cdHC3{ z@`vaipFMteoLjZ3Uw^D5-5U(__+GQ{>k_GVy~`5H)L0?9XMHhwo?cj=ZTbFx9Hi=p zmeyR2(HbbMI?s!#CTP(fVJdajI>{(4tX+if{+`-Jk!JQ!cwEmTk;WJTql%IZss97p C8P1mg delta 2829 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 NZL?ZuBW1SR{|%EuVTu3% diff --git a/maps_reader.c b/maps_reader.c index b2b5977..7f73656 100644 --- a/maps_reader.c +++ b/maps_reader.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2023/12/12 05:19:39 by adjoly #+# #+# */ -/* Updated: 2024/01/04 16:22:01 by adjoly ### ########.fr */ +/* Updated: 2024/01/06 08:18:22 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -32,21 +32,6 @@ void ft_free(void **map) free(map); } -t_map ft_split_height_color(char *tmp) -{ - t_map height_color; - int i; - - height_color.y = ft_atoi(tmp); - while (tmp[i] && tmp[i] != ',') - i++; - if (tmp[i] == ',') - height_color.color = ft_strdup(&tmp[i + 1]); - else - height_color.color = ft_strdup("0xFFFFFF"); - return (height_color); -} - size_t ft_countline_fd(int fd) { size_t i; @@ -72,44 +57,6 @@ size_t ft_countline_fd(int fd) return (count); } -size_t ft_countline(char **map) -{ - size_t i; - - i = 0; - while (map[i]) - i++; - return (i); -} - -t_map **ft_parse_map(char **mapfile, size_t line_count) -{ - int z; - int x; - char **tmp; - t_map **parsed_map; - size_t i; - - z = 0; - parsed_map = ft_calloc(sizeof(t_map *), line_count); - while (mapfile[z]) - { - tmp = ft_split(mapfile[z], 32); - i = ft_countline(tmp); - parsed_map[z] = ft_calloc(i, sizeof(t_map *)); - x = 0; - while (tmp[x]) - { - parsed_map[z][x] = ft_split_height_color(tmp[x]); - x++; - } - parsed_map[z][x] = NULL; - z++; - } - parsed_map[z] = NULL; - return (parsed_map); -} - char **ft_read_map(int fd, size_t map_size) { size_t i; @@ -127,44 +74,23 @@ char **ft_read_map(int fd, size_t map_size) return (map); } -t_map **ft_getmap(char *file) +t_map **ft_get_map(char *file) { - t_map **map_parsed; - char **map; + t_map **parsed_map; + char **map_read; int fd; - size_t line_nb; + int map_size; fd = open(file, O_RDONLY); - line_nb = ft_countline_fd(fd); - close(fd); + map_size = ft_countline_fd(fd); + close (fd); fd = open(file, O_RDONLY); - map = ft_read_map(fd, line_nb); - close(fd); - map_parsed = ft_parse_map(map, line_nb); - ft_free((void **)map); - return (map_parsed); + map_read = ft_read_map(fd, map_size); + close (fd); + return (parsed_map); } int main(int ac, char **av) { - t_map **map; - int i = 0; - char *file_name; - - file_name = ft_strdup(av[1]); - map = ft_getmap(file_name); - (void)ac; - ft_putstr("map read\n"); - while (map[i]) - { - ft_printf("%s", map[i]->color); - ft_putchar('\n'); - ft_putnbr(map[i]->y); - ft_putchar('\n'); - i++; - } - ft_free((void **)map); - return(0); + return (0); } - -//cc maps_reader.c fdf.h get_next_line/get_next_line.c get_next_line/get_next_line.h get_next_line/get_next_line_utils.c libft/libft.a \ No newline at end of file diff --git a/pyramide.fdf b/pyramide.fdf index 4750db0..e1f0cf0 100644 --- a/pyramide.fdf +++ b/pyramide.fdf @@ -1,4 +1,4 @@ -0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0,0xFFAAAA 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0