From d631e8d7229496b1e835ea0fc9ccedb5ad768d0f Mon Sep 17 00:00:00 2001
From: Vince <vi.teissier@gmail.com>
Date: Wed, 22 Nov 2023 14:10:35 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20g=C3=A9n=C3=A9ration=20des?=
=?UTF-8?q?=20pastilles=20|=2022/11/23?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.c | 36 +++++++++++++++++++++++++++---------
prog | Bin 16464 -> 16504 bytes
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/main.c b/main.c
index 1c8f1fc..4d03867 100644
--- a/main.c
+++ b/main.c
@@ -11,7 +11,17 @@
#define T_PIXEL 15 /* Taille d'un pixel*/
-#define DECALEMENT 15 /
+#define DECALEMENT 30
+
+int ArrondirPixel(int nombre) {
+ // Calcul du reste de la division par 15
+ int reste = nombre % 15;
+
+ // Calcul de l'arrondi au multiple de 15 le plus proche
+ int arrondi = (reste <= 7) ? nombre - reste : nombre + (15 - reste);
+
+ return arrondi;
+}
void gen_pastille(int nb_pastille) /*Générer une pastille dans la grid*/
/*Seulement le code n'est pas complet*/
@@ -26,21 +36,29 @@ void gen_pastille(int nb_pastille) /*Générer une pastille dans la grid*/
for(i=0;i<nb_pastille;i++)
{
- x_pastille = rand()%W_GAME;
- y_pastille = rand()%H_GAME;
+ x_pastille= ArrondirPixel(rand()%W_GAME);
+ y_pastille = ArrondirPixel(rand()%H_GAME);
- if(x_pastille < DECALEMENT*2)
+ if(x_pastille < DECALEMENT)
{
- x_pastille =+ DECALEMENT*2;
+ x_pastille =+ DECALEMENT;
}
- else if(y_pastille < DECALEMENT*2)
+ else if(x_pastille >W_GAME-DECALEMENT)
{
- y_pastille =+ DECALEMENT*2;
+ x_pastille - DECALEMENT;
+ }
+ if(y_pastille < DECALEMENT)
+ {
+ y_pastille =+ DECALEMENT;
+ }
+ else if(y_pastille > H_GAME-DECALEMENT)
+ {
+ y_pastille - DECALEMENT;
}
printf("x : %d ; y : %d\n",x_pastille,y_pastille);
ChoisirCouleurDessin(r);
- RemplirRectangle(x_pastille-DECALEMENT,y_pastille-DECALEMENT,T_PIXEL,T_PIXEL);
+ RemplirRectangle(x_pastille,y_pastille,T_PIXEL,T_PIXEL);
}
}
@@ -57,7 +75,7 @@ int main()
c=CouleurParNom("lightgreen");
ChoisirCouleurDessin(c);
- RemplirRectangle(DECALEMENT,DECALEMENT,W_GAME,H_GAME);
+ RemplirRectangle(T_PIXEL,T_PIXEL,W_GAME,H_GAME);
gen_pastille(5);
Touche();
FermerGraphique();
diff --git a/prog b/prog
index 9e0c9ce0473d2620fb362220ea4be9037a7b6fde..77863cb7549bb5af3273f8f5b0c64fce614505b0 100755
GIT binary patch
delta 979
zcmcc6!1$wqae@Zpj)|K0IsdXSfWhC%f{gl{C5&JWL&;`OMt8=^3QQ7{S1?@=alGd8
z$o_TH*6w5T^Gx>lE#4t1y<u|?b3PxFIn(67f>-K0Yu|LczVS%D;E{Q$v!kQK<KQa=
z#zO~xF?Sw2_)os`qUOiWQwJZhXr9u%(CPZ4x%LNpJx90e8*SGgulaZIGcYh{yZ-1r
z)b09)@j|ETpKjMbv4=nN%l!)V=zQwY{KlZO_Krs{>nR=v29M6;FZllb|L@W1`eQ%H
ztuGq>{r@l8dHjXvzyJS_yM6(Qy*$jo!0;ksGMBJyedehaW(Ee$6P<@TufH(+|Nnod
z>zfy<|Nj5)Jmisl$RqQ>)<!>RkAp814*p>4ym;`Zyyl6_6A?@d44oG=PjnuC!3@^&
zp}F>rY(4vN*Eezu3=GY+AHbXsAWnDahi=z5oyR<SS;Zg@+yQdK3&Fqt|9f=HyZ!(<
zIrQ)U|J|h^g*!pM-31~#kH7f$XYx^D4W=i5CchUJulEM&=w)5Y4e=(=-~a!2GBGeP
zc=WQa0*f8mm%_lnu%8R$yLEs5|M%!+oe!2c{$f3d+v)nlqZ?u&h`$r$ja?w`?*rMl
zA4I$e`}6<*epZkP0ssF0hd6c99}r6bB-jCFGB7ZlJj}3piiiOBBn1yU2L=WPb_NE9
zJMaJhFJWL{*z@84|2Yf{3}-(4|G$NSfnm<a|Nmnc7#LbV{r`W4fq~({r~m)oFfcHD
z`uzVt598!I1tms{$qN<4851V&R8VJ>nEX&d+*07f|Nj?2AqB-U3=9lC3=9k#KmPw8
z4H9$Z6KG>{=4E3F;$i1tU;xRlVPIf*Gg(kkniXWtz0HP-@3|*?=z1`I*gR49Ju_p$
z<VM5mOe(^Yqm0}bKWtuTWXdQkz;IFsWE=wn*i;4v27}29jm0I+nHU%Z7^D~kK)!=0
z0F%xjS;kN>nKaqZM4ZtD%ub)2Xd=#-2WEGJNXa=&3=BdH0t{v%V2unrAr!;H%?C{^
znRp$Git_VPGK&H-D^hbd|1`VKxcQvLBW5Ok=E<9E^f*62b$yup(x#o!WpbgdzF>y}
p#0VJuX7fhd|BQ?qCU3Mi=loy-kz79cqrExjbaMz#YI32KJOB`McW(dy
delta 887
zcmey-z<8m7ae@Zpgo&E>ITx}pfWgAaf{gl{K8#=vgU@D9Mt4R|8wiiVX7Ws?`yxS=
zmbFt>=|1SmSiNLo+*IKjCL80;J<R!hOm`S3{}sGa@6r6mptJUlM=z@?F9U-|=kXVr
z|Nj5?=yd(DA7s#r+yDOm?>zou$-n>qkGp;W3B5ebz`*cgGe}kP1&_>2M>j8;=yC9s
z0^^~Bzc@P&9{ee<d8#w?O?T*<%u6lI3=EnVI$htqXojob+UO?@Qh)FlTj#-gsPYfp
zp&v3YMKD2>e`v0KBU{gT-1Utd0|Ucr-saj5vi0o8T|a=h-Ju`4UEg#b^XO$Q=K(u;
z2gq43ivIrp@6ql01LTKofB*mQcKy&>@Uh$VP4f%>o%{?847)%?=kXVjfB*k)cKyQG
z?fS)fvX+Qky8Yk(|92`dGcfGhz{0?=kBfnUVLym?u?%EnFDnPcniuIHbxaHl3?99#
ztYEQ2`%>VFIU$OFaf99Tf(yj$bo~Ky64&3!>qW#hH~#tme?KcI1Oxv4{||9F?_U_}
z@gFGb<l)U9L<G1e8*s)<Qt&XdU|?WiV_;yo^Zx(;90mr4Js<x6pTfYvaOT7R|7#c+
z80LKZ|38F*fuZ%&|NloA7#OC1{{R08!{jyvB}s>m|NpCj0?37307R)UFff=fFfe3H
zKB%BBsqo?df3Pq}ih+Sagn@yfgn@xUVltzmIOERAmWtA>APZJ+j#PXPa*oDi4_yz&
zDVrzizGr6inA~W1o#~{|<R~LI#wnW@8ksUqUS=%Bs5zO@M4Zud@<L;AMt2Y?8N$TC
zAiyBSAmISD2uhiOWh23|k_-Z9vI!tr###_5*~i4dAjBZRa9bFnbti;kn7sL>i6zr!
z1@mi+n}1k5U}oCFH2Ic|9_JL0R~Q%=rc4&JZD+KZJkwTRut5Q$2}YmUeAD(nBjb$8
aH|@<iZ-7FDfq`M>WJw2e#=^;g4(b3vTSLPD