From a429813165f86add01782dba5e8d7af370aa7577 Mon Sep 17 00:00:00 2001 From: hugogogo Date: Sun, 25 Jul 2021 13:59:18 +0200 Subject: [PATCH] skip color hexa when parsing for real this time --- builds/keypress.o | Bin 138088 -> 138264 bytes builds/parse.o | Bin 140328 -> 140304 bytes fdf | Bin 166520 -> 166736 bytes includes/fdf.h | 1 + srcs/keypress.c | 18 +++++++++++++++--- srcs/parse.c | 3 +-- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/builds/keypress.o b/builds/keypress.o index a219cb5470420b4b8e8a41232baa02f285a0459b..295162a147fcd707563358c62baed8b2f4a68772 100644 GIT binary patch delta 2148 zcmZuy3v3is6y5u_TV{4!=%0RNm2Cw20gByLYTE9gu?ZM!LSlozlJZ#+g@QsL3U(kd zRDzb&dWqCXC7ME7t&{)(!S2M+#AqyP3`U6sfTqw zdo#Uq)YyC6XqhGIE_^Yk)lE6Ar`;KE{@LSlxpr(FU9)j*&8{b|_g6pv-x~xC1 zFL%{GCRcVUWGzh=}hl~en_Id4d^zo`js@^keuc&^)+ z8dNpqyK6~aHP@D3oe8FKW1c2{{iIl9Nb0@eex1bAqIaFAFOG^@=Xw2$i=Kn7 z*z}Ja-II#^HoL z#jVziWv%0LGh5Aykl|SttM2PvQt_H6;G@fXPKLYP$zAUCb>Z%A5lF?K+x*$RrFgZG zIXisPNbCK!I?&J8rcnO0m~&`q(pzFtV!RkSHq)T3=@jLTJgTDTu?u-LlsGduuef1F zNlE$2(p3%fgXPN~4VITJSkVw%Fu$a9WhuU8%Xy@LmS>j>bt4ik;X8^Alb^@Mu?>ZE z)P&;fAboxi_{;BfEk)kbH#aCq*O`W3c!@&_Yy}a3C@*4hlPX1pk1e3NIzgGt<7W&? z<@TEt5Y=VufFowQg_6cHwr(Lj&Nf0CvL_(ROyQ zEL$5#avz5zoM0Ou{2#G14)P|`1XiOQ0=y^go8%5tKJML_Ku$*+32fiTZI-B{p*9;q zxv(96C6qJg;y_ zT3==xAT}Rj#{=>fQ#``XLu|#vHdLfKdPv*icyI&>W`ib@6cHO*7h6+M^Qxwn=$diN zvx^;2^c9l<^_Fh741~Y3jS$B<0x->D<@KVLjH2!{woFK_*3`pVauie#JCb@wQ=2s9 z#>{%y@`8$+s|2TOLAkMq*#RZzo(Sii9P!C1`7osdxl}C|s;ENI7*PTmTdZ~NJtOjT zX7;j^0HFi1Oc6f9RwBY)wxKKb9$^QenLmH>_~eG3U~4L3BA*~ z@??dkfmovn-9|f(0G(uK8f+s>NwBT?lC30!V{FUNIK>V^v${le(WU1=*u+pWZu4)p z0m9$MPBO}Nvz>y~PL8C=p`>6aAF8Eua;b{CnNp?h8Mac9{~g;h44+{~hL@PqkkrE= zfY(>5O#MPVlKt$Yp_hU(wfxBaJqZZ^_iUwudr5QpnaY)YM$&QTyESod`{l_PU@HTr zN7&9l53aN9$Z&vZI>P$1Y)waq?U14W96Jb2d!aHv@SnMSmuA8uP@$;PifX?Di}UPc zic0TAO?~Z=Z~6y#R+h*VHG^zriAwQlh_?gH^#;WR=BWDLvP8hW5APKGzf0$OgW@@gRN|o)erJ^Al^QaY|QL9Qx2MF8B`(>Epmer{slWgXVL%w delta 2006 zcmZXVZERCj7{~jZZe4FFFg8{;hJ(RSm}BX!qim3r5j7!UDts^@5y=WTXCg{3Xo!Ru zA~6tOGE$cRVvG(UVaO(2N??M)X?Xikb%8`NA=x6);7gRA!8X{&d`{0HxY(q9?*IOt zw{xCzZ`->4H&6Ln7Ko01w=(Ia;^aARsO-;K@9Z3X<&DtF_ny9WseaurbCCB3lG4qh6e$^+g zjfXy-uCB_FeyW(7&AVbs{=4GI$v&~}^i@CYETTBpl+kjEpWatS1C!@1uB*1=8|%Uw z7T3HK-P9DRjn>%lrkZ$dO=L;L4o5a_*o4DX6rXv3ben?B4gQYu%GIZfPS0ILr!3C+ zbCix9VY|1V{wd%M!CM0qrFysnT(AKdZS31wm0%|;Z2RTs~31t?-Ri+*pWmdr+V%P2saE2%r_`O7DZ6=%< zp(WG|$+u|@>|yp=y&29h%a`FQ*|r&yrRA3DptZV{^j(@yufe&?o)+A@?0M~VNS1-E zv$SUmVJV3vlz?-Oy}WSm>6Vmv4)zGgG;W78!mt^xk{#P2Sy~s%bc(;tx<_a}5~H-- zIyqZ|5(9!_KJA1Y<(TgbfWEltSomAJMXlI#pjC<( zt%FU1r}P;d5;3czQpZ)BCPN%|5K^HZCnB}M$dD++ZXv2D2d)rmycssu?#FeS1^?Y2 zFN014mTHh5&6!xK?@jECC+$%q25b9n*R*fW>qqp-OS z)gr@p=~>u5HkXmeQH}bz(e-fomKZ()>Eq0wSLsgYK5U4Jk;vnybT(MD9EHr|%-3~b z&rvvjmJ8teIZuBlq>@j;wm7C92{x9qNM~JdvgYzqx*#ns*lW;Z26-7BgA-shWYC)r zdl8q9K`OSnT4$VLm>Q@HXA+~`2IXtiP?$whq5Tt4dPtqqAUAkuB524CQ-PBPn8&Dr zBj^O2$-KlM?4YQp6r@tKU{B%o-%P=o!j(P@|8E~f`@drr?Fi76`W~Y?1-%!>3q0}>Qu4|JrBEp zJ-2)fr+_^NpU|EU+8XDjo`+;aKDg}3Gfot;3BhF})?R=tWEh1#on`k0IMZ1+z-7s= zy9}Gawi=yuj?j`q00uDM=rZN{FV&yCJY*6&PsN&KR|}K z>Lajca1*P0;mlxJ2Up4Cy^u=saEe)O`3X)jm-wSjS3hW~-&ecL4%P=tH8^L0daka+ zDG{;2s%08==BmGiGF&SW#iFeblA#!?M`R`^{x(nl%T((4_h*UA1)iKzfb4*#^e~F;J-36DMSDO diff --git a/builds/parse.o b/builds/parse.o index 4b84f2319f3da85e701a2c934d6515e34972f9e9..9b428ae08acbe59e949c7198a7bc86d47341eaab 100644 GIT binary patch delta 2058 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 delta 7070 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 diff --git a/includes/fdf.h b/includes/fdf.h index 82bf42b..e37abee 100644 --- a/includes/fdf.h +++ b/includes/fdf.h @@ -51,6 +51,7 @@ void draw_color_pixel(t_fdf *fdf, int new_x, int new_y, int z); int keypress(int keycode, t_fdf *fdf); void keypress_more(int keycode, t_fdf *fdf); void position_state(t_fdf *fdf); +int is_color(char *color); int **parse_map(t_fdf *fdf, int fd); int *new_coordinates(t_fdf *fdf, int i, int j); void draw_lines(t_fdf *fdf, int *start, int *end); diff --git a/srcs/keypress.c b/srcs/keypress.c index e439b38..6f1af88 100644 --- a/srcs/keypress.c +++ b/srcs/keypress.c @@ -2,7 +2,9 @@ /* ** U -> up wiew -** I -> isometric view +** I -> isometric original view +** O -> increase altitude +** P -> decrease altitude ** F -> fit to window ** C -> center */ @@ -17,8 +19,18 @@ void keypress_more(int keycode, t_fdf *fdf) } else if (keycode == I) { - fdf->rot_x = -30; - fdf->rot_y = -60; + fdf->rot_x = -45; + fdf->rot_y = -35; + fdf->mov_x = (fdf->win_size_x - fdf->map_size_x) / 2; + fdf->mov_y = (fdf->win_size_y - fdf->map_size_y) / 2; + fdf->zoom = 0; + } + else if (keycode == O) + fdf->altitude++; + else if (keycode == P) + { + if (fdf->altitude > 1) + fdf->altitude--; } } diff --git a/srcs/parse.c b/srcs/parse.c index e613499..08f1586 100644 --- a/srcs/parse.c +++ b/srcs/parse.c @@ -21,8 +21,6 @@ int **split_to_map(t_fdf *fdf, char *raw) while (++i < fdf->map_height) { map[i] = ft_calloc(fdf->map_width, sizeof(*map)); - if (!map[i]) - shut_down(fdf); j = -1; while (++j < fdf->map_width) { @@ -31,6 +29,7 @@ int **split_to_map(t_fdf *fdf, char *raw) map[i][j] = ft_atoi(raw); while (ft_isdigit(*raw) || *raw == '-') raw++; + raw += is_color(raw); z_amplitude(fdf, map[i][j]); } }