From b0e66471da9bda6ad69e030d6f47f2ccc47c1b56 Mon Sep 17 00:00:00 2001
From: MOISOIU Stefan-Mihai <66520304+stefanmoisoiu@users.noreply.github.com>
Date: Mon, 23 Feb 2026 09:42:07 +0100
Subject: [PATCH] collision

---
 out/production/projet-dev/linea/Cercle.class | Bin 2336 -> 2749 bytes
 src/Cercle.java                              |  11 ++++++++++-
 src/Jeu.java                                 |   8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/out/production/projet-dev/linea/Cercle.class b/out/production/projet-dev/linea/Cercle.class
index b5bd10f50b59df1e1845e67f60d2966af8a3a7bd..db01fb1b1b452a7a9a5a234b6b95e4142161c246 100644
GIT binary patch
delta 1152
zcmZuwOHUJF6g|^<(P_m>A_3Xp#sD=bCK%KBLXpHr2^5Tpt{BTWRLTstQw0?31AM<r
zqKOH*b7NviFeD}#*Zu_k3H|{W20h<&S{~`5-@Uza&$;)W?|$!_zV0-BtbO?gpdX9N
z#!9FZhKX(+7bR@VWgW{*j9B)h<#-}K7KMdI3F>spb!-vYFOKmjvVM3*gbjo+5k(Fu
z2}Z&4`rKm9D&|GliNeK{1jV+z^AhBa&J!Y>kD^cwm;Z*=N|Ao2&&}nsg{<pHXzEC9
z>f~VO1)td_bKZ133EQ_MNRSxSW>Q((u_VMYRkD+2(Hn9LMASmZ&4M3^4Orf|J2qtI
z&9bV@M<U>y(0F>~Mdh4SEdN#xv|XiAQO1N`*Dy^hvS$3O!|Eurmeivqk<|{F=U|W}
zyje8*$U$7EC)2-yDS>2Of-(qJwQB|8Pjo^k@)YHPUaXf@Yh~vu&GCCr0M@#c&)Bt$
zQWY-51x~ZWGaD$h8pX{z6tYjTnPHd=BXt<SQn!K$-XZ2soQ{7l|I*G<iEh0uv93hA
zrbHUIafc`sDcr@p-{V4{^sGKd<R3lZYgkb_7a;F(78P>5eFvTUcn}o+NvOfdFr`bx
zS1@YV9RAB>+*34{__I4EGD(FWdxXfDq*it9WJ8P6((vXjBDC7;CFn}&0~GlqX=VQ+
znpqj_yOo{qVbA-pfJ1CT%y)zhuzYR4VLZemHrI+I9`mL{MC`>AdJ1v7@syrMbTgjO
zYk-)m8S+2Mq3JMmn6fOFxIJ>O6gws!5-G%zbkm9p)w<%VxV%hn<CcW$T+nmos9d2K
zNW`ZXNVdLhtC-xnZ519qb$=f#QxVM<S_gflK6(?FUB2*peTi4J25AP6Mj7G%))2d#

delta 674
zcma))&q@MO6vn@CyrWJ-n2<qj+*P`mcDBo?7Nub(1T8AlMoTTrKmD=H@&#J>0=__q
z6bL~<+a9L}kj|L~bs^E_-oxSdo$s7;@B3uSqki??J^-wt(NSM*iz;k5)R06(f?6`l
zD}_qls1!MUq`^R1f<0rDcO}Sk^Q)Xb)^LLKOHj5;&9?n%Ooapih0bhqUF=A?W=jNT
z^5mgWj-5_%MmJLhllm43qT<Su&Xf-_ol%S8=p5swGKvd|WQvPOo61kcJDVe#-GC4V
zE~4*JvU=$$QvqhVXJCWe!$Z8%=gSr!at!m^#K%YQKn0g(FAYaB%=NuQ0(*4s!-E4%
z(=xY^GPS?6#rm_waD{793q){(s@d7C<*z$yw3TP4ULQ=Ax0H9}ARq^P6YgbxD-vcY
zwLmuyr}zV1Bsvt?Fj$XkMEf-^M7wi?3eoHGB$U!g$Qu>@E>hL@ABC(vlbSxk2zBNk
UVluloE$Vonn?KMdVt9n>2Ou9+;s5{u

diff --git a/src/Cercle.java b/src/Cercle.java
index 83a4e1a..1519197 100644
--- a/src/Cercle.java
+++ b/src/Cercle.java
@@ -125,7 +125,16 @@ public class Cercle extends ObjetGraphique{ // il s'agit plutôt d'arcs de cercl
 		y+=depY;
 	}
 	
-	
+	boolean EnCollision(Segment segCourant){
+		double t = (x - segCourant.x) / (x - segCourant.x + segCourant.xLong);
+		double yLigne = segCourant.y + segCourant.yLong * t;
+
+		double collisionHautPos = y + rayon;
+		double collisionBasPos = y - rayon;
+
+		return yLigne < collisionBasPos || yLigne > collisionHautPos;
+	}
+
 
 	
 }
diff --git a/src/Jeu.java b/src/Jeu.java
index 7926b47..719b1df 100644
--- a/src/Jeu.java
+++ b/src/Jeu.java
@@ -137,6 +137,7 @@ public class Jeu implements KeyListener, ActionListener{
 		horloge.start();
 		
 		// A FAIRE :
+		demiCercleArriere.setCouleur(new Color(0.8f,0.0f,0.0f));
 		// donner la couleur des 2 demi-cercles, par exemple :  demiCerleArriere.setCouleur(new Color(0.8f,0.0f,0.0f));
 	}
 
@@ -147,6 +148,13 @@ public class Jeu implements KeyListener, ActionListener{
 	@Override
 	public void actionPerformed(ActionEvent e) {
 		ecran.traiterBoucleAnimation();
+
+		if (demiCercleAvant.EnCollision(lili.SegCourant))
+			RecommencerPartie();
+	}
+
+	private void RecommencerPartie(){
+		System.out.println("Fin de partie !");
 	}
 		
 }