From 5b4c8866b8926b5261b696de19e1cc1b7a91dbfd Mon Sep 17 00:00:00 2001 From: Adam Joly Date: Tue, 9 Jan 2024 17:11:35 +0100 Subject: [PATCH] print map --- main.c | 2 +- print_map.c | 35 ++++++++++++++++++----------------- print_map.o | Bin 4776 -> 4888 bytes so_long | Bin 20904 -> 21016 bytes so_long.h | 3 +-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/main.c b/main.c index cdc17ea..1d5ca65 100644 --- a/main.c +++ b/main.c @@ -6,7 +6,7 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/06 16:18:56 by adjoly #+# #+# */ -/* Updated: 2024/01/09 16:06:47 by adjoly ### ########.fr */ +/* Updated: 2024/01/09 16:13:17 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/print_map.c b/print_map.c index 0ab5dda..fe60397 100644 --- a/print_map.c +++ b/print_map.c @@ -6,23 +6,25 @@ /* By: adjoly +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/09 15:30:06 by adjoly #+# #+# */ -/* Updated: 2024/01/09 16:08:20 by adjoly ### ########.fr */ +/* Updated: 2024/01/09 16:52:59 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ +#include "MacroLibX/includes/mlx.h" #include "libft/libft.h" #include "so_long.h" -#include -int ft_putimg(int x, int y, void *param, char *file_path) +void ft_putimg(int x, int y, t_window *win, char *file_path) { - t_window *win; - - win = (t_window *)param; - - win->img = mlx_png_file_to_image(win->mlx, file_path, &x, &y); - mlx_put_image_to_window(win->mlx, win->win, win->img, x * TEXTURE_SIZE, y * TEXTURE_SIZE); - return (0); + int img_x; + int img_y; + + img_x = 0; + img_y = 0; + ft_putstr_fd(file_path, 1); + ft_putchar_fd('\n', 1); + win->img = mlx_png_file_to_image(win->mlx, file_path, &img_x, &img_y); + mlx_put_image_to_window(win->mlx, win->win, win->img, x * img_x, y * img_y); } int ft_printmap(char **map, void *param) @@ -38,17 +40,16 @@ int ft_printmap(char **map, void *param) x = 0; while (map[y][x]) { - ft_putstr_fd("??", 1); if (map[y][x] == '1') - ft_putimg(x, y, param, "assets/wall.png"); + ft_putimg(x, y, win, "assets/wall.png"); else if (map[y][x] == '0') - ft_putimg(x, y, param, "assets/ground.png"); + ft_putimg(x, y, win, "assets/ground.png"); else if (map[y][x] == 'C') - ft_putimg(x, y, param, "assets/obj.png"); + ft_putimg(x, y, win, "assets/obj.png"); else if (map[y][x] == 'E') - ft_putimg(x, y, param, "assets/exit.png"); - else if (map[y][x] == 'P') - ft_putimg(x, y, param, "assets/player.png"); + ft_putimg(x, y, win, "assets/exit.png"); + else if (map[y][x] == 'P') + ft_putimg(x, y, win, "assets/player.png"); x++; } y++; diff --git a/print_map.o b/print_map.o index 85cb43184b157341c099c62f5ef9a340deabee93..5586358617be50ca3afd8709bc0b21c10757d6da 100644 GIT binary patch delta 1731 zcmZ`(Uuaup6#u?^dvEW}ZS$ucWD)JsHZyf&p_!Ccoz3DFxC@pIBqbZxF3$dgwuUy* z4%ApHN{!Qn1KS=p?Lc%)M=N^}``|V<=qgxN=0hL$&_Trrg7rb@!?d1r@0VBuJ#f$Y ze!uhk&iTG`b8}_)g(uIp@Rh<-`*I7hHHNkjTcu#;-!A^ZaZx06!-4KUXy#+GB zXN%^U#F}}gYt@pO)3>bDwCOHONSW4bc+8#edgPkzT05MNZ5(#Z#>BR%JN_QW?f#H! z*Zb71aHEx9D6BV1eH?;3#8;r3A4GrN@++42NyMCxTA!HwXLA$FubNXgxj7wM{Vjn+ z_@+5^r?uxcT$R3oq}<#b;vQb79^5HApEaH{g1#g55g%hlfXU8I!!WSxarjW)&Bx)I z9M7FY%)99dh#8e*8jl6HfJ0pzfV-M}B;TC!1~Bvq7}=qQYC#FQ$j6NT1Vi#pvONQY`wsZfLM*yBhYARdjb zU(U-*oCNovQGL&&IkcCviYu!~YFzzXY5oOf)xEAmaU~X4q@=>t;|lu=it1ijQ)l3@ z>iL~7uBmdHc0iHk%)C-1JClkezdkS5!|&Bi`~i5h^PU;%iDtFMxCG0Z*E5c*Iwn!V zvU9Mg9Sw&Bs=`RG>(Qod&u`)JHf25mVcnbicuTfsOEw_JPC*tL3i||4U37d(UHU5Y zZW5!7ZlnLw=5vf9HE1F=+UzzPeieL4AGYOeeH(p?m`_O`75cE??F(Fg#qk2?lW^Ja z`aTs38lHmBS%EJ>)bR4JVcGEJzOT?+7I>k8|4QKdBGM_S@r=L^MJ)AtN8mpy_-g|H zZO1*fVg&J=zSdl#;vQJm=9|=BE!Cw^o(F%T1@ZA;scY^oZ z5rVai`i$V-goh5VqB}IB28L^wboy4a8T=-p%{i{JBFbb4YxRzwYV94>9Da0m;y;}3 zYUd{*>Iyb)V1`=mw-sf7UA)wn;7_d{F1iA`Dt@$|S zG*Sy$``rP)47c17z5(1rK8pTbnDj*SW2&wE85TY5d=7YB#B*01SQKGySay1qbrec; PA-#n@JG2g%uG{r5akNK7 delta 1566 zcmZ`(U1$_n6u$S)-r1SWZe}+TH^Mf%Tf4@;#zZ4qYjj;Su-zv9P%2T8I4Q;rn6M@( z7${B9RtZ6IIS+~;v=wQkLJ=R@23if~K@kJ(OKJO1D-msdoH5c-zy$Sla^}@p-E-{^66tnfK=lXF6t|FpR?3q*EFz zL>DEbEE_J|9UbqOpZrtbG2S+tpM0P@lbUZ8PEMr`-tK9%lAn+ZvyzoRn)o${^7PVS zjP;+6S0-p*$|bFUP8xTLS+{n z!2y*e7p=p2rl=fpQ0;0Of|Mv8V@>%dl)vkk*i7BJMa8vDkR_V9mi60Sv`i}0Nrocj zGzihV42TvKI`29cv<~fEOcYw9LkA7`Nj5-(>|ER1Kg4>5y2=Ci(r1_1aW>4#_JG~T zdU}r@?kd|uCH6td9$;96Z)ILX7x-6ZHqsffe0B7c*dEbEe>i9`mO!eNcnsR(VqJU4 zNiYq2^b_GFA>)A5^`cy^x5JFSrn=ZF+lx{Z^?i~VJE1z~k;K)vxgE@v9@#`*Lp^~7-6;z-M@VS*?p1|eqd;_JaS<9Nvx zGd}W*s?a)VS6)0)F994)eC8M2s8eU?>Ag8=#giV-U{Sx%r?15tMYqe3F#m*$z6lvu z&n~~B!S6nOi_*`$LZ48lL1m4_8QY;IWK_Xf(2Xmh?R?p%szjfQ#OJKS06ZM$pF?vv zZhzy`Tu}H2AHQGWyK1EV)Nxc{?;^ZjClvn(Z0z+9^;*W&o;;1W9t)m@<0G&6s$R!c zKK^6nywS&hq4+i*@9m`B$A7K#DR+d^ku)ELtC3{D2vwPIKQawhtNZ0|Sk}NcYC}gO zu5ymS+tyb60EewCuY>DWL;7#5ko|gBv6#P9m$Db;tgQK;LSwKgnl(?UZ|^-AMpU9h z!T1ioNAxS*BE}TVMYH@8G{-6hIN4kRbEcVr zRUPak8#>9*8AmpwGj)kN;!o!0oMx~XGfkMO24kH@!Rf3U?(N+BUX6N_p6{IR{M>Wy zyYIF4OWL)Ec1#kg+?|sz8@po(U)^A#*~U|%W}Wi8X(=@x(kyZawhR3U-F**o_Bh(^ zEwo-t&s%i7W!*O~m-<`83={nvcE|0fjZhiyr44W)e$eK_Lauh_u*=&TP)%M13;9}a z1t%KdmxRWRr=3Hr@@Z#)fy>t#JVsFozAq4RJQ_94EJV}g!y>+UE?;xdwRQ23YpW*^ z{QVzQb+w=5u6CFCaR`fSiqgyqv(GbXI^Y>9@i{{!rUTAEu!E&}PuZ7&)fxw1Strph z7_d6%Dlm-89(&PsB-XCr-q=S!EEqSNF{xo@8+bKldYJLRDUB%%Gh;xKdDcr|<}AD@ zPn0+Phx_`R0hjj##WM-qSd7Gs6W~cma+sC2P@7Y2Zw~odL$0mO>QR0WZ-#iQ=4C%X zn_Nv};Huna6Bya<4BaTf9@(L}Ob1$rgEt@ey@}VTFmxZ@NXn*u*pYOHivEw1cT;MI zY2#lNf_Gu__*%Nze|`KV`iVUjEcRD6Vhx%s=6#E3#b4hYRlSFJZdg^%A&w#j7(b$_ zDcI93#C*h*yQ;brvHUMpZ9yDG+=`O{fduIG?hlqFD20p?Iu8 z=o}Lng<~Q$72Dr{=%EfEP(mTk)Ma-PD1^$e+5tH{zmk>pe`+0+JYMPf!aRK z?LzGwYE^I&wOgpQ!4=fT;Jgh$)03sCsP%#awQ|%BLlJ6?s9l6Q)V81&^lwU^8x4VJ zRkXuDKdWA%)zC95gT4(v%_`f-W}-{hVr9V+C3LoQa&0C`v^IS9q}6l*V+G4(l;~^l za^HNEMxk@%R%XSsJhW150wL^l=#qDtCpBE(QqN5%N-WuQ48w%f)hMw@ z18>D%hCWu3x8l&PD&9&OYlXyQVT2SR6d=S5AYq^a>q=aVqKGM3G5(vg8!1%hq{~^< zLgNfdq8OVSlNXa|bH^9jFwftT^S2N=fYA|nu-kIR!N>FKEm6@?OPeKAvm_YG3|~m; z*MR0uF%_3d&N4};lBl6tBKILTcZwKg=z+%Eqlx81260YQz9fq4k4h0@Y?UO4Zygom z{RMeIW7e!)U9*8O`5qh;lKsQ^6_lQbk$jn6eYF(ex@0E z{6U?!>u(1CuAuLG&J(zusiBGW{&zH?OUGI>8<1e0_&L=9T)yBPPb51gw8eZ3EGi zTBS$?r){XE4O*LMLtE+ErckO7twm#7Vrpu&v1l|s5)x6-f+gL~d%F;0y2;Kr^Ucin z=Iwh2?Z@efPiSkh5b(AwylGw=O8B!DtTfHsVbG!urHqzRbC(v8F8DzB#kPC|&OLA@ z+#Y=E?kfwX&Q|XG{M!ko-jEnZ*TAvxFQ^ZyA{uEjT#fj{u?&U0O(kRA#)e@vtWidx z=7!P09T6_sYS(z1G1F8sjEL`Z-sV>W-j)}qye$ZsI)96FEKKCB=D3_v+QCb6aF{^~+hj1aLhF(yTVt=R5YL*W>LxsXZnC)D#hejFl zPN1F*-@bdQI*NFCOjXY#P9a`n{C!om;kOt?%tVZSpsFhneGgT27vdD+yNG?`s(KnR z|BJq} zgPgmFUKe^YjG%WJy=`EQj}k}G^TPu4X5o%np$xrL^g3Y+dOq~}p$WZO^oEp^@!27G zQpqs9sG9nfoW&bO`T}$=Nu-patzBIIEp{?dB%S9|iOM*KiWrl?9o34C~)kW+2yRAIRLu-0jXwxL4nIwvA=8MP5 zm}HWC@i;xI<_kFa0wIgBLJSfz5kiKr*GL66hhZ5SH**$;D33C0sZbUH>$BpO53?Q% z^k+Dn^X4pDh-r;zG?t6;Mjs^Rri7N~i@tJEC^xPaiK!CS<)#D&89POjX(_bi_S!4% z7!8@Ge9>Uo*((Ma!m35Vu(j7BGGi!B0hAfHSv0msF zA{;;IDy@>tySH#l$aQFwrI z;%jxoEw==NZabC1S|pX7*Q;x6GVlLJR~gcIe~iZC3G?UXw0gM4^P7vAGqAl#as)8T zKGq3Y%kma9<9uxqjuuJO#%&U_8R>XL?7)eB;6A+}7kSJ799<1$cqCfN6{?v9ug6Yz zK$}N`bWac*FS0?aCn%C>4o7J-qr=k%55l&X5SuHM2*y7TZ4=Op8g@Q0?fH(YE<_DP?`yTZ8 zv(5XnwCH=7#Hct=i&`M3Dm(I8z7~xcHDq#8u&*k`Jm}GwE6`Jw9de{pi%Kc +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/01/06 16:19:42 by adjoly #+# #+# */ -/* Updated: 2024/01/09 16:09:17 by adjoly ### ########.fr */ +/* Updated: 2024/01/09 16:17:27 by adjoly ### ########.fr */ /* */ /* ************************************************************************** */ @@ -35,7 +35,6 @@ int key_close(int key, void *param); int ft_countline_fd(int fd); char **ft_read_map(char *file_name); -int ft_putimg(int x, int y, void *param, char *file_path); int ft_printmap(char **map, void *param); #endif \ No newline at end of file