From 04ad40b58dc6af4342d2a28e73242cabf966e4a3 Mon Sep 17 00:00:00 2001 From: hugogogo Date: Fri, 23 Jul 2021 15:27:22 +0200 Subject: [PATCH] zoom fonctionne meme en z --- builds/draw.o | Bin 134768 -> 134800 bytes builds/modifs.o | Bin 134608 -> 134632 bytes fdf | Bin 140432 -> 140440 bytes srcs/draw.c | 4 ++-- srcs/modifs.c | 1 + 5 files changed, 3 insertions(+), 2 deletions(-) diff --git a/builds/draw.o b/builds/draw.o index 8f643b611ab6bfc029eecaa43a1b4ecf7e0d68ea..d50f2e35024029fff07c13b96b9cfa2b22e985d8 100644 GIT binary patch delta 2127 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 delta 1704 zcmZ|PUrd!{90&0C_rkIB9ymur<-p3cT5;MO7P+LQz;oCP%nBQowAJQKqgm5hHPRcN ztu^T;4cND3%i|Jb)kW-Nur(VG7tKa(q+M{~MHgA8068G)5jFdLd9k@RpY1)L_j!K5 z=l{EtI}{y16g`lV@xcc^jATzoJ}r_=_Ko0pv9$E05_fKDxi{i@{=w!|o)&rHGyU}s z?x^VWWZTxo_tuJcJb5yFZ}TG2ABsIMxtN^p=}N4XbkC8*9nzjXkyzvVnFw}@RAlGN zUR)=W*=IHnN3x|&-<;_CUbZZ6FVb!%QTCqS6kk@1R+0(O9y1(n)r+j-F`|gl}iS}S=lHa%vouW4X`0DME=mmIv8>imTZ9| zUqSv8kn_qO7}5i)`1wyTdR`Zih0JSfD~uAGt_izWc!=fX z5gs?AMUV^O2;^f}qGzcDQ|rSn+Yroh+ZQ!d2TMla$jf1^1Ll&}dSOW!99an|a5eo% z7j!k7V6`e;aO7>sWn~8p*$*4y$kDK4?sKFUwBt{(3)jC;&(c>o{ z!I4r(k)roUYG8?OmDEFul>%!zZn2Kr3d<(FS26&JD9teBcUTgIBh`>)ihkx0xkWytY3^@u*2H+Hol=x9Z<9;1?9oP0o LSfW=L_pAQ}{6iax diff --git a/fdf b/fdf index c137133151a4d903cc419939cd15c099a6fdd967..d8a68dfcca424e932bf44481c9f1f2924764f10c 100755 GIT binary patch delta 5009 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 delta 4709 zcmcIodt6j?7Qg4mfHNq3O+sqDdsep z;A!_tA6s9Qn(Zg-R%oGNZi?+%Vx{5}Gu_dw)HXHJojvz~>#`rWzxMZG&bjA&&pE$y z&hK&WhYd&64fJP#V~sJ}HPz!eX;e3Mexx;zk%b2wcfuL}?%i#gf_0Yji^lFe?l`q8 z^EWv3mau{4dO?-Ysa~Rj1RUoR7@S~{ofD?(r3bYva(-AxXi1(d=JrB!akoz(Hv6cx zCB2Z%c#)9G{%V+x75xKYu0$&(S}js-Z7+{DT-aasXppQnNOZGAcSy8ZqI)FTCee0@ z9+T)PiFQfUCD9uay(>~XSD}|m=&9?5MXpHw2)*AU^g)l%>mQ*v$odSf_rwX0a4`Ru zUUZG$%19NvoVMyc zZfZu;ou4V0vj@7=ChI*3sO$m$i5>b2a1M7zB*0tSzK&pUPq-AR2N;B^q0uk{JucPnFBQsc*A64*ITokrtcW%{tN_#kPc{@Uf6#iiEiSm&wR6 zN`Lh_wa4bTU^?R(PO5MJM%GLH$vW#BxBDY;tGLDsFN}N^SokG$Cyr!&FJWSmL1+1z z+?Kiu03a!hZZbc_^I1pOPzK49-c3g^k#l5&_*Pq-69PaZ#L7G9QoK zq;ABJ)Y;&~=TcMQNBkhQO!H!w+gUs?Q;EIPBSs`^>4}!k^3|;XO2@Szsm3OACiYd?C$f7ozo2`mT8wqy&l` zw{4F6D7CAb;!_QaDYWUf>n(A%txF zcsA#=>U`%Y|9rPC>c8)5kZ(B6UhUWCJoD&qhz-do##h-mB z;xS3vht8h6WO}i~Z8f=FA?Iinch4Eo({!#ZqpWVwrl-H$0b;T$bRva7F|!xK84sjOlP2qcfwZ^~IS+ zScuCrvtd1cm^qYI>SAVyX47femPfCw>FoVZG-O7?ID9e7$V{EMA~Oqqi@#(Ig>sC@ z4$(~Ol&v4f(b>;HC%&6)ro_I>9t{PUloJ6@Vp&cWIE0sT%0Tz^2{NXp*_G5KDbeCpQV!9606^6koOfHOsi#Vw;9J;WE=rU|7jEwk#5~&g0EdBjfvr#@?tg2rh z3a2MkE}iQ*JV$=b2u0EG4#pIP4?It)O`=pDcz8?@o+zsK!{+e`*!9F*`lKi*Kj~qA z@G)T_TN-|OGJo(Hq3A0WzFFZtFXdn3ZU5We&iz_||1Tawi~Gn7F}-35TcW}a(BY8^ zKd8mi6-MtjBjpZl_LP8_8GcZR=`)N_gY$?U#aD=y;-^FxV>i*Q7(3Gl?KpX+kzI~Q z=gbkTJ03rrIRXOk8X;3~&@3bP3x%`xd%_YyGw*#BU9fEnYVG;c^zvNN+S4O!e9x2P z{O8P?!$JOI^vD_~2JHKgfc!#&S>uF&gAYk1{!1Sq#kyM}GFrBKnhOkXCDCvxOrBvm z$Q(9i(>I7bgWVub;nBFq9*`gzx2Z(2+3r7k!7TEX#U1vbS=AiG%7G^a&8p#GxGa`p&Eat)*=jvQyks-LEa)!1xLJky5Cs-T@g&URcsAv_pEt;qO_bSSuT?kwJXB8`0 zgh!VSwiHB4y|o2g5W^L1BOB_pj>;@nD$r4tkM&gGsXj#02hJBW$rF`hF=pA|Q0b91 zQm<=7Btp#bc9cBdB&=Ar5Z=Tumf5t0^vNa;qs+Jk7`J>cZK^BFM{8>oY=VNdV%Cag z+G^jgDAOHPur&(it>?J>96V4Li1qe0eZBY5qyv``cobFk3A)l)*)Bp^>S>h9j6B7B zJ#E>b+6B7B!)2p5rD^T-)mdvLqn9zE&YO00MqQHCUdrDPMD(r2Yt%Aiu_<HPTeR70dRSs9vh?18L4v5Ni_U!h`w zgDOYMYGt=_^Az}om0z!-=*|2A6&n*=Lfb+dBbBZHo?_O(M|iR&WYr|HDqicw0-=PD z@nX}0b1kyZ5Sej*rPC{BRKjoZV#eU!yY#LCZ{@FgF?&qUja^0;iRjfJZdw{;GUMhc zdOyCg4^3UkYt$69Ay0-wC_izi=q}cBeq1d-PR+Kn8##QpnoXq)CuyjYmApe_NBO-P zwnX#bX5rJkSv0is72Yf`m{S@wTMo!A>7(SsHxdk+`JLWujH#t?8~+X_k0QT^z)En{3gGp9}6_~ zzUVp?xc61jrRbaatNoafbtUtIeArY|?|UmxBd5}pB&YbJQh$-6U&Qb9p@vr`%K9gj z3aS-2fxqb^wMWyR{Sch1ToUn$RjRifJb~Bxl2s`m!4mD2et zes?%a)zm6tEq_xKAN=QsH|a&OK+eP5vQWrad_x = fdf->rot_x * M_PI / 180; fdf->rad_y = fdf->rot_y * M_PI / 180; - //fdf->altitude *= (fdf->offset + fdf->zoom) / fdf->offset; i =-1; while (++i < fdf->img_size_y * fdf->img_sizel) *(unsigned int*)(fdf->img_addr + i) = 0; @@ -70,7 +69,8 @@ void draw_color_pixel(t_fdf *fdf, int new_x, int new_y, int z) int color; color = 0xffffff; - z = z / fdf->altitude; + z -= (z * fdf->zoom) / fdf->offset; + z /= fdf->altitude; if (z) { color = color ^ (((0xff / fdf->max_z) * z) << 8 ); diff --git a/srcs/modifs.c b/srcs/modifs.c index c06fd45..c382800 100644 --- a/srcs/modifs.c +++ b/srcs/modifs.c @@ -46,6 +46,7 @@ int *new_coordinates(t_fdf *fdf, int i, int j) y -= (fdf->map_size_y + fdf->zoom * fdf->map_height) / 2; // rotation z = fdf->map[j][i] * fdf->altitude; + z += (z * fdf->zoom) / fdf->offset; point[0] = x * cos(fdf->rad_x) + y * sin(fdf->rad_x); point[1] = y * cos(fdf->rad_x) - x * sin(fdf->rad_x); point[1] = point[1] * cos(fdf->rad_y) - -z * sin(fdf->rad_y);