From 5085166c68b790c4ad293f1666edecd7051ed5d0 Mon Sep 17 00:00:00 2001 From: "navid.elmi" <navid.elmi@etu.hesge.ch> Date: Thu, 22 Dec 2022 17:01:43 +0100 Subject: [PATCH] tkt --- skeleton/.vscode/launch.json | 29 ++++++++++++++++++ skeleton/main | Bin 97400 -> 97560 bytes skeleton/main.c | 6 ++-- skeleton/main.o | Bin 22456 -> 22456 bytes skeleton/planet.o | Bin 36448 -> 37920 bytes skeleton/planet/planet.c | 58 +++++++++++++++++++++++++---------- skeleton/vec2.o | Bin 20312 -> 20048 bytes skeleton/vec2/vec2.c | 10 ++---- skeleton/vec2/vec2.h | 2 +- 9 files changed, 78 insertions(+), 27 deletions(-) create mode 100644 skeleton/.vscode/launch.json diff --git a/skeleton/.vscode/launch.json b/skeleton/.vscode/launch.json new file mode 100644 index 0000000..d895599 --- /dev/null +++ b/skeleton/.vscode/launch.json @@ -0,0 +1,29 @@ +{ + "configurations": [ + { + "name": "(gdb) Lancer", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/main", + "args": [], + "stopAtEntry": false, + "cwd": "${fileDirname}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Activer l'impression en mode Pretty pour gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "Définir la version désassemblage sur Intel", + "text": "-gdb-set disassembly-flavor intel", + "ignoreFailures": true + } + ] + } + ] +} + \ No newline at end of file diff --git a/skeleton/main b/skeleton/main index 56174080d08bfd4a47812e0d86319dfaeac5e0c9..92bcf89d87cf4149fe72cdd2a10df078f1635cf7 100755 GIT binary patch delta 9953 zcmezIgLTF))(IMnHzsN>=VB0HfB=z+xAeGJvmhMStjR)*dX5}?5H5^n5P<L*85kJY z7#J8{tcLJk>_(+6SRwp`$&HNP6)mPgc<6Kv$QT9&hMdVWnfw)TnI*vj(Je8VlQ~}G z(YG%=LHhTVc#c0aW%=7K;j*N&YI6<q8WtvngOjy5^dvnFLX^YEQU(SFK?Z3ChslK; z?otX+Sq`XlDKi6u0E0Ax!okg#INDh1KR`VKllRhuDExsY{?ZO2&aekU!_+5vLHTIn zew`3;0W@(3HHf$bM11mfUO_Dd2%7<B<~gWc8ffCiotuC0@-ccoH~=vNraoaZg#QCg z{M8hQI0IT3e1wX>n9RxFF9{1FPz)MFHGn9G%^UgO^KVipV^u9nVPNp+<^7)wqHIB? z{TGdz#lY}of=91y=WLKDYt!V}su~=TV2)|f<kPCwOqR1JbEv5?3C^Bupk~c@VRDYz z97!e#1_qDLR*C=r|9dp=1yKy8ejdH7e<mxcD>L4h?5aLDs8NN1;aIEq|Ns9PJh~xD zJCDEEFU<hs?gP2cqx1NSE-3~E&)%s8Ak$zfuYn|%8!#~NZ|en_;n6L6aI%7iD36E> z1H%rG&KEUulS4H;nM!3QFVOhNxN7qx%^XH1+i9D$y_gt3ZuZvIWnw(Mxl;coBjd}> z!G`Y{8GmkeHr~d_=(PEl$w5ZOhRu7-a+sKeJ2q=sDl<*~W*|LzuNJqoNAKK(|NsAc zcHV2Y-P6jzz)&KzKLM0y6kbd|WhTee5H|UhnfBzT)~1uIOyzVIy!ikBlOw-?i^_pd z`~tiy!x$Jo@y8uZ<JUOxiC=(qA($U=@DsmaYry0KrmD97a19^@yb)jp2n_*XK14$V zBtSq^ng@U0fftu27uZTM?wH(do5QO8{QrNC$ugc&lf~>zG?zC+T<QRF>FKBc|9i9^ zC}H;KJnYfyoZxYsd2`oRM~`07sUee#?aG*DKAZg7PDP>k+5i6@-3|vpjs;ub(QC^e z!oaYD31rIFCzJK<-I&%som_4&tFy0>f#F5v)Bpct4}a#D`xWZZ`SiuCr~m)I`1<t! z|9zkm!K2r9CP<OVlgS6{6&N2)erT`9wD|F4K?ez@%Eyzn9h8|`o=y&M5a)mW<o|z< zPS+3nH9+><om}P+&!qcg@^uG&#y^wU9d#JbPd0J1WfFWex!BQ}@yz7yj(QTZk3nvA z{o&Ca`oW_!Kw>{Q39vtz{MRvuiSyCqY$s2~eUrC3nJ~?KH2JktB$M5P$!^X*j1MMH zc6MT#`(W~QXCtP{hm*No{FyZFPmXa3VLUW>ql*F4!UvNdyJ$0&JeVxtD#}!Qf3mu( zGLyxF$v&>yO56`%mO60k1X;KXM1WG}!ut@J$$}=b`e&dVk8TGJkR;E&|NkePgol$y z^BVz=&e|XQL80_Q{sG7ai7JF10g#@mdk6ysT@jLC1D{Uzb5jr$fr~PLbco)aT<@kV z^Z=^SquW6OBph%TWImJjy~#J-^cjCm=5*I#JUiLUU0-?bU5FJP#~ma<{&?YY2P)8c z{6)hZkeerOv=E*=+g*U)tqPK!8bC3$>dxd{?sANmCf{@qVG6x7S>MBuN$AexBo7zH zGn1El6f$w$*(~MB&cv>G>;L~3HMb^fc+ccFC_^$~%8kj1hSH4BH^1>tVB}v~0+Ct( zGTidUWc@Y;rZl(7wY~vNCU+;F_myK3xjWghReUm=pFUHo`($&!slsj7KxxK#M;ib8 zlWF|#54>=>JvlK{TVRJ90|QtLoIyBmPj+k-n|wJSPf-P=p||(IzyJR~@e7E`x`8sL z056ngm35o^I^3A)gX?642t_90-;)=FB{8kI2{zNk71_+(n_#yT1QjZ_T>1as17YS; z7l@fqnsuoQ*vtwSu$jd_L1r>?Ol}O&5jf+FY~<PNU?T-WN)#SmLNQXy8Db=qX4RUU z7-+)u*9m0e<cQ!DrqpX-Ck8qpo2PXRY98C<ouPROb{A31T<-`m6H2qLpUfC+!qnsl zHuHB#3ge;4386Xy*Bp?IY`+3G(%e5!arSu>BTXD2MnY*;69=%**&V=U&I?OnlD`ag zXS6-Cp-(Qs4UGxUQ~Yrj#n7F05JRCf>qlF#p)Gcs6(T$t8Fx<3iVWg6&48pGa6uP& zYVzqwX(leK$uA=3GQB-HxglC?^4zFfjISqGME_v?G`TS5ALHlE1+k2b;vbKJ5)im- zKi;YWs+AZR7+#uB?ub)oygYeBoE6iIW0T*+xog^k6m|!2eBu}I5C9d6hh8kd1F8^Q zK_z@^#{d8S)A;pRJIp43ND^TxGMns}7|yiw@Z|X96sF+Alak_?J|CK#kR&>JLxL|; z|DnnM6SSCKn}8KxH32LBauBSz?;uFA-oeQUNl8qn4ov=^AUgSGk|>j(F-S3^#bk%X z2qyglV6`XrgVbj32OIo9)t8BN|K$G(Vw2~mh%j!P{60yPX|^HQ?5urY^(^~9>X+<= zt9RH7Ha|H{lu5(@WIoeBeXxe5d%zm(_kc9q-woGLy&G(SW=1#@&u*}iWxGI1+;)ML z#Af<3J=zI2^I)beQ{ApfSt5e9U;h6;-m38b|9?>V@=}{=a%Y^Hvg2-0G1DpluFV`g zx~GB^cqCu)IQWRogYkk#Z-Bt$i*b^gtYCEk0^MK}z#-px%%j(~R+E8Y2e|BX-ueH3 zcdNo=#}qflw#kKANleN+CtuA<WIQn0JUfvwZt~1*4gR-x{{L?V8^P$&-6}A-u~3ik z$K?OnqB5O-K}q0&hvoy1?zubu{r~U5c*CRfm`~^P7w(e{a$Llic7j~$dLqTcm_-#- zIhC-!klQi2E60s*X$VrfJ30AYjtt|S$-i?F8COk?&9!7qm^?kVgz@xbp1dp;g{}Yp zPd*nXHhDsxFXPV1_wu|M>nCgF`!e-!og9}dJ^5;`857Tz$-H@)EQy;DN|}CbntVUc zi^*1WvUa}AWVS*TraPM_$K^^)b}3Y3ES#KH=*j3lc|&2jnV&zzEe}BD=c7%?m3=b< zBLf4XzMrcIYNrKrc=U>{oZO%*HMzX#0pt3~5yhH}t&^LI7cjO=RxUB-m-mGjsKCg; z@Pc{c<kS**rY`x(z7;x?H<kQi@>)OnLA&JSs6uWgmGzUal&UhxZlC<S)Qa=sI&k6I ztuR@?PJwa7<oGg8<;;CxG2VId3=A(8LKO7Q0GGmXpcW5nul(fIWgg1^_CnMdgVdQ} zQKuw7S*-jb<NnDn%1!wqJRvRwd-=^|?Ft1ZW|_^t6*7!Wx~nE<R~9gGOukd8&ceJJ z6rfe*OcE<6H&nSXH-BK9e5|UT(Qk5nl|AE%$!*mW1nw^X|G(RLgJtWTfB*mU_iUc5 zR<nWW?DEOH^@{Qr7#J9QdY6JysBh=9X4^~`h`r#d>hE%JRpll=Ilta`a&GM`rnf&Q zE3_-Je&QEsP5_00=ayw)UwJox8iAljA1Kv>q(Q~TCw>8h1gO#ciC+NHFzyED4tP84 z1<&fqj;&gg*K}kuR!rupH{ug<g17_JH+ZpPvQNDtlbGn_{Q7O2`<8%h4DOih*sdry z1;TTl@R`4k_qZsi@C^qwMo+zvT>1b1<aNywlUo}UrEMX~yjOtQs12f^ayJ4TIW?k_ z4>qW){$30*bi*fpfoPB-UQ4i|nA4y5BTs?+_JU*aWWh%5$Z4CwDwqC%#PEYOevKoa z_ywCmZD^2xL7G{wi6Csa1ZGDb{KPL1j4*x+SQN?l=E*Y~bwmUqrmuyX{vwTE<LKm@ zjZ2vL7EP{i(vg4h@Be?F-lYux|NjR^*L+Z)t3+r&IGBtVP4=x<V7e$cIk3%mvV3zp zW7Xv4&0$REeoR(q*O>gWT`FhQ0<i17J3vw7@E^p9Yy}zmi60amg1ryG-V$JaC<yMh zfTR$yGzX%a_lO|Kd+;_q)bAiKMzlf<5N!SMZ?b*6a=kP}i}wVOg&ue;48mq1FGM%5 zDVl|l#D!`hB*+9>L9|DA>xX}!YKv3j1gKm+@WObqL+etezImWTuLjCgptQ>I9~_$S z#IIxxNp#@EziqN!n<8Vw<bbwwj8iAew`+m|kg0I)WY!KHZ|Aw7pcC+(@rgeM+}8oc z2q<lJ@qxn)WHKV$Tp_BvA!!8SY={QIR)NWO?J7)H=1fj$*U4Bm2V(33bYtK0Vlj3F zM0GcEXuyoco7?V9ZtR%C<TZOTZ@qXuyf0(U!0<w3HcE%bboT%MFDA@Jba+ZYiq6jj zDN57hmu~@8dkp;Y44^KOW4KSRZL$#qgJYOy=QYPr&(5!oA&#AYLOptQON<y8f_*gq zdNjY`c;P?o|9_8zf0;|<4R7;ruIhASn>0a}(R{Mrg!4=e>o@<O;KHb2WTs$dqF`vI zV5(4NWoTr`V5neh1m_!@P2R{PJGo(!E2G)uW0RDWLGDOBd)5&|GdR>cfK{8CDOf6` zmZj#ESQ#1^P2R{PI%%?jB3KC$QIM0Ems*mlpqip!rJ$OV#x;4Nu>NF&$s+ZZ3=9lL zAZyJ`6igKotqcu~6by|lKn^oiNCI&g7)(I&hGq(83XV=zhDN3!NkcOQbA>b~M=L`k zGX+bqN5I;ROcV?)jX)~E+Ko&Y7#NHdOe`SYDz-8-Hc_xJfbi0-4C{@}6+l*kgbWml zD~n4~bFB=GjUjFV2Th`tp@})jK(Gr7tPD-eU_LX3I?P<5AhpQK&<y4>GljBDD?>Ac z!wRen%}hWJK?+}U69qGqdWcIBtqjdg;oc~)GBihXfrT-$3oMKnwDf$OjZGLJ0jm$8 z^par?`?8MJ_MDWZ8v_G_g|DjQAt((h?>m&4q@Aio*112dYO()UpE-}qT2tMXfq`Mh zf^1cgLJ;l5z@YHe`@5EtfUmEEbkHe#ZmIi0j42mg7#IXhMc6D4L1`xjh6?XphL%oK zmmIqvxUbqi?lD(tlazof1H+uB_v9T9L1`xjhBaYvS&mKzk1u*yEi=)6o4&em^&w$b z2L^^STIcvY4nb*<3&rF*y_{s1rChuBa=ZOC83|vGR}Vln=9F13ejo>eXeS1ShW!^A z1DqyXOqFM3m>e)wryewfr~_)fbpHRpfRTZrqv!ws6O0TDGkX62f56DVpwa*Te+MH2 zgW!b!|9>ztFnpi%|Gxqg1B1}y|NkAB7#Pea|No!B#K0gv<^TT{CI*I>DgXa3VPard zG422V6HE*YUuOLO|AvWyVZ*Hd{{@&C7|zW3|KEg}fuVWc|Nk+}4D}553;zFaVP;^c zTJ-<_8fFFt=B5AtUtwloP+0!|{~u-shG{GQ|5ssQVA#0g|9=-228L@Z{{PQlVPG&` z{r`Ul3j;&an*aY-urM$*ul@i31PcSh{dNEUzhGftn7!fue-2g#28T`m{~NF}FlcT0 z|3840fx&Le|NjN73=I0){{NrCn$Ey5<Iw;A2Ur;xG_U>t|Av);VfyX=|0UQM7!KY2 z|KEm<fuZx^|Nkj$3=9>|{{Qb`V_-P@;{X3GYzz!mZ~p(k!^Xg{{r&&{EbI&nzd!x| zufxv3AoltHe;;-R29MAG{}-?`FzopJ|NoB3H>asf&FKCAUmuj(T-d?Gz$y$344|y$ z&@owRx|-pRuK)kR;vgjq4B&BPQ2%^G*Z=<$Km$Qgageqi1_lPf$%WI^na)p`Ja4Ah z<PFm~m`+WYyl<x1<O|a|K%%#%D=~FXocwRP9Mgu0ljUY8G2NIvS#E~h<b)Y4j0}@g zXDBnxm_E5{h7!|+nUmMeP-B&!{r~@-$s1>gO@2Rvmud5y$^T}ku^yZE|9|IX#+hQ1 z?Pv0`sxSQiUlzpUXJg`F=K#3`<T9DXlgnnRF=Z{8Ja48PQ|gk*`(`TDr!D#aKNjR{ zS3ZF@CTCtY<`9q`1{nqh1{r1shQ-VN|JMg~CgAdFj6CcdV0jy628K<`|NmD+k(YqW z$1pQ6Y+mvIe+-IzFkHTdnL(N1{mTFU_n;`)3|0Vg^&DmfhVIpqn`Wsoajc!ZYL*<+ zrFD}}&5~m}wr=vPSxQWkH%#W6t;Kp_&;S1uC)>`J5Udaexs3tT6=`5$U@*NfIc>HU zQ~A}&lV&Ti)?NSq|M+CXIbxH~&*o*7z5W0H`^gVyiwWIefd-NSD+9xm`~Uxkg2GP7 z4ipX`S9q{8FbF>S|34R`S161bsv49$!=C>CUkesag9*=IWnftS;{SgakTAb4NEj5B zptO7Z_2hXorPv;@GB6x^J$c_uDK1dnXJKPtxbS-NsX0!ZK5PsOKVJX;&$?N0?q^;} z*r+^g6dpF}?l)O*jW`!<yxh2Rveue3!5`3}cLiwrdog+88hOSKlMk+u7laPGgCh+j ztuXoHn)!+v&}7UG5@KLrh~R}VU<2$ICU0Du&nUK8aov6<CD>@Y5JU|FXgmSLgpIa; zoHBVMlicJ78zwW&7oEJ3NlXw_UNJGWD>6Vw`1vN!*{CX#=>X%GLFW+u+JTgBe!VfD zm+{5s=>2<n82Kklo>4RxlK#iTz`#7QqfWe-fl->z8^o*qP$yo&z$nAT!V8jXuVY~2 z;N@muU}9vl1&z}EXPaDjMxJZFD9CXP43W%}=YM*+x%q51lWYfDge^q043yp&7#JAm zEM;b35H4e2?3m1bLAG8Nlo7z<tSk`mO0_Et3=B*)4x*7t3=E9bJZBj|)*h%6O$YI7 zq5KndqO(B!IzbLb1_tJu1@#Of{}mY+7_->ISr`~LSwQUVgqsf%70$^hW?;-x0NDW2 zB0Tx{1sA(hP@AKrK;ld_4q}N6j4@DqcGQU_F)+qLc?ar5KY}cYgYr+*iB9&ssHY&t z3UPdpIFb>;P(=^w#3oO_sH2bsRpcp+q{s_N(c_Ccj7ug9TykXn#>&7TJ~`}?9HZ#u z(o1@b9+Q_`QeqUFeEgCg<E+Wwz--COS&U+nTP~{$@!3N>o52mC=d(?o|4DW8qswYC zOcfrJxjsy1y6iT2@dsT-@yQoI=rZkgp7c?NX_nJuy^kJD*^ZMdKE^WgO}_TglPSe< zvf`&;tt>7E1{MZTVa>sKSeSu<=d=q0gRe9L10n@MY%171@6%qE`fY3=AH4_7MKCZh zxG+N`8RtZUd@StBz`(do^ePJj1JgtXkpc$BZEAfi3=GW04fVpeT|klskU0KPE1Jl_ zxSb1R7<2K1I?)OS#vRb`X{ZyeWMJG0<#p6C2z>`>T??|go}s7-Vr4Dd>c?=a*GeE+ zy;c*|>b1rYt8dhbmN77{gIax{4&;#aP#(k~8=zJ{s0BG>Bb4`|mO*H1J;)_XKrUfm zt%o=y7w!;aHU_Y#mq@~F7A;6EVqjbfHT^)HXjvu$<1#4sK^=q8dXRaOz~*hJftVKx zPselF7#M`XVLAyGruCpeodge5klQE2jROVZ6sT(<fjAY)0|nxKkX5Z<s}7b!ta=Zf z7G<0Rs<k0jwMv7+kh%Cn9muLy9k5p>USJR{W?*dNs)t0_hB~onl@K#xpw1P|WMFLP z4F~7oGqqyVL1Xp|3=I6x(m*twfw5BvqWeM}0|SGQ7bvmRfZg+}7-H6Ocu;n+GcbrG zGBDPNgY7R~P$!baz*wUk3*k1@i#j?nFxJAnUMrgB<jBBS2jw@^F$fuhj4xn2$<DxV zz7S%(Hq@z%b3mdX;|nCf<`qDUFPMD)r+9rLTVf7GeI9835?o@%alm3CQ4Yjrp7^2; zlAsfHA*t#?ok#@(W1=<4Waf!?>cl=l4VeWEV^H`c2|~i>Po3C5sI((gT4FgUdXj~% zfKnAx9cYq|jRO=D;-E%0qYm4J2#BL53PWhdIWe3J48o?e3=E7q8Xz{PFo(pUjs?V# z4RsPhpkUDBOyXo<V3|0hj!i-eB%se(1{T;*$0orB5-{NG0t+0dvuBf#2Z<PR&I5~F zsAH2n77MX+613E@=44<1`Ns$v-&5+uu0oX<Og8?l$r+Ie(XeoG>TjhikX=%s7COts z1$Ar;U`-(FpkgavVjv5lVmn}Bn>ZO5pkgQL*cha3KyH)e0)<Sv55$s89th1i=ker^ zzvY<9yfzE|abZ<6VPNL7;<o0t<n|N>%@K>4Ffel<3y8BaF!OD%W@KbxXXKyWz`>|$ z@sz`kqlHzFNkxQJU>++kb7cgppcyN-3M(s<j!-iz&r?=L1|}9p=9Ch)2sUO}rf5c{ zGzLaSr|ow+7#}g&X)>uvF|A<~VpV&>D$7yED$k@T#LDxDRhGk!Rh~%~%ogUbV-@5O zVilXuD#9Ve%Cmq~lexT!m64fyyEG4@A`>Iuc3VEiD~yab+l2%edl;F@yrwS@WDJ_l zD8y(t-9U)3oY8Xn3L(bZ`uYq^EX<K?98W-W6RQP?Vq3$?38Fu-aWsMGCRS$<#m1y0 zJiSwxF@-T~`b1GiamRVAj7(Z$toF=)3apIGMof;3thP+bqO5{U6B&hBIZIfTB3ZSW zjD=W*POu6v840uU&tr9KX7yjgDt&@gWeuy|bQclExvb1wOiGN?pNKHV=}WNcF{y|$ zEn^g7m43p?#}p>a%FA?$QJ9r=9;-qms|J&f5G(H|RvxC+j6$s3Hq-M&8DrE0nWBVQ z#hX}pnAC(=1$Tp)5xZG6m>l_78JS|mS*4kIIX+E)E6S+iY_N;fib+d|)gpq`WEU%s z7pv<8R);25uU)Jj98IiTpIFtKSyduf<#(}yR7PM^H$6m*QLSDSWT`61D5WM=i6&O< zU98p|yI7q+fsEtvVio<&id*(Gt2L7&FDoNco&>7}$5*Clkl5y9@)2g01Q{#@GFZcl zRR%=s?qYS|*u`qw1ahzBXI7A;5-T>@&#V?OPctQMmlkKNaGgFShVcuNhQRc$SjIla zAJZk{81)$~rYFWRib{(xte6f-_Q)hNgDAs`=@a7^MVZAIK7bhFj1toi#xaUc-xtT| z#iVd>J6Aj-8zZC3bio8hcSeEfkqM0bQn1#pG}J86VhAP%0fv`$)0q+(^#oyUW7smE zm(v>)808g>p{-(cZLozZs?!(7Gs<&)0u`YQA`C3^rcX*_)MK)kHvLc{qnjkG;S9Bu zK^I(AfZVN^#CV;NZ~D(9Mt7!kpXpA?jCzdX(+iUs#hG?HPwz@*)MHXOIDJ<#<2z1x zEj)c=3gdD{+3As~jOvU(rZ=WCx=W##ncd6`3_=V746~f3KT2hEV|+1PGmTN7slsD= zR2pL(C%jsmelU&Eo)g~En9iBbXwR59-7}rh9c1yObjC6e&6UBZ$LKNLGJ{dy3%2A1 z<{36th*juy4?k4A0UCCxPz~}>@n6N$H)SyDF<o|>{s?5e!*sz+#(1V|$LU3xjCzvj zjqEQ_Z6BuZ%w*J8L~lbVut8h_Z?8?~%wlY3D)ZVtDT~pKoAJW*o288UT(HiHhQM~A zGDbH>#;MaI%Ng}KVcnh|(<hcQx-(g@O}|yns3&NFwiYXAx?}~Tz91|?!svwQkrj;k zobYvB(<fFinosYjU=)~sqk_?Z7Z(2#YZw?9CLd%Mo~}{JxPeK5ar&)FMm;WAh$?KH zE>y*6$E2`vdQcUk9i#X3iB*jDoZ6cpA$NWH%_>H7CZ@mBg{m3tIKQ)kQxU_4>5<ip z=8VgyPpoFN7iEZrh;~5NqJhRF?WaGjX4Gct$eu1#!)V8qQ3O$v$vAyhF{2y+u2fO5 delta 9715 zcmbR7i}lA3)(IMn785m>b1e{N0D}d>6L0Bp9nA!D7>;I67Gl(MRN#ehVKjpPgwM#p zz`(}9!0=%;g#TeT8qEUXOH6KL{H|Cr6~aTOQ$WTrFfgP{p2_5|h|4Sis96G&Iho@{ zK7HE0vPd<cX5ZOHrv>iX`ZXLf-#6DVuVG<&aA2|)hn^(IL5O8AvXp^=L6AY3fnjnX zhr85+0}ycz2*ps!%)lVPAkFaLz~)OFZ7lUapdNwAduc)y?t#!S@%i>pKAO0MH$+?j zO<b)LA})a@?w|${SAd95zRoKsqyb?w!0c+V-z>z($H@3$awdPjB+Lh_3=9m$5X}&B zv!K9x{>cI&37ZtkSXIqZ7#KWydG{xSC|gjN{1=Uy#lY}of=92d=WLKDtJCD!su~=U zV2-KK<kPCwOh0E$=1@~(x;SgHftoergvmK-b0l|2Ffe#@wo3f}|KFo|FNk6&_4DXu z-7{HHU72ylWLNdM66UH5498l<|NsBb;L#0H+Ijp%smx?P4RM!3Lk0%^ZM`5_k8aVc z84L`by{!fR|Nrkim*&BrcgUmj_=_YL2AIx$Apd~Gn57vQc7Ql9jN~VWYIrhf%T8XP z@sTlW^CZn2My9`0H)(q@F>c)Kt*gt#*u1$?|0W~j%FV%s?-?0)Zgw`_#>mLD`IpH- zMn;Ftd(3i}m@c<(*0NM)n%rq7J$bJdw_4|38;~QmT7Z1kJ2&C~|Nowy_nK`BS{WD^ zN`&?&FfcH@5SiR-EzeUD1_}db4v${elF5mdij!|zoANcU1?gvOUJEjSaWbEcTz%V% z|NlQZ@(cK=9O!NZ$$GRNs9^u(!LN1TwWvquA&-l%njbKFa2^5)9s0x{ao`hw<iSt; z0=zL{3=E(6;|`|rYn*^+z4)T@01?_F4u0YnYz+W8zISr0jY9qN=P);%=xzl$jR->^ zZrB@&>;{lllH3ph3dior>uk6gWhd{lkz!<;eAOn0we;El{~nVyt)(X?+8S$aY=Q)? z11NAspZ@>v(R!eS*`xEYN3U~&$8qM(U0WSJdPVOCPu^==#`O5<WK%m8wY?y9-3|vp zfdfi12RwRhBZC<jb})fV`TzL;{|TO!cPCFMG@QJ_j-ToKlgS6|WOX<i85mw1e)9i+ z?BUP+a=$`7I-kCH^5p;j7xqv8|KA5Hd^~z>A2%>Cyr_FTnaf^*QD?HYy`Ie5NB{qO zbh_T~=ytua3zYo!{Rerh^Z1Lyk0zJeD{Gv40#@*%+w}<lde;M;2RsfwU;-srQ;5We z{Td)=sZTy&AJ0_&c(S5{KBL>@KnER0$;ovNwoK6vC+~G|W)z#u=%~k({%EqHqX<*r z<H_!hIZVM1CvSE1WaOCq-_eBW@x#fcPLWI<_a{$q@?q4PeAmf|>G}Q1iq1w%haXH1 zb@pc}x;J^5a|k2P<loK)Ot0@x)^*XA+;{)~e~)h0A0FKf0-Yb>nd$hw$%QV;JWX)f z0)fefZi;fDZ~+I7ogm+Wy$tfr>wEwIgOuorAt?b#gx&rBf5J(4n0hq75%B1&{jnbu zqAxNh7r3a19Jz;Z1W3z~yAZQP`VkTwAPIetM1q5?a2#BM0VE!O=l}o7e2$7jT5xd( z36R9BJ0O2BmEN7K?55A?GC9~yhf#cTgPXqm^E*&Gk2^?!Jn~}NZKy!!@fW9VPd?|S zt{+edNqr5V2>Jq&ho`>g1q=)fo}EYGX^@r2d-5zbjmbXl+D!9rPp)(~WQw^xd5yaZ zquAt+?uAStw>PJFursk|-~9jo#j%@{i@av?TY;*Z5~2NI^Y2}soM<S`D7e|oJAsjZ zeKEvpkToxwuTOqhqrf!5b@Fka0H(S-lO=uSnBwkCPOKB39N??Z<nA`P(RZrwg{z>H z=DZ_~|NY4{{`Uu7^xc~57p5&x<;uVS7W3fGJMbd-7FgecFt*9ep?QkwAWgl!2mby4 z|A}8f^nwd0Qw#7yY1Rualivp$Gc9(R+!&<D$TK;?Kbh(E4Y0A_oso^*aAR^}o!I0m zzdXg$m;e9wKo}X~3^5W)vxYc>jZ}9A8Oc=eb8@185|jURu$k3P$YzRMhdPyYvP?jZ zg7zg8bFVl;%!SgdS0=v;Hep)sIJq&Xm1+G|uz9~7kj*Q(3N?>y^4`Eag^mj-<^?)H z%!AUbfs-eOnlPz2fSftmH6(?J=L*=&3VUQTFJ6Y5nGl?(`1Bl#ndj^vW<qJ!b9P|A zFSG+2`XV%iDf1H8(66@0hU#5{8d{?0bQZ-xZ(E3gP?~kM4cI_2Taba9yTdgY8JQ<< zi3rlMPlqHRaLKv&B(&u8>^$b#>z3fzdDQbb8>H}LHL;v*6gijCeDa0JkDR6;m7Q}n z{!hLbDK_~*)GbDv$-ATfG1_k46~o9VXMGHm#K4u`@m3X31<t_0@Y0bRTpbHczEGgR zC_DLAtQFIvqm#|z+>JYrf-+SA$0vRP4}pCzm>C%Mg9uQmeCWmV+n_4c^}r{7f!2)w z|Np1)>#<sxPBusqVNx=k+?Wu~^z+c<`AI2ElMhXHNQ`4LJ~VkjqUhug@xDyw4^FmE z&|;iCSwBgXsn!^**yJEs@wo$F#d!xNFGx&c;yN(dK0$P{WRfV;J43M1Hw?k5^Y?>Q zbM6PLUbzo!w0){Clk2|8_6cH>?<b2ec^ZIq7#o0ftlA6K;j$O3<H;Vlj)py8I~J#k zGA+>q>*&)1>0o?1`Cxh~Q~hqR2Kn7^4ZC-Nt;kFdXY$zvHuTv}u$s1=U^R0ye3_JX zf(>QNv}M}2bFxFGh*<HL|NoD-D!>ALDI)_zcdNqW#$-1}pULJ~NlY(yOrD*U$k;ad zZ&o6s%H;TL4W`VylRLAmCH8FxMMJB=|NsBH9ULsdhVb|B|C@X#TauA?^0#aku@gH$ zN?cE*co?&&f@-7^))!B<PY%d&)7B0_N=p6Pph*c*2|IXp9z&FYMw1WbBr+9jpKPBm zJ=s22mQihTY;Fnn#H}E+r&j#`|9|qjDy7N)a_v~2ZTbIy^25qx&iXB2$%6lr1*#<{ zAI;NZOqu*4&zCWDvR!@<_odBXSro16o1t0{YywLnv@&stPX3rDGx<z`3ge>59}BD) z%_r*=dNT4(E-NhOyW$7&#{*DtzGCw4LK&vd3Y#U1SQr^gC(9LUGI~$;C|<zmHTh++ zG5=B@h++js28I_WH%!(pk!N}!x7nvejgd)U{pA16l9Lq*xtU(An>?#jmFe-e$p=fV z7^hGEQ>wv~w{G&pG7V+@ec&RMca0na!;AEFU{3E0a5)=y;uF6B>ukBng=HSfNA`lH zcpX9N{;UOaP}CX7O}<lhk+F61x^h##dma#XfjzNl^2c%orby|@J|#Mn?JGVoeO@`) zu(E)Il?l{jZ!Q33NT!pkCZDdXWV|<-zuKO|{X3{#{-$Aae^ouBI7o<b^<@9*2?EQO z|Nr0Zyuq^d&cFZv`FplaeqX(TaoXesHA-@zUXV}kQc%kC?R?g3`^g#N1aRGSZ1RH| zMW*>;lOyVlC)c*kV*D`qVyzknC_j7jIyX$d=pZ~<z=}<?b{W`X-VJH|8W%qC$6fry zFVGBXM1SHJ@NR&%Wlz2Mx@vM_-DIZ3rIQ!dC{7ly7vSIP2(b<1iWd`?PF~%lz|=1? zIih|W<MPS;4VrSbOTZ>OPx#DV$NND9RE~y&8pfwyFs=Ome{z4b#N@mNMQJsNGVc|j zpkFBhDn=u~(Xdox@~Q@P%_ob&#&~alx&<T`3|1TkRvdE()cAh!cG2W-4cf8Qo58B* z{(!{ijWm9Z!=LyC;XVRu{4I>I<vW-SZaHJI;v!fUYDLQAszx1=Pn*CtEQQ+eAdO$+ z$mCs(OPJm-oSe|4BL@=q>0Qe3|Nnn*tT@;qg_FqSRZWVFPLt0x?Pe^R+|eAy_-yk1 zX3fddTcmQj7k~}+o&bsgkN+S}WGl$DPyC<&5$yc{_LBfBlOVWQ2T8%3(l2Tux_O@p zfcysOfq)DGMK~ycKJiDiLJSaW{qS${|7K;6Kl4F$2zYmZ)Hz_W@CDSuVgW1`zJuuI z4HKB0)gr|YRSS0H3!NpC6YI1lKWVIDYM%#6G3uaf0qWs^I-baB_O=xybiiqL{XB4c zij!~h*(PwJWjgwG@`Gj#Q1CEi&7J(KUB};MF2vCbKJmwZ`%Iw16O?og^MV}-vH%e( zb`aIwuuw?j*SPVCKVmLKli*x|$^V*Fm`=`_9NVrFIC~Dn=ov7hIly5ez^a7J=(!Np z-H^NjN<a~<Pz}8x<6pd90M0VuvnMaC5qEeIJNy6t7dvKy`Y~zz@-7Svpx%sQxKFR` zY9j^)$1u;%YmT9wonIY896SGndi3h<F=Ai{_R;+7(fo$vMgQh?ok47q1w<SsP0(dD zo2)nCJd?!N&HpF3Fe(@uD43Zj7@8@VDwJ6n8W}PeDi|BV`6dRFH!{giZkXiCXfpZO zBqd?6tf`rTr9x_1YF>$zp@Gq4>B**(7fcqZw_spkFaqf|Gf^;ANVGCEG*mD&vH+QH zs*nWYGBB8c<PFUf%oH4*tPBm!L6U}M3g!xFPL5WFh87BzW*{Mmb~6P-OCtyuq}>cO z-l1S(0dZZim7$Tjf`tKumu_WPZ)~7oXlMi$GEgY4EG|jSwK6m^gSZLo!$d1X6R>~5 zE-bJzG`0kF6F}G)>M(PKg47}_Lldwwzz!|Tv@$d?hdZpm%Fx7=fdQr-9Bihh3T7tt z5SJuc8G^zGtlw0jz{=3n1l0v*U@yU3U}gxioq>Vj%Q{xub5fRWvu1+8%KdYWC~PRo z*l1rZvd;ZsRg3+<%z0ean(D4mDc1M>d$;eGWC`Qb-L%(Uz}MG7I_Q)=cfHj8AjXu7 zE`}UyWTH||@4tEOd+_6>r|qXMId(sAU$uSQW3JRDDFIjWPRE3&7cT8L27}A?2ahj$ zSS>Trew)6!aP=W!*NJay>`mit?LS$zZ@!fNU3=MODcA13+-`qOM#7il)dQCqc|y$x zPCeXjx#dLJzWI;rvoDIg^gizEI{C*`@yX)TRO>;5dfE&O3@f_+|DVAKs<i(9KfuVq z5YhYp{|!*h+yDQ610w^&#R>oae_&)_*gpCHe+ecAhD($G|F>XbVE8`y|NjUk28QcX z{{OFGVqlP&`v3nNCI*I#>Hq&9U}9j{GV}lcCrk_s1+)ME=U`@F=$ZTfzYa44gY*3V z|3jD=>KXno`2W9#nSsG-@&Erzm>C!jFa7`j3^N16v=#sVe_>`|;92$mzYGflgZirf z|7}<p7<^X!|DV9Zz_4=7|Njjv3=B8c{{O##g@NJcy8r(VurM%$ZutNI0Sg0z;HLlo z8CV$@wr&3ZUxSr_VF9QK#LB?1W$XX{8LSKpOSk|3-@_Wuz`%Fp|NkAV3=GQG|Nno& z%D^!3&j0@cYzz#0?*0F7!p6YR{OJGx7&Zom{OAAwx3DoVEP46={~9(12FbVo|6gHa zV5s}>|NkF028MN?|NmEEXJ9z-`Tu_pb_NEEFaQ5fn7nYhx>Q2n|Nr`+l;gq<9*|XG zU|=v|U|`_rocw6InrTD#|NmfdkP-$41`$v}$-ux+(f$Ab1ki{HR2-zOhk=3NX5at+ z&nADIDaL=EiHDs-hJk@$3j+hg^of)6=8AEFxK|h$7$!}e+&5Q@O97NxA+n2RC@}?3 zntW`A98<-l$y_t#*kTwN7#2*K%r#Sq@x)}^naWHFGbRVkRAP;o_5c6&$qQ$SP41t` z%lLfq+?ndE)pP&<w+7id`Tk5^roQ=;-_2BGeZTPk|H~jj{yiY4fLsW2@vJ42?PjSl zy;wRqZ?4qjhFL63kC#sFn=3VW!7L7@Crc-<nkC1ixMK3DS#nGUD<{92CC6mAYBJYs zIi}pzleK2cF>$V)>@{1>scqf=|F1x!6s~*%ZA{L*Y|IZCdDuA^Kwf;p%)k(^;s1Y7 zU@^ety+N`J3?M(VurM&VY?!=hwi1)zrpec4Yw7vz`~P1QG<ptG9njC*$I{E%!`95s z{6`3^71ZnoB`WiallA6kF;!lh95qLYso}=tx;bjP@^}9Ke*+rbh8f`3$K1=(!`jTo ze3gZVode{11y%-z#}EGhHw6WXkQ^*fJXjeRK0NyWzjSir95JCdW~k}{Rt5&!XaE1F zf`$EH!ZTPI7^+_W|8D>iHkJelgS>Qrm4Tt@4R$Ysl86ff0|O`lSG<|LX|5Be4jTi* zf;a#Fvu<Xb_nvpMfXJ80A69c{!G^+NL*KBWZrISaK6D7Z#eTBZnl!;3ogkwjVG3e> zn7nX}JmZha2iM38LPx>D@d1*PnEY|ge8m&|AT|R7JA`70fKE!l#>WdLZ(N%{`3Q^1 zWC0PE%@yl1m?kT1oXiv|HhCkHn4k^=0|OJoazzH{c>0macQ&eubUMKJI?xe&K0A=| z&Dxvtc^N-!p1prB4<p~?$TN!Og3|wZ7#Nr*cGQU%GcZc=d4qVhAL_&_7#O9wSa?Bl z?R5-n9K75N3`~qnwxGc$dG^U0&&YFyib32Q$vk=gr<a=#pUq~H?P22swd)ud7|K9N zk%57Man4d^1_t3W2F9Mr-WO!+FGKSv;~Z5Mh<K$MC<ijtIEV^MFfcGy8qH+@S-YlA zR9^<fcY^R&)QLqZF)%RJ^PC0CAE*;c2k{%B{1bIzvq1bNK@LU+2IiUt^$a5a6&V;9 zv)Ia67#KEz>Tm`I9)?c11Ii~~z7S#e3hIn#DX25V6B!s|poZ?K6Hj7bjD_+J)QNor znHUG<pQsa?oOw}C!HgB+lOS;<BZ8rd9@L3X-hNR>p$V$UQyNK;7m_08OFE24CL3IG zWEEp$U=W>Lc1ey=Z1U7gdW;#9k6cn>6rcS3k{;u($zqp5Y|G18jN+4*Tviu40-dhO z;D*G<Ube~mKdEkJx}qk-q~|$V>%(-WPWQ=&Kj<=^o&52GE>oe)WQC79Oaac5{XTjy zDLPG_@iCV1$mDMyJ(;AOCOdu#))M1lU|?bJVP|0AU_30$z`%3bg@M6Wnt=h4o*-8B zZQl23FH8MGHjtOTfo2vM7#IwgA(D)9>_J`@c4c5-Tqt^#g@J)-B7;Z)1LH!qJ{ATB z=HiBW;oB}CNdriXcGQU`GB7UU0vX0!{Gg6O=sQSy7TENOprLgJ28L9)>8oL;*E7zN zKr()oCaUqXj3LIqs1+?^V4Mv#{s7prIZz(RvaKM?CW0-KsfTz0G=m0WG0yqT$^drz zL`j(8q6Mi%42+Ywt}xVtJaeE<v@DZ>aWayD>p=!~gAIIM12Tqz!4#hOJlPl+gu!9c zjT|=J@UQ`eMGul``$4AFfld2e4lxZ}zA`Y>GceA%0XMEr8Wa}H#UJWGVO^&KcJIUs z45GyhjP+3SHq?n-01Xy1Ffc?yT_l>xz}UbW4$fL<YQ@e~L9F11W@FKG2F4~KNX%TQ zV_;wq@&d(c3CKP53??NI)yLtHW5&+FAd<+ySRxL#zj#5NND>2Mi86%OP%rA}#K2ez zb<TrY(KIJV2F5ZdzoCvn$QWdNK3gd}0|RFf#B^<_QyJ%gL_wzKOMuL)XD)ykpRWSq zG8Z(|!^$dg9*{8!Y_oG9M&yBJ7Qv+w7Y8i-6XZZ_=7}%rAjvU77m{8c)QMCuFeX@o zEMuN{r%p^K7h=dPP_@RuzyJ!eM8R-y{7?K-CuRYacZAAIEC)qd5;)YD>Od22Y#gAt z5myH}N{6j25@H^>o&`IKgOh<l*i@E*fl)^T#0C}2kVK+m0dZtQokS2ww;m@SCj$e^ z#2IyL67f<X5q(Z2u*ilwHVHP6fB~l&Sl~b%n}j?_z>w1mEO4QYO|m8qV)q<qq4Asp z;vXYu5|~ma)(ur+HF^1OO-_j{hz9A&H-9VDgRGKrVgR{dK^+?dSQE%LsMrda7|24X z*bbOj947+<RP00@8-uhB$ZfJ*ppcREg;<iw1ECq`^m8(RQ?48zNFJ1`8Dt*2a5FG4 z3UYxWTgQ8I>mL_ZK2`>1J}Yi(ZcA=YVJ3;G&5SDBe={=vU}NN){)K~4)#4dP3zLd4 zt00FhtH3-~UgoL@RzXu%ZWUHmCLN(>R-UJ<j0{XHjLfMeY!PhCGEC8oOlb^^j0xKV zIT;@@#dtBPNipqU6k=6-!phB2&dO8DDqF@X&!j2Ds>-A-#H#;^RilZOhe=t8Rdx@n zJd>^vs~Sk$@Dr;hR9tuut00FEtJr*25e^|%o&~I4%*9QtjLiJo3wan7nHZ03pUlU2 zg^`hSdxijG4<nO~_w;Xqj6s}yUaTS|OnaDwr#lHTx=f!c#F)Y8JpG>#<83x)1|}Bf z$mxnAjKb5UMHmAa!>8wpFv?hovf4BIE3h&$8!|aEvf45!i?RwbO=J{i<t$-Uie%Mh zG8SSLI>BTl%*sEH)v1})dkw4j308$QtXk8LiZIS)W>ONJo-WE5rz6R#$D|_4w2V=R zRr(1lA5)kxD=*V2MqyUgd93o0tm;fULaaQWSh<;2GYU=rBFY$}tj-iA%&H6WvYHU9 zWD~1=6Dv;ys|J&y04pO?tSGBA$Jgm)VvH)z`ny<ln6!jgEt^=)BUpKMu{uv+wQFMa z*v0C`(ZtI2iB-LsRV9K|eiti9Wdt^L)9;Egs?~>pY)k<emDt1@-o%=<i?xbl7i$ya zC)WBVRvs@_*-xyxAZe{8R)r>3<6W%I9J^S(Ke2j%Wv!Vk`B@p6^2AszIKDDXgG4bO zlaDZK7|39Mkj_*u)<_VYwTrcuV;5@`Sfe6`4XYHBmXZ*wffuU^NZNE4s|Uv}R#&jJ z1(PMj%S@)*mxwb~xK5XjW&Fx?f`7VD9Ah8jj_C{I81*G#t41Kn9YQiQh%h{ueld<w zlv$MF!*s@YMsda;AWD>3oIzo_VLW3z(}M%sC&e?eF*34DpP9hu&L}bcVFF{nR135z zAPq5z0W?9%#2~;h-+p>mBBLIYg!lAaiHvH~HzYE0aKhTMBGWmO7}c3%=1w<CV$@@* zm^wWviP23G)?S4g#h?qW3B(wFOh1^!c%AXc^qI+w?o6`2(;p=>>M@?3E||h7&Q$0! zT`PrAkLkgI=}{?+?>ONV>GZ%<#^sEcr~gc4RA<~VT``T(T?)PY>t<$P5MmHu2ymX> zl*Z`B_+k3VG)8?UJ<sXC(ir17;kDlM#B@e`PI!Z0`pR@hd&b$*U#2s<gDf`6U@QaC zt1=k%7&)fj%wW{_f-Nk8d4`P@VikJT!VeX9fHve)p&I0&;wB~2gEATQm^$63H)S&F zF)~cwn8_H=r06tVD2q`~620;J1*&bs^vEnmeMR(EfC3xD74VkR^p#nR?Myn}+l{gr z-MASGrdO6R>T|*R2q*ZrZz^MSV`L1S{<EA>pA**G*fHI(g3+C+f^~XT1*4uIEKR}a zl<7Mw81)4oOoR9ZMmtRZS;443J)@FQV7f&mqX8#udC-sPg_Vrvg0T2kSOd`~F@0wx z<9?<G4AZNs81=YdA^Kp$^i5TacAO73K$K}uS4?0Op3YOvsKUrS-LRU`p7Zrah}7cg zmDP;qOnrZ*Z>nar<7{RHrznQm(|=Yonls8xH>_c_7p(wwvl$o|3iu$Jlo=Qp?54NY bFlsZs$eO;XhS84eL?J|DCgXIg5=J=yPjiBI diff --git a/skeleton/main.c b/skeleton/main.c index 6d1b517..f90a6d2 100644 --- a/skeleton/main.c +++ b/skeleton/main.c @@ -8,7 +8,8 @@ #define SCREEN_WIDTH 1000 #define SCREEN_HEIGHT 1000 -#define delta_t 86400 //en secondes +#define delta_t 4000 //en secondes + int main() @@ -27,11 +28,12 @@ int main() bool x = false; while (true){ gfx_present(ctxt); + gfx_clear(ctxt, COLOR_BLACK); // TODO : draw the current state of your system show_system(ctxt, &s); // TODO : update your system update_system(&s, delta_t, x); - gfx_clear(ctxt, COLOR_BLACK); + if (gfx_keypressed() == SDLK_ESCAPE){ break; } diff --git a/skeleton/main.o b/skeleton/main.o index 9b6d64646648c61d99e16e19d24a0bb0f52d30e7..03f5121b40279bc3063bec263cfcd1b274a910fa 100644 GIT binary patch delta 231 zcmdn7o^i)|#toktCmS${O#aMhyV-@wlabMUav$?~CWrN#<5}Ez8TltK6I7HHlK#iT zz`#7QqfWe-fl->z8^o*qP$yo&z$ml%iJ%NKBmZPZQC0n?9CjQntb$A`BCG=QSb3Q% zBUlB^Sh-bLS($W%npt_CvNAF-u`n{Hl(0pxG0Sca6+JD?_;vC{b#X?<$$^^Un*%gg zGjgV<Rm3Ofq$U<k{-q_qSy}rlqv2sj1~6b@U|>*WU|{(39|G<mi7O$AznW~QE512F HH$n>ljGIH) delta 253 zcmdn7o^i)|#toktC$lrzPX5d&ve|{nlabMEav$?~CW)_`<5}Ez8TlqJ6I7HHl>W!V zz`#7QqfWe-fl-Rj8^o*qP$yo&z$m@>iJ%NKBj033QC0nC94$;L!mNTEwyXm4Sb3SN zB3K1YS-DkMS($W%npt_CvNAF-u`n{Hmas*zG0SWY6+JD?_<iz4b#X@4$$^^Un*%gg zGb$Hn<d?@6R~DC~<}#EPq$HN4!g%Rv74gYAsfk6K<+Oh>8lGTe00R~V1_nh228KWX gA>bNRoQZ*fft7)Q;R;w41H+rihPvXL6LcfA0BNd49RL6T diff --git a/skeleton/planet.o b/skeleton/planet.o index cf6929a981a1b745fcc192b6157d382c667237ea..2506093d81093b1b3b65c54b647d79d455061a32 100644 GIT binary patch delta 12608 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 delta 11648 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 H7AU9y<D=pn diff --git a/skeleton/planet/planet.c b/skeleton/planet/planet.c index e390ce7..95d8cb1 100644 --- a/skeleton/planet/planet.c +++ b/skeleton/planet/planet.c @@ -31,12 +31,12 @@ system_t create_system(){ s.star = create_planet(M_SOLEIL , vec2_create_zero(), vec2_create_zero(), 0, 0, 0); s.nb_planets = 6; s.planets = malloc(sizeof(planet_t) * s.nb_planets); - s.planets[4] = create_planet(M_NAMEK , vec2_create(-0.05, 0), vec2_create(0 , 0), 0.01, 0.068, -0.05); - s.planets[0] = create_planet(M_MERCURE , vec2_create(-0.092, 0), vec2_create(0 , 0), 0.20563069, 0.116, -0.092); - s.planets[1] = create_planet(M_VENUS , vec2_create(-0.214, 0), vec2_create(0 , 0), 0.0067733, 0.216, -0.214); - s.planets[2] = create_planet(M_TERRE, vec2_create(-0.294 , 0), vec2_create(0 , 0), 0.01671022, 0.3, -0.294); - s.planets[3] = create_planet(M_MARS , vec2_create(-0.412 , 0), vec2_create(0 , 0), 0.09341233, 0.456, -0.412); - s.planets[5] = create_planet(M_AZEROTH , vec2_create(-0.556 , 0), vec2_create(0 , 0), 0.01, 0.582, -0.556); + s.planets[0] = create_planet(M_NAMEK , vec2_create(-27000000000, 0), vec2_create(0 , 0), 0.01, 29000000000, 27000000000); + s.planets[1] = create_planet(M_MERCURE , vec2_create(-46000000000, 0), vec2_create(0 , 0), 0.20563069, 57909050000, 46000000000); + s.planets[2] = create_planet(M_VENUS , vec2_create(-107476170000, 0), vec2_create(0 , 0), 0.0067733, 108208475000, 107476170000); + s.planets[3] = create_planet(M_TERRE, vec2_create(-147098291000 , 0), vec2_create(0 , 0), 0.01671022, 149598023000, 147098291000); + s.planets[4] = create_planet(M_MARS , vec2_create(-206655215000 , 0), vec2_create(0 , 0), 0.09341233, 227939200000, 206655215000); + s.planets[5] = create_planet(M_AZEROTH , vec2_create(-260000000000 , 0), vec2_create(0 , 0), 0.01, 275000000000, 260000000000); return s; } @@ -49,7 +49,7 @@ void show_system(struct gfx_context_t *ctxt, system_t *system){ int couleur[system->nb_planets]; for(int i = 0; i < system->nb_planets ; i++){ double mass = system->planets[i].mass; - coordinates coord = vec2_to_coordinates(system->planets[i].pos, 1000, 1000); + coordinates coord = vec2_to_coordinates(system->planets[i].pos); if(mass == M_NAMEK){ posx[i] = coord.column; posy[i] = coord.row; @@ -88,16 +88,17 @@ void show_system(struct gfx_context_t *ctxt, system_t *system){ } } for(int i = 0 ; i < system->nb_planets ; i++){ + printf("planete %d : %lf\n", i, system->planets[i].pos.y); draw_full_circle(ctxt, posx[i], posy[i], rayon[i], couleur[i]); } } -// update du systeme +//update du systeme void update_system(system_t *system, double delta_t, bool x){ for(int i = 0; i < system->nb_planets ; i++){ vec2 pos_tmp = system->planets[i].pos; - if(x == false){ - system->planets[i].pos = pos_init(*system, system->planets[i] , delta_t); + if(!x){ + system->planets[i].pos = pos_init(*system, system->planets[i] , delta_t); x = true; } else{ @@ -112,6 +113,13 @@ bool is_equal(planet_t a, planet_t b){ return a.mass == b.mass; } +// static double calcul_gravite(planet_t a, planet_t b, vec2 AB, double l){ +// double calcul_mass = a.mass * b.mass; +// double calcul_r3 = pow(vec2_norm(AB),3); +// double calcul_force = G * (calcul_mass / calcul_r3) * l; +// return calcul_force; +// } + //force de gravité vec2 gravite(planet_t a, planet_t b){ vec2 AB = vec2_sub(a.pos, b.pos); @@ -125,27 +133,39 @@ vec2 gravite(planet_t a, planet_t b){ vec2 somme_force(system_t system, planet_t p){ vec2 s = gravite(p, system.star); for(int i = 0 ; i < system.nb_planets ; i++){ - if(is_equal(p , system.planets[i])){ + if(!is_equal(p , system.planets[i])){ vec2 g = gravite(p, system.planets[i]); s.x += g.x; s.y += g.y; } } - return s; + return s; } //acceleration vec2 accel(system_t system, planet_t p){ vec2 a = somme_force(system , p); - return vec2_create(a.x / p.mass, a.y / p.mass); + double x = a.x / p.mass; + double y = a.y / p.mass; + return vec2_create(x, y); } + + +// static double calcul_vitesse(planet_t p, double l, vec2 per){ +// double num = G * M_SOLEIL * (1 + p.e); +// double denom = p.DG * (1 - p.e); +// double racine = sqrt(num/denom); +// double res = racine * (l / vec2_norm(per)); +// return res; +// } + //vitesse initiale vec2 vitesse_i(planet_t p){ vec2 per = vec2_create(-p.pos.y , p.pos.x); vec2 vi; - vi.x = sqrt((G * M_SOLEIL * (1 + p.e)) / p.DG * (1-p.e)) * per.x / vec2_norm(per); - vi.y = sqrt((G * M_SOLEIL * (1 + p.e)) / p.DG * (1-p.e)) * per.y / vec2_norm(per); + vi.x = sqrt((G * M_SOLEIL * (1 + p.e)) / (p.DG * (1-p.e))) * per.x / vec2_norm(per); + vi.y = sqrt((G * M_SOLEIL * (1 + p.e)) / (p.DG * (1-p.e))) * per.y / vec2_norm(per);; return vi; } @@ -153,11 +173,15 @@ vec2 vitesse_i(planet_t p){ vec2 pos_init(system_t system, planet_t p, double delta_t){ vec2 v = vitesse_i(p); vec2 a = accel(system , p); - return vec2_create(p.pos.x + delta_t * v.x + (pow(delta_t, 2) / 2) * a.x, p.pos.y + delta_t * v.y + (pow(delta_t, 2) / 2) * a.y); + double x = p.pos.x + delta_t * v.x + (pow(delta_t, 2) / 2) * a.x; + double y = p.pos.y + delta_t * v.y + (pow(delta_t, 2) / 2) * a.y; + return vec2_create(x, y); } //position update vec2 pos_u(system_t system, planet_t p, double delta_t){ vec2 a = accel(system , p); - return vec2_create(2 * p.pos.x - p.prec_pos.x + pow(delta_t, 2) * a.x , 2 * p.pos.y - p.prec_pos.y + pow(delta_t, 2) * a.y); + double x = 2 * p.pos.x - p.prec_pos.x + pow(delta_t, 2) * a.x; + double y = 2 * p.pos.y - p.prec_pos.y + pow(delta_t, 2) * a.y; + return vec2_create(x, y); } \ No newline at end of file diff --git a/skeleton/vec2.o b/skeleton/vec2.o index 54a08fae76f3ecaa63059fbbda66a731baf84400..11472e3c4b3b15a56989fdfbdb992372a91f3011 100644 GIT binary patch delta 2560 zcmcaHkMY7B#t9me4g5Ja8oU#ne4Jf+avvl2<Obff$=ifXCod3Sne5LaC;!QjU%*A> zz$bnIUIqpRhEM!)2h;d9PJH4QU<L6fcL<wFyQqNp*yYtlRx>V`BqX}|g~&R_%?rew z85NAo6wFK%49yfw70Rp(jSLwK6^xDGd}Fi8h7z)q6(n34%_gTwsPUwpJ?jXviov1Y zVe$-#2<8853=Aw_5e`NW#RDRc@qE$E!jdt}j2)8;WTY88Cilq5*2^+MR4~qAWno|t zE@NP<RJ+2!z`#`FAPSOUtmZk(z`(#f@jxAfUkl}*fb#1ELAEj1EU0G?0c*%&3x~J@ z#AE1$n-3Bd&dDfdV9Zhg*#OcaJlR9m#qJc;=4dI9I8%*-SRw;s4Ah<-bz(^jjImH2 z%oTA^{)sx#$){xX6vS8|jt>$?G9nnN=s}&>WC=MPg(RpVPiZ7YUPy{k<a8L9Or9v` z$oh?yfkAxobvZdk(aGQB^cX!RtI8`eicR*A*JGSDxg5-%C7;D8wwYBypHa<(ftk;W z+nU>w+f$fHf`LKIgn^j@SwNhXfthb|lwvf~e9_5<5@L)_o6jjeVzSd@Qj=m@!zje6 z_JmcIql{IaNmGcG=M$?ehaIatlP;Jo%wfkW$RWfkHlJ05Lx`1U0jnl+c@rxmGxug5 z)!mGn&#J9sn%tymw|TGTZbnAg$${EpjBJ}HXe%%>#fwhfq@%}FCA#^M&ORna*~ts_ z)tO!jZ$72Jk5f`W2pmHUpcoQkU|{(D9|B}2FSHbwv_+ByC21XSnqpwsJNcrexZxQz z*(XrhJ80r>pyGU!8Lh<YWrYzog3N^J(nS-8>GFb#gVK{a0|Ub!hy(wp;t;=tBrb!b zUKN}&8H6yrYBYJGm3X}mL>ep$a#jG;(MO=-AnT=(jC+Mc{2x>t6rdn;YM|zDfO8Hc zb7~@)695sf2j^O3_vS++zz$+V(og~w2RTR!NxT_JTpLNe14Nqh=a9OO_o1|CGf z&J>-z$vRIe9x4xsEd~aVKR{}$L?>I>=t;(d*bEE|f>3!b1_lOx1_lQC$&EJgj0%$< z+K4kwoBY!zp3!)6q;0(95oU<ODG-VQroL_RMO$&k#K|vh-5K>J8`_CW9tGJ1N{VPI z?@Ug#6PKJ1HAft(3TBSc<cW6TjO>$F+UYZDPQGauFL@5CvJ6e7%j7_NeMW)FjrQ)6 z+o5ttpft=h{>cyR#U&p@O}K|9>pNM{L7dTcvZjOn<O>cQlM@^q7+oeWbkJwKH2I=~ zyQC#3ZWtICs-R&6GgW)Cp`$+IhslYK;*t-bX0Ah1^L_F}M{&tusLdzPWaTCwbaZE2 zIhoT*U-B8$1Z${Tm@N#G1D*649Va(Bi5s#)^*2J*fV6;wUP3d;GN?FAZ};SrPWqNv zP|>GQ8YWu-<$s0JF!4Q5KHKC(XK_zKsPAERIfIe~0|P@8R2-&D3aTp}P5doLBLf3N z*5rfE;*zV-WF?@oyC#2h7MDDYCaVNZGuI|7x`<1PgEAlk13az$hsr8V4s;QhOh%La z12s8sa-)m5<We-*2&ii}Oy1}s?s*(dwgRg68Jf60RQx-dxCJN@KsD@SL054}Pf-3w za%UJ+He|A+tGMKBG}+Zqmn@rH=qfI`6HV3(>c=CS7rK@+8o?qOR?31*24Pt4W&v?P z4uRq-(am1&d5oYMYL|x@r-UKIxEqsydYCia2UlB@Jv=pF%nnZt&Iizf;>YBjp5{ys z#3wgOh)w43(qQ^vHQC6^j!|K9p_e_Ah4ti3UUrNclRtXdGX+>rHuARPG?0Lp&OEu& z+nh7Q8p89Kywls9$yk2!CvQ8Zy$X|!eC(JuxJ)kcvEzKJ08!#Ld8dy#(*u{upM2~% zja49m!ILe0&6(OXCKvhIF>TTS)v%LK_-Zii(3t$m*N*9i#$+QuJEk8llZ!x<*5plo Yc1#}nlRx>{ae25wj9_D&yvsul0D0{2+W-In delta 2841 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 K2HWJ1Uh)8IXkU^5 diff --git a/skeleton/vec2/vec2.c b/skeleton/vec2/vec2.c index acfac2f..9a4bc91 100644 --- a/skeleton/vec2/vec2.c +++ b/skeleton/vec2/vec2.c @@ -118,15 +118,11 @@ bool vec2_is_approx_equal(vec2 lhs, vec2 rhs, double eps) { /// @param width The screen width. /// @param height The screen height. /// @return The coordinates (rwo, column). -coordinates vec2_to_coordinates(vec2 v, uint32_t width, uint32_t height) { +coordinates vec2_to_coordinates(vec2 v) { - - width -= 1; - height -= 1; + double coordinates_x = v.x/1000000000 + 500; - double coordinates_x = v.x*width/2 + width/2; - - double coordinates_y = v.y*height/2 + height/2; + double coordinates_y = v.y/1000000000 + 500; coordinates new_cor; new_cor.row = round(coordinates_y); new_cor.column = round(coordinates_x); diff --git a/skeleton/vec2/vec2.h b/skeleton/vec2/vec2.h index e1f7f10..843a1d2 100644 --- a/skeleton/vec2/vec2.h +++ b/skeleton/vec2/vec2.h @@ -34,7 +34,7 @@ vec2 vec2_normalize(vec2 v); bool vec2_is_approx_equal(vec2 lhs, vec2 rhs, double eps); -coordinates vec2_to_coordinates(vec2 v, uint32_t width, uint32_t height); +coordinates vec2_to_coordinates(vec2 v); void vec2_print(vec2 v); -- GitLab