From b21c56f4156f7e2cb94effe37ed4fb9595ec947f Mon Sep 17 00:00:00 2001 From: hugogogo Date: Mon, 19 Jul 2021 11:02:28 +0200 Subject: [PATCH] rotation centree fonctionne --- builds/fdf.o | Bin 138240 -> 138328 bytes fdf | Bin 122664 -> 122672 bytes srcs/fdf.c | 10 +++++----- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/builds/fdf.o b/builds/fdf.o index 49a32eebcd183148ec2c21f8d43754e441472e87..1d658dba2d467ce423e53df30f2e1b43eb7ea998 100644 GIT binary patch delta 3018 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 delta 3697 zcmbtX3sjVK7XR)ygUnzwOc)aiG9V~VX9gbwC^{n`AIHIT5n7aL05zyoFnpBTDg~|6 zNa5b>!$+&qOMCd}Ya`E^fSRDTEp|4ar9)|a6kBR#Zkx^C?=hZo59f5weh2QI`@6sY zz4w3rk8ftrf#4knf}0beYJJkH`j$dQep=R_X*XJ@DaK8WJK@~03{6hP3wOnR|NO!` zd_hGAxW;bRTA_t?41xK=8Qlskm~nQfNpGI44#x7^O}I8REYgv!AP%=#{-9G##)^AG zO_6SuKkF86Gxmm>&=;x$H=YPJL6t0PWVuq3k!x-lu}6)xR^~LzvPG8LWVu6@dt~{p zEIVY`Ez2HRo|dIgmZB^#%ksJ;S2N|mo`Fxzs2cmRfACy z$%WtHjVKc|;GNMa_`B%vsXdVQleh3YZ}CswW!I(1oTp2C`i9^CWZp$kGI5!C7Y*yC z|14pmin%iLM8mq#KMU_fC$aFF;EUM}@TSllTLSQ+&=>b1u=!W9Eq*3zzly;Li=hjb zC$zHhSA^lCN3r0?DT!C%VZoM^3+$M0a7FS2sKGarQ$id5<@a+<*+C|T5qIFFh5rkzW$YlVk25pm}hf3$}COB!a&BfY?tABX(iG-``H78L?8>l=cX)77-1WbasS@ zIhMqT*?lz3yNniN64z8zvrlGzfc2JSIDv0iQsE^$W68R6pXm25G{iJe9ENeuDRwm_ zOt)g9H7Bf`;x~5GEsz3uz82rYRn|)Q5HDC0K*S(h4cvpvZOQNkZnwpILJy`*Oa%ewPMid%@cD@&<3tM0c}~x}*IDMg*LmL|LyUu}TxAu%@kx#g zVjrHI=w^rbFvC8I7NE>-fqGnLp8~CT+@3%ScEuj0-+e(LzlsqVZuZD|nOu%rGAyj~ zJT}?0p#q0yCcwjJ%Z$=5Ij^uEz>>^G(2s{RGpMo~nbV;ZbF*S$1uo3WhK<5YStSs0 z^&F9@ZJhUUMhyBy8TlrLO`bhu5?SIx;ep9|U~fB%OS7lI2g2TL(6Cu&@NLIG%M z8wH+guB1!clLI=g^M*zY{#aPzjE1Wr9c^8tD4Pr#9%@7A7K-A zS6d(kuUBW&(U|yPAHm2j1B_=$(crDIc93o9^?&2b2U4lZ1mF{JF zD)7MKT{PiEOBNe9j8?EzX*7eT<5WujoKE{5RcfH_ZC+|OYLgTKr}BdE^QCW4Pn#d9ig2mEHq}=|c43|rBiJR! zaN*9n*%6v##jmoNooNj75GT`0Wtv8KecAoNut*sC_{N|+zWtU>4rk|uvz5}H&Z4sj z`=9tp3)RBDKNV`BMF?J3sHNTrCCziRP$#_p+yX6Z5R4mlXlZi7-(KLfwDdwy>vSz> z1=lOHwcrx|@>+=&G{X10zV3(Gwu>zgt%3G7c8jD#+ss=@vlZcd>{b}oR@4eQ4SU?A zShX)pR&A7GJ-b7)_M3lUK~UQ}yQJ|&NxwkZooP3%APs-pyD+jX^N>*gx=801SZqO^d+k!uP7@jG(b$jcA74~I^6q;ccD2lmD#n+@OfS}@IRJ@tr`#$7H_Ba$g(Aav_ zJ&QLU0h8_4gYdHI_SuzTnd-@XTgA8WrAMgdO}ys_wYHk?KLXE227XxtdU`J<>W{1{D3+tzsu?lwRxZ#)YY z{d}jAVLo4Q7VP>O)vVz?l6mu2Ab(Ucb-4;z*QP%QT`c^-pZFB)0KEP@Oohk!0!it3 RkEFW!qmqi?^%r2we*sanL3#iH diff --git a/srcs/fdf.c b/srcs/fdf.c index 360291c..ae2a574 100644 --- a/srcs/fdf.c +++ b/srcs/fdf.c @@ -44,14 +44,14 @@ void draw_image(t_fdf *fdf) while (++i < fdf->map_width) { - x = i * fdf->offset; - y = j * fdf->offset; + x = i * fdf->offset - (fdf->map_size_x / 2); + y = j * fdf->offset - (fdf->map_size_y / 2); z = fdf->map[j][i]; new_x = x * cos(fdf->rad_x) + y * sin(fdf->rad_x); new_y = y * cos(fdf->rad_x) - x * sin(fdf->rad_x); - new_y = new_y * cos(fdf->rad_y) - z * sin(fdf->rad_y); - new_x += fdf->margin + fdf->mov_x; - new_y += fdf->margin + fdf->mov_y; + new_y = new_y * cos(fdf->rad_y) - -z * sin(fdf->rad_y); + new_x += fdf->margin + fdf->mov_x + (fdf->map_size_x / 2); + new_y += fdf->margin + fdf->mov_y + (fdf->map_size_y / 2); color_altitude_pixel(fdf, new_x, new_y, z); } }