From 76f6158028ae76f57fb9f46b167ff79029657641 Mon Sep 17 00:00:00 2001
From: Louis MALTERRE <malterre.louis@laposte.net>
Date: Thu, 10 Nov 2022 17:32:41 +0100
Subject: [PATCH] =?UTF-8?q?physique=20op=C3=A9rationnelle=20(encore=20qq?=
=?UTF-8?q?=20l=C3=A9gers=20bugs=20mais=20apres=20on=20est=20sur=20de=20la?=
=?UTF-8?q?=20perf)=20LM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/.gitignore | 3 ---
.idea/modules.xml | 8 -------
.idea/vcs.xml | 6 -----
MAVENProject/.idea/.gitignore | 3 ---
MAVENProject/.idea/compiler.xml | 13 -----------
MAVENProject/.idea/encodings.xml | 7 ------
MAVENProject/.idea/jarRepositories.xml | 20 ----------------
MAVENProject/.idea/misc.xml | 12 ----------
MAVENProject/.idea/vcs.xml | 6 -----
MAVENProject/src/main/java/engine/Game.java | 2 +-
.../src/main/java/engine/GameController.java | 2 +-
.../main/java/engine/GameEngineGraphical.java | 2 +-
.../src/main/java/entity/Character.java | 5 +++-
.../src/main/java/environnement/Physique.java | 2 +-
.../src/main/java/jeu/Controller.java | 6 ++---
MAVENProject/src/main/java/jeu/Jeu.java | 22 +++++++++++-------
MAVENProject/target/classes/engine/Cmd.class | Bin 988 -> 0 bytes
MAVENProject/target/classes/engine/Game.class | Bin 158 -> 235 bytes
.../classes/engine/GameController.class | Bin 188 -> 264 bytes
.../classes/engine/GameEngineGraphical.class | Bin 1216 -> 1436 bytes
.../target/classes/entity/Character.class | Bin 537 -> 2276 bytes
.../target/classes/entity/Entity.class | Bin 567 -> 864 bytes
.../classes/environnement/Coordonnees.class | Bin 764 -> 887 bytes
.../classes/model/PacmanController.class | Bin 1062 -> 0 bytes
.../target/classes/model/PacmanGame.class | Bin 1354 -> 0 bytes
.../target/classes/model/PacmanPainter.class | Bin 1000 -> 0 bytes
MAVENProject/target/classes/start/Main.class | Bin 934 -> 884 bytes
27 files changed, 25 insertions(+), 94 deletions(-)
delete mode 100644 .idea/.gitignore
delete mode 100644 .idea/modules.xml
delete mode 100644 .idea/vcs.xml
delete mode 100644 MAVENProject/.idea/.gitignore
delete mode 100644 MAVENProject/.idea/compiler.xml
delete mode 100644 MAVENProject/.idea/encodings.xml
delete mode 100644 MAVENProject/.idea/jarRepositories.xml
delete mode 100644 MAVENProject/.idea/misc.xml
delete mode 100644 MAVENProject/.idea/vcs.xml
delete mode 100644 MAVENProject/target/classes/engine/Cmd.class
delete mode 100644 MAVENProject/target/classes/model/PacmanController.class
delete mode 100644 MAVENProject/target/classes/model/PacmanGame.class
delete mode 100644 MAVENProject/target/classes/model/PacmanPainter.class
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 2ff1d61..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/acl-project.iml" filepath="$PROJECT_DIR$/.idea/acl-project.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1dd..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/MAVENProject/.idea/.gitignore b/MAVENProject/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/MAVENProject/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/MAVENProject/.idea/compiler.xml b/MAVENProject/.idea/compiler.xml
deleted file mode 100644
index a505de9..0000000
--- a/MAVENProject/.idea/compiler.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <annotationProcessing>
- <profile name="Maven default annotation processors profile" enabled="true">
- <sourceOutputDir name="target/generated-sources/annotations" />
- <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
- <outputRelativeToContentRoot value="true" />
- <module name="MAVENProject" />
- </profile>
- </annotationProcessing>
- </component>
-</project>
\ No newline at end of file
diff --git a/MAVENProject/.idea/encodings.xml b/MAVENProject/.idea/encodings.xml
deleted file mode 100644
index aa00ffa..0000000
--- a/MAVENProject/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding">
- <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
diff --git a/MAVENProject/.idea/jarRepositories.xml b/MAVENProject/.idea/jarRepositories.xml
deleted file mode 100644
index 712ab9d..0000000
--- a/MAVENProject/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="RemoteRepositoriesConfiguration">
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Central Repository" />
- <option name="url" value="https://repo.maven.apache.org/maven2" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="central" />
- <option name="name" value="Maven Central repository" />
- <option name="url" value="https://repo1.maven.org/maven2" />
- </remote-repository>
- <remote-repository>
- <option name="id" value="jboss.community" />
- <option name="name" value="JBoss Community repository" />
- <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
- </remote-repository>
- </component>
-</project>
\ No newline at end of file
diff --git a/MAVENProject/.idea/misc.xml b/MAVENProject/.idea/misc.xml
deleted file mode 100644
index 110ad63..0000000
--- a/MAVENProject/.idea/misc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_19" project-jdk-name="17" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file
diff --git a/MAVENProject/.idea/vcs.xml b/MAVENProject/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/MAVENProject/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/MAVENProject/src/main/java/engine/Game.java b/MAVENProject/src/main/java/engine/Game.java
index bfb72c7..0840b23 100644
--- a/MAVENProject/src/main/java/engine/Game.java
+++ b/MAVENProject/src/main/java/engine/Game.java
@@ -16,7 +16,7 @@ public interface Game {
* @param userCmd
* commande utilisateur
*/
- public void evolve(ArrayList userCmd);
+ public void evolve(ArrayList<Boolean> userCmd);
/**
* @return true si et seulement si le jeu est fini
diff --git a/MAVENProject/src/main/java/engine/GameController.java b/MAVENProject/src/main/java/engine/GameController.java
index 915c9ad..31d956c 100644
--- a/MAVENProject/src/main/java/engine/GameController.java
+++ b/MAVENProject/src/main/java/engine/GameController.java
@@ -17,6 +17,6 @@ public interface GameController extends KeyListener {
*
* @return commande faite par le joueur
*/
- public ArrayList getCommand();
+ public ArrayList<Boolean> getCommand();
}
diff --git a/MAVENProject/src/main/java/engine/GameEngineGraphical.java b/MAVENProject/src/main/java/engine/GameEngineGraphical.java
index 6525e8a..16a438a 100644
--- a/MAVENProject/src/main/java/engine/GameEngineGraphical.java
+++ b/MAVENProject/src/main/java/engine/GameEngineGraphical.java
@@ -61,7 +61,7 @@ public class GameEngineGraphical {
// boucle de game
while (!this.game.isFinished()) {
// demande controle utilisateur
- ArrayList a = this.gameController.getCommand(); //
+ ArrayList<Boolean> a = this.gameController.getCommand(); //
// fait evoluer le game
this.game.evolve(a);
// affiche le game
diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java
index 0da5174..a393971 100644
--- a/MAVENProject/src/main/java/entity/Character.java
+++ b/MAVENProject/src/main/java/entity/Character.java
@@ -26,7 +26,9 @@ public class Character extends Entity{
newX = -m/Physique.lambda*(vitesseActuX - commandX/Physique.lambda)*Math.exp(-Physique.lambda*delta/m) + commandX*delta + this.getCoord().getX();
}
else newX = this.getCoord().getX();
- newZ = ((1-alpha)*Physique.g - commandZ/m)/2*delta*delta + vitesseActuZ*delta + this.getCoord().getZ();
+
+ if ((commandZ == 0) && (this.getCoord().getZ() >= 80))newZ = this.getCoord().getZ();
+ else newZ = ((1-alpha)*Physique.g - commandZ/m)/2*delta*delta + vitesseActuZ*delta + this.getCoord().getZ();
System.out.println("écart de hauteur: "+(this.getCoord().getZ()-newZ));
this.setCoord(new Coordonnees(newX, newZ)); // repere ou la hauteur augmente vers le bas, a revoir
@@ -36,6 +38,7 @@ public class Character extends Entity{
vitesseActuX += commandX/Physique.lambda;
}
else vitesseActuX = 0;
+ if ((commandZ == 0) && (this.getCoord().getZ() >= 80)) vitesseActuZ = 0;
vitesseActuZ = vitesseActuZ + ((1-alpha)*Physique.g - commandZ/m)*delta;
System.out.println("vitesse z: "+vitesseActuZ);
//vitesseActuZ = -vitesseActuZ;
diff --git a/MAVENProject/src/main/java/environnement/Physique.java b/MAVENProject/src/main/java/environnement/Physique.java
index 6b86054..2fb7e05 100644
--- a/MAVENProject/src/main/java/environnement/Physique.java
+++ b/MAVENProject/src/main/java/environnement/Physique.java
@@ -1,6 +1,6 @@
package environnement;
public class Physique {
- public static final double g = 10000; // pesanteur
+ public static final double g = 3000; // pesanteur
public static final double lambda = 0.05; // coefficient de frottements
}
diff --git a/MAVENProject/src/main/java/jeu/Controller.java b/MAVENProject/src/main/java/jeu/Controller.java
index 9626558..17afb64 100644
--- a/MAVENProject/src/main/java/jeu/Controller.java
+++ b/MAVENProject/src/main/java/jeu/Controller.java
@@ -20,11 +20,11 @@ public class Controller implements GameController{
isRightPressed = false; isLeftPressed = false; isSpacePressed = false;
}
/**
- * getCommand retourne une list de booleans sous la forme [isRightPressed, isLeftPressed, isSpacePressed]
+ * getCommand retourne une liste de booleans sous la forme [isRightPressed, isLeftPressed, isSpacePressed]
*/
@Override
- public ArrayList getCommand() {
- ArrayList a = new ArrayList<Boolean>();
+ public ArrayList<Boolean> getCommand() {
+ ArrayList<Boolean> a = new ArrayList<Boolean>();
a.add(isRightPressed);
a.add(isLeftPressed);
a.add(isSpacePressed);
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 075979e..4f385a9 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -1,6 +1,7 @@
package jeu;
import engine.Game;
+import engine.GameEngineGraphical;
import environnement.Physique;
import java.io.BufferedReader;
@@ -32,33 +33,38 @@ public class Jeu implements Game{
}
@Override
- public void evolve(ArrayList command) { // command est sous la forme list de Boolean qui représente les touches préssées. Voir Controller pour la compositions de cet list.
+ public void evolve(ArrayList<Boolean> command) { // command est sous la forme list de Boolean qui représente les touches préssées. Voir Controller pour la compositions de cet list.
System.out.println("Execute "+command);
System.out.println(charac.getCoord().getX());
System.out.println(charac.getCoord().getZ());
double comX,comZ;
int a = 1;
+ int n = 0; //tentative de faire une commande selon z qui décroit au cours du temps
comX = 0;
comZ = 0;
- boolean Right = (boolean) command.get(0);
- boolean Left = (boolean) command.get(0);
- boolean Jump = (boolean) command.get(0);
+ boolean Right = command.get(1); //gauche et droite sont inverses je sais pas pk
+ boolean Left = command.get(0);
+ boolean Jump = command.get(2);
if (Right) {
comX = -charac.getVitesseMax()*Physique.lambda;
}
- if (Left) {
+ else if (Left) {
comX = charac.getVitesseMax() * Physique.lambda;
}
if (Jump) {
- if (charac.getCoord().getZ() < 80) a = 0;
- else comZ = 30000 * charac.getVitesseMax() * charac.getM();
+ if (charac.getCoord().getZ() < 80){a = 0;}
+ else comZ = 300000 * charac.getVitesseMax() * charac.getM()*Math.exp(-n*GameEngineGraphical.getDeltaT()*Math.pow(10, -3));
}
else {
- if (charac.getCoord().getZ() >= 80) { //a retoucher, j'ai besoin d'autres choses pour avancer
+ if (charac.getCoord().getZ() < 80) { //a retoucher, j'ai besoin d'autres choses pour avancer
+ a = 0;
+ }
+ else{
a = 1;
+ n = 0;
}
/*else{
diff --git a/MAVENProject/target/classes/engine/Cmd.class b/MAVENProject/target/classes/engine/Cmd.class
deleted file mode 100644
index 96ec15ff91fa40538b1cc5d4dafac9f35303bbef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 988
zcmX^0Z`VEs1_oOOGj;|hMh33by!6bxRDI{%6m|v{Mh3pD#Ii*FoW#6zeb>CwTt)^K
zA6K^!Mg|@qghFdZ2G$@?caIQ81{SYS-vCAi7Ec!+S4IYISHDnSl`u!2P}g8a2Ht2?
zJsdX4IhlExC3cJq%o>_uj0`N!`6;O!46IxXj0}Q23_=XTj0|ixP$gm-J_x4-mlS2@
zrCWPyhH)}5GKlgpurjc5FtCF-5<Cp-APxtJBhACW0pf6iIC4A;oD6IrmI4n07XvpV
z1HVsZUaDVdZc=JdNMce>DkFoCPkwS@PFP}5CWsFf<YHiE5M*RvDaptzW@KP1OUx-v
zEoNlk*U&`q4;O<5gBCl3CL@CYk~=GlOHy-r7_=F57#TPdi;5B}lk*EI85y*YedC{$
zm6}{)?TO?;n2;wZT-d>O`lm56C?IQt27)GXsDd18z{8-+V93Z|imcc<C$YHL8p#H@
zZiH(=5p2!Kz!jWdT9lmXmI(?F4(HqyJ&+Pc2F~Ej^t{B9(xOyG200{?K-z4O9bsqf
zV93D8z|6qF!0I3giW>$72T4%0fN2f}HZaWzq6MTtQNh5#z{0@6z{9}Hz{tSIz`#(!
zz`_6mA-fqEBZc^xw=)QAW)J~$#8|)_aWF@c70i(Wb7a`S99j0g42+S?n;1lbBUv^v
zhzCcqZeoxMj%3@!ARD}yL4G3x0|OI-A_D^h7XuRm0|N(x2?INW5?B-@Bg7yKb%h}V
zGuRjGTG}$(8I%zk*%%lZ7@(SXpllV8cNjPsR2kHu+RYeP!P><(F~~=HGi&XOv;n!y
zmsxrTgSyTJu!SIJKulwVJAsoymq8C|h86=8*nBP_My(wT`Ue;oaqDAZFan!t%wPhh
FO#$D?yd?kt
diff --git a/MAVENProject/target/classes/engine/Game.class b/MAVENProject/target/classes/engine/Game.class
index f184370bcf90dd9b1e0a353c7233b02afbe8508c..7f73ca507c2d79a7df407299dfb176e7a6870645 100644
GIT binary patch
delta 132
zcmbQo_?nUH)W2Q(7#J9A8F(jh83jpb_+%xPCF+-!Waj8Q78NB{`eYWDSZjtcGH?cG
zrspM=loq8jGU#GeW&_cilbDyT@06dPlbV=kZ8y==Nt%&?oq>UYiGhQKk%5zei-CcG
Kk%1d5!UF*Cog;Gq
delta 55
zcmaFOIFFI*)W2Q(7#J9A8Mr5M8S(OK_@w5gXXd5qJLjfM>~j)kU}0onXW(F9U|?k6
LWME)mV&DP*zgG*=
diff --git a/MAVENProject/target/classes/engine/GameController.class b/MAVENProject/target/classes/engine/GameController.class
index db41a0e51ed810f69348c7aebc40cf70b044f703..aa4e909070afad533a51a411f2514161bfe0949e 100644
GIT binary patch
delta 124
zcmdnP*ulhg>ff$?3=9mm47?M$5`x4vG<~uX%M$fVOEPox9gB(*D}6GHORO0gID<3O
z^Abx+i&7aGbg-+kfoRQ1%uCmI%FoY9P0X{ln^<8f%*epWz`(%7z{SAGzzt^c006lx
BBRBv6
delta 48
zcmeBR+QZ0o>ff$?3=9mm4BQjB68QKuG<{O@(lhf?^__E5ChoE1W?*1s;ACK6U}E3`
E0A;ib?f?J)
diff --git a/MAVENProject/target/classes/engine/GameEngineGraphical.class b/MAVENProject/target/classes/engine/GameEngineGraphical.class
index d78696d676837411d2913bb11e6fa3c93d8fce18..584dd1386a171b0dc38c330b1f02979c3717a25b 100644
GIT binary patch
delta 840
zcmX@WIft9;)W2Q(7#J9A8T=-49g$B-%_&I?VPs(RWMtrV&d)0@Nz5w=OUx-vWoBSt
zV4Qe5NL7@FL6AX=k%3u5GmMjgkwJooft7&`#FFA+U}xX}v1BGYF{U%BOkTyP%&0c`
z9HShEDuV_{pXTH*jHZIxJPh0nJlqVr4EpR0dW;OB6DNw+^Dr1N7&0<&rKgrS=jY}o
z=A|$)h-+y2WF?j*>X(*e=IA>X6(v^sWEPiLb2At-n6fjNFfwqb=A~!mrRuvU=BDy6
zm@$|$GO(qV<>!>8GBQYLVAZS{#>Jq@V9CQ^1@Z=KL1JcJ2^T}X4TBv!gDoS20NBEu
z#JqI<kc^_##1tL|dj<za2G-)7)YJk-1{Mu3%`lJyoOl?V8C)0{xH5~~GV?NvGg4E)
zp%TT&z?jI$Ad1y;Mg}pT{N%)(u*9Ow#H5_mkjjG85D-I$kwFWa4jYId*ga19`8lbH
zdDeE56`6$vIMY*0T%hsAtfA>S*@)SYk#%wkvtqUs11|#~10w@J0|NsSg8&0F10#bV
zgAfBFgD?XFLk<HI0}BHKgNW941`#dotqkH?I$IeewRE>KNN)t|kY!+C5My9vU|`T=
zU|}#|;AAjl;A1di5N0rDkYiwA(1Pe^kY`Ys{D4`xUXekJfr&whfq{XAfssKOY|A<Z
zRt6>p1_mds-3+RcT3Z+-wYD%wZ)Z^7%AmEJK?%g!$)Ll?;G?yLL0o$$gAo&h))oe>
zZ44G%I~c4%f;$-;85w5&zX5U+3j@eaN(>wf3=Gx`!VGo{Vhj!p3JgvRS`03A42BGD
z45kcr42}#QU<ZPn!@%GKav%c(g93vngDZm@10#bw0|NsO10z(#gMpF36YOXvF*ycK
k1}_G0Xb>qeFfxDu6U!QSfUtqZyus#!JjTf21D5jz0D8!rDF6Tf
delta 635
zcmbQkeSnke)W2Q(7#J9A89XL(9hvySUsaHYftNvuk%3u5GmMjgkwJuqft7&`#1i9S
zU}xX}u_Pv^Fs3sqOg_V?%&0W^1EU;=B7+J@pXy{WCR0Im9tLg(9&QFr25oi*Ek*{>
zi4#TZc^GsUbQu}A(o;*E^K)|(^HLZY_%t+qQuER?^HTMlb5pFj8T1(p*%=HN8MvXM
z?uognJPbw*#*7SXsb%>&WvPq|{2Iu5G{d+U6d6o;7|cM9W-Um}%qwAKfPfS(1}g>|
zb_Q!k27#2U#Ii*FoW#6z{g8~J)Wj4X23rO@Mh4d6oYd3;Mg|rQFU>HJ0~~l592uM#
z8Mrcw-7@nsi!)MFz=09P$iSG)$iRbaIU@saa7kivwr^rVNMce>>g0XQhKwweKQJps
zGchnS@G|f*Ff#BnFfimWFfp(&FffQ{ZD$bB(%#A-tfjM+K~zh3D}(q(1_lNu21y16
z1~CSZ%e5F-7<3po8FU%=81xu~8T1*X7#J8pq6`co4AKlTlWSO%>tz{)7?>F37#J8>
z7#JDk!M4m}U}a!pU|?|3+RdOCskMbcRBH=^_;v>6tqf|*8B{==oeUa`3_e<07=*QV
zGUzceXl-Fo+s0rb!eG9G!4f3Alfj;mVdnp9AXhPiU8Tgp!N9;^&LGTS#URFD!=S)m
z$Dn1$;J{$W;KX3gV8!6f-~x7{7{qdr6B!s76d1(8GK>taU`H~EDKIcHxPd+E4ggTM
BY{>us
diff --git a/MAVENProject/target/classes/entity/Character.class b/MAVENProject/target/classes/entity/Character.class
index 961cd825e992b33e19ad48ed340b6573797eac2d..8aeb807e07e94b6705daac27ef5d235030f866b2 100644
GIT binary patch
literal 2276
zcmX^0Z`VEs1_oP(I(7yoMh1b@ypqh4N`2>y#G=IHlGGx01{OvJUZ|)mSdx)}r!2E1
zwYWIdF}b8Pf{}sI1yv}Dk%2Lnk%7%7GcU8mj*&q@!zVSbEVC#-FE2GWHLpb9IX}NB
z1;k4&w)S+<3}a+qan4Uk<zirF;N@Z9WZ+|DkjJY>GmMjgkwJimft7&`#1i6RV27|o
zco;Ys*cci3eKPY>{YrC_Qj0<olX6lS8H9ZDlM{2o5{oiHe5fExNk(QdNDk^lxWBC#
z85olp8Km*JoRNVG8V<gR6^smwo{S7UDX9fHiOFDJ7Be!iX}Gv}YKCz!C@?6oGbl1L
zNTuebXXd5qyC>$Rx`LVRMTrF&naPPcJPgVVDvS)A>8T|ysW~NyA&d;n8k(ML4k`>_
zz;=KGOfzsXXff!pGiWn1@MR^ICF<uS=B4ZVCYEIIFz7PqF)}b0<d-utuxhxtXu7c3
zubc@2v)J}S86e#zJPf7`W{eEXsTBo`3@jQhnl4-nj0_e$43-R5j0_y<sU_eTVq}oj
z(8Ln}Tnsi0cI*tcj0}=E<CllQp22~Ufh9e)Bm(Rs7mzL|9tLNaa1@(E2*hV>4$BL`
zEH(!)#lXPH;LYI6&fvqyAb{{|aAk2xYAz3hAA>(519N_92_u834_G=gUq7HIGp{7L
zq$o8p*P5LnkdZ+gECUXt;F6-uymY71%$$_eA`XUNMh4--E0Yt8N)%F36*3Y_OHxaV
ztQ5Ey0vJL;sW6O@K~w``Fp_p_P<#e3MDQ>~GDI;luq750q~@hCGRSDSXksXa+GPzg
zGlqvDmLZOjfukfJ;t)m#5e-Z&)?5q;3`y(^iHr=wV5g&ciiaVYA&ilMy#VCToIFrq
zrh*)s295GCP)ug<Fk~`hF*0xz!(&noUw+aI<6y{PWZ;G-XN4*&1x5yr<ow*+#JrRU
z1T%_}fi*FwAS02Hfi(q`NEsPe@>0tqAXF4118;CiVsf@`VgWRJu_u<4Bo>yYf@406
zk%2cowImEucK9Y%fO2jH4}&y=3?l<SLIzr@pov655|J+>16Oc<X;E^jTP7%1^TBhh
z9w@XJ6d4#9m>C$rn3aJIoQ~L`GzXYwXJBODWB>&dHv<Dh9s@H2D+2?An3lH8b_O0T
zzO4-WAVN?}b1Q@JMg|53CI(TEJXjS!0~-Su12+RVg8+j7gD8U#gBSw?gBAk|ScN!)
z1lT??21y1f21c-$G=mHS6PN|Eotc4=L6$*|fsuimfq_Y%fs=uUfq^l62ZMaO2!pB!
zgZd5z&1_3Hb-w8{87#E6FbJ26FzDxNZDHV72QkvKMHmbv*s?(~`8yblv(+WovXiy8
zF_>>-uuit*SkAx$<ydlP@=c$`APeC-iZHlLpUuDz<ymqqXV7O6Wld=pVQ|aV1e=yF
z!r+lF!Ilj%T@YceW3naJCI+wF3;~fsLE9NZpk_#LrEg;h-^LKVjUirZH-k;21cwCI
zc7~K~4C!Fk8)+e2Ex`uz2Ex^#AdZCjDS0ac|8fQnP?+<B-7E&R0pez`grHXB76w6d
z7lYiml|c~ZxNMN)wlE07odt?KW^m+rF$gg*Fo-e;Fi0|pF-S3ZFi10aGsrN6Fvu~K
zFvv43U{GM#&!EU~jzNXt3WF-cCk8b}1_pITW(EyL4hBs|MFuTKTLx{$Fa`r~gvT&&
zf})K98sUuL47m(!pa^FSXUJn<10_DjaE5#a83tAc0Y-O*0tPk)HU<v{W`;rrHU<uc
z5JniQkb#+@2%M-EFl>jiiWwLfL>SorFnBZnVc=kv|HGio{F@<(MS_8mp@g9nl6V-j
z85lq|GBAR?2}z@1Coq_RoyY@`ggTLtp^U)+s?mUf2`tB^wS}R)eLXydLv))X>1KoL
uu7vB>hw5epMK8K$Yb4FAaLrX%H4CC^w#TZu8mneubj{9KHP?VWR|^2w;?HUT
delta 342
zcmaDNIFp6z)W2Q(7#J9A86+lhX>+nB=jRutFfvF_R%DW%Y|SXl&1RFCmsw)R$RMu)
z5)<*%3}a+qan4Uk<zirF;N@Z9WZ;^3%~O^qCAA<YF*!9iHLs+Yk%3tQq>eqYq$IJh
zG<EVu7WH~21_lOJ1~vu|U}xZ9U|?WoU<7GrU}WHCU|{fMU}j)uU|?X^(w5oIz_XEo
zfq{vEkAZ=KivgsSi-C=Shk>7gfk6SHj6r}w5M&kuJA)7d8v`RqD+9=2CI&_ZVFnSX
ovDyp_V7YWggozN<0$|g4z_N@`(-;{<F?3>R6v3)d4D4WW0Pm6`3;+NC
diff --git a/MAVENProject/target/classes/entity/Entity.class b/MAVENProject/target/classes/entity/Entity.class
index b194b2d0b03238e4ca5feaaa4d1a31ea5e015b8d..752e41fda65e67dc6323f5903c4463e6b8710315 100644
GIT binary patch
delta 356
zcmdna@_>!&)W2Q(7#J9A8B{lNaWguzX}Gv}YKAc~a3tsF<|gK)L@+Wix*)hwj0~)a
zIRzPsj126FB_)Z4rKyYz9O<bg&iVO8DU1xV8k!UBWO+G?;UaPx6YZp#G{Yv#GO7tO
zF|abQF@OL&0|x^G1MB1v#vEQr21W*M1_lOC1_lPU$!8g*^tBjR7#J8B8AKVxK#Ca{
z8KfAb85qH0G7QoT%wU!*0|x^u10#dn<o%3Flcku%>g5>}pl0baFoM;yYHeZQ-@w4Y
zz{DU7G9D}_z#ziFz`z4$vqCLlWKd*Kf@-#7U}9hbsn*io%D}%7uA2)iD$KyjAObc)
W49sVPn!vyy$OiTw$Yy1*CKUklkt??V
delta 94
zcmaFBww;CR)W2Q(7#J9A8DutcaWitTCzg~X7M7+?p3kTz$iTqLz{UUq><k<X3=GVZ
tuQBFKp2?&r&dVUez`(%6z{tSBz{nuVAO@x-C(mHAV3%TGU|?d91_0-859$B_
diff --git a/MAVENProject/target/classes/environnement/Coordonnees.class b/MAVENProject/target/classes/environnement/Coordonnees.class
index 6f7588ac0caef9e0ebe2fb7e5747aec79a067645..e7b415d8f21edd13af101ae3d937dcefb7162bf4 100644
GIT binary patch
literal 887
zcmX^0Z`VEs1_oOOHFgFjMh3~$yt2%q{Jgx>+|;}hedqlAq7)D>wV0iOg^@uZE3qt5
zKPNFSUEe<`D>b=<k%6&-k%7^Lk%6&_k%7%7GcU8mj*)>?!^K52jFExGIX@+pi-DPe
zhlhcKftQhiSwl07lYx<epND~!fepkG<Y8cEU}I$9_sPsl^()OyN-YXWOv*`RWDxSn
zPfpAUODxI+@u7k&B^jB;j11B~I2~%u$iR}9S{?zRq8J%CQZkE667!N%85z_ye9(Ph
zjVYq($;iNzZwPV$hH8+E5hDXjdTL1o*gGx|P81^pdumyJPFX6*VhynGnadK3;KEUi
z3|ztarA5i9ZkZt82_S{79>^L7MFvI&W(EcZCI%)@;DA}|3~USx3~UUH3>*xg(BfiX
zV2EU3W?*GtVBpu<&cLmuzLkMbOLHrOz(%kJAqEBpAqEx(1_llW76wiRP6jRpJ_c?E
zVFm^U1+ek_3?dAo3?RVIAO<#?fq|bvoPmvjnSql*f<cmjkpX0l83Q8&6Ua>FH6W4!
zWHQJh3=9Hb)5IXM3{nizAj24#7-Sfv85kKD8Dtscpl0YZFflMPFfg!cZDHVBk7kSr
z*ccv&0;r=H8RW5Q7C_f5fmO2tI1oXucV=J(`<7cPati~Wdh%8VK12X<ft@bPz{Ma3
sHU{DqZm1g=7`PdfzyZU^pp4x>0g!=6Ar3K6iGhnjnSg;R;6P9X0L8X`v;Y7A
literal 764
zcmX^0Z`VEs1_oOOMRo=zMh3~$yt2%q{Jgx>+|;}hedqlAq7)D>wV0iOg^@uZE3qt5
zKPNFSUEe<`D>b=<k%6&-k%7^Zk%6&_k%7%7GcU8mj*)>?!_!kUjFExGIX@+pi-DPe
zhlhcKftQhiSwl07lYx<epND~!fepkG<Y8cEU}I$9_sPsl^()OyN-YXWOv*`RWDxSn
zPfpAUODxI+@u7k&B^jB;j11B~I2~%u$iR`3SzMBsmz>JTpswMA?q+LD5lv5a21!N+
zeuPrjqN4mF4hCsPhD)J&MXAO4Ic2FS3d#Ao1(`XCC7Jno3I#>^Nja&x#a0SjoXMbY
zQb<nB%gZlONJ>?JYsfEB$ShU>i6$zfWv1q&3<|Ye3=#~opcs*3WDrFTpx~0C%)E4K
zP}Fe+=a&{Gr@Cc=qCx;EA?Seui9wNpk%5_kfq{vE0Th!AAi&PR1{Pst;9vknEf)g=
zLnH$eSRKFCb_Q-O>8%WWS~6Q11U7;d3NbJ+2r;lQFfed4urTm2a5C^R@G<Z)2s1D+
zC_uC^h%ktP%x2&RTf@k}z`zemFbqr#oD5<N;tY%oAZxT3n88lr+RY#lDI~R>L1sVP
U1~vweE<v!VAm=hN$b;n+0CR$}q5uE@
diff --git a/MAVENProject/target/classes/model/PacmanController.class b/MAVENProject/target/classes/model/PacmanController.class
deleted file mode 100644
index 35592d36134d88cbaad125dd44b230faded67fcf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1062
zcmX^0Z`VEs1_oOOV|E56Mh3Cm{FKxj{eZ;e+{8TR{JfH){G6QBB6bEAMh1bb#Ii*F
zoW#6zegCAa)Z`L&1~x_p(bT;3%)C^6_r%;(ga$?i{^b1J+{C<;RM$M`{L-RgMg|@q
zs8Z+L6l+EXHk-`6%o00B24)S-Fh&Lz=lqmZE(T@>ULFQc1};tpeg;8y1_4F}E`%-~
z1|bFxMg|s77avzn21W)E9tL)h0KZRWUaDVdZc=JdNMce>DkFoCPkwS@PFP}5CWsFe
zWGTtWEM{bo@WJj$YeojH^wbh(h`SjX_%t+8UCfo8S{YE3T3no(!pI<_;R6nj#PSmT
z)UwpP5`FK~N>>oWS~HA`L5@Lzok5<FK^%u79tK4QC5VOIsg=$diACUma0dBXg@-{E
z<SiB-SGN$5fI1I@21tN4$kW{eETYB3pbZjX@e1_~U}RuSWn_@V=^jP~-r$nN<ZR!>
z0%%BZXQx&MrRJn2g1y3#omv@ESpf1CS8#r5QF5wVCMXa^(UXB5$TJLz42%rS42%q{
z42%p+pa@`K0JAw6xEL52xEUB2>=>9B7#SECc(k@N@Mvvf;M>X|ype%{fr&wsfq{XK
zfti7UL6U)mL5hK!L7G7fq!OZ@L7YK?fq{XML6SiVYL-3&BUp}AYYT($2Dl+?U_lim
z&8%?E(hM?C&1)E#7?>Cs7(%qSG03iF00V!pa~T*E7#J8l7#J8_zz$|$2xMSjFkxU|
zNP+STL42)E49Z&>gqJgjXl-Ip1GBiaHZf>IJ;V(5kQ@U$0|SFDg9U>jgFS;0gA;=(
zgC~O-gAaoRLokC4*o|TkcR=09z!1Wq!=TH+$e_o-z`(}9V!_D?@{vB=<qlAnb6^A?
z7uY0c26hG)B$GMdCUZbdW@Ipcn`R0QHwFeqL@a=;V_@(>GJ+9q1S8xCL$F3800!B%
AfdBvi
diff --git a/MAVENProject/target/classes/model/PacmanGame.class b/MAVENProject/target/classes/model/PacmanGame.class
deleted file mode 100644
index fc54765013d34045f54dd6913506eb0ce2dfe27a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1354
zcmX^0Z`VEs1_oP(V0H#3Mh1c0{FKxj{eZ;e+{8Th#N1SN1{OvJfvm)`ME#t^ymWp4
zq^#8B5_SeQMh5QGy!6bxRDF;#Mg}&U%)HDJJ4Oak4IhN^;F6-uymV{LFh&Lz=lqmZ
zE(T@>ZXO191|CKRW)00Sb_PC11~IVu%zS;P(zLYHqSTb2)Wnq3B6bD=Mg}36oLgp2
zDny)%fuBJLWCjNp122OJh$YI%APluOGhZK~%vv*ylR=z8lAS>U#RtKa#U-h^JPc9{
z(u@qu`K2X{45APhXXfh%6lLa>1eX-0CgxgmF~~B=vopvsG6=&Qfh5htpuoVv$iQ9z
z(vgz~a*7fUgEE5(BLhcKYGR5{W?m{IgNTME#B6ZjK|=$iR*i>29TW(x$vOGOsT>TN
zj0{2^sW}A-dHE#@iDikIIf+R*sq75eNVa?WyH+Hp7L;V>=P@$ygDmhX%}q)z3IQo)
zWDxSnPfpAUODxI+@u7k&B^jB;AUX7iwPs{sE6y)1N=^mIf<1`rMn(p%jMSV0NKi5|
zNI-mn5l7aH46Hes=^(E%rXmL<l3T4A8F+(B5|gui6AQquVrQ^KjS+AnVPs%SEz8d-
zOJ!u>*YJU+E$7@6Yfvh&Wn>UXccW8jW==|K5eI`kBLjzPMQU<sNvZ-DgAIcah;ZUz
zaAt5}WME4yC`ipqVPw#SCJ?YMA<5VpGjgDYT7!&m<6&?I$7e}CB<467JQ=*%8N3)7
zxDf8+Venz_Wn^ISadit}WZ*$|IU@r{a(-@ZVqQurBLi1vv0G+dW^qPp3OMaYF*0xk
zgChWxv>6%r5t&X8<W&Ym21W*E21W)}1_m(A&cMOI$iT_K!0?)Zm4StUfx$v+I|J8l
z2Hwcs4E&MW+ZhD6GYI=GXW-hzAf~&GK}KgAgJPuL@&BK7wlSzKXW;SM#2_Z5v5i4y
zBLgD?3xhU;9)lJGGlLET1A`jaTyX{#1}O#+1{nr%23ZC<1{nr*26+Z;1_cIv21N#Q
z24x0a1_lN@1~!o040;Uu3?N{^V8CF=z{nuNAjM$BV9db8AkM(fV8UR?z|5cmXX!I=
zFqkr!F)%ZjGcYh{GO+w-5NBXvXJBM!uwZB4WoNKpVEDzr_Md^Dfe9iClF|Zs*^0p$
z>hW*}76v8;1_tR(3}U+(Y$Ap1wlg?rZ)0%W#^Ab*L1q(!NBBkt1_maupZFM<85kIJ
z7{nNK8Kf8tz-||VXotI9n!%63mw}Oik-?uK0BVU2n9sn##JmP>78?U2*v}yU^MKh*
MP%{`A0>P?+0A+C`rT_o{
diff --git a/MAVENProject/target/classes/model/PacmanPainter.class b/MAVENProject/target/classes/model/PacmanPainter.class
deleted file mode 100644
index ed3d5948fc1669fb7bc40f0f1500f9c54ba29e9c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1000
zcmX^0Z`VEs1_oOOb9M$MMh4;B{FKxj{eZ;e+{C<q#LT>s)FO5U7Dfhvti-ZJ{hY+S
zbbbG%tkmQZb_O;^2BFlv^vt|eefPxNRH$l32G(#-mk<v|21ZXt243g<yyB9?yppiQ
zoYGWg1_tIAj0|iZuAc55A<PU63@MBZY&MyBnI(3N49psuVT=qc&iN^+Tnx+%f;<eo
z41A0X{63j^seYxoNvTC4iAg!Bj0{3P`N@enVTnbVAU;%(r6eP>n2|x$2a6A^85vko
ziW18i85A{qz#d5~FVWA;O-xVKcPdRwOD#%G@dWX#HN&_VBpIaH8Kf8)WbmovVUS^v
zWn|z^Pc3mTN-W68Oa@u5p@}daCTz{lAkWAk3^xoWZsfwrpva)i&Y;A|zz3Ig&d<p&
z;$cu>P-SFbNy;frWn>UQm<g7(=3<azQ0HOLV9;b_;3!Tl0gEy+2qXCoEClwA9D_Cw
zgARi(BLhcTW=@WOSz-<&1G|Q&r>7?<xS29@85!gdHed@BMh3RzqQuJlJW%k$U5fCB
zH6sH@dTL2{W=cs0I2t_}8938ZOFU9D(=$pK8MuP;ON)|I-7>+EhmyARK*ljBGB7eQ
zGcYo+GB7d7Ft9UlFfcN3GB7YOF>o=+FmNOBc^Ft27(wZRfsuiqfq}u8fsuicfq{Wl
zYdeF$Mz9tk1_lN$1||ju23ZCc1~~>{1_lNmh$03N22lnE21W)k263nXX$-6kpoA!+
zy^TTQ0E3*b&L#$hZ47EU0wMw;0$c)I+ZePE<_a;eFfcHvGH@`cG4L~}Ge|RNfX!Ec
zm;p7PfkB2rk3pY-k%5Cjgu#Hpkb#MTk--S;SdgRjppIq{WPY&*?q)Wy8+E|uLEOs%
dHII?O1g=*Xs+U<H1zoEll2&H8R#UJAW&rAN!yNzs
diff --git a/MAVENProject/target/classes/start/Main.class b/MAVENProject/target/classes/start/Main.class
index 4fd39d0e8631d8f7e9cbfa6da7880087805c894d..d8ca1e8981320dbbf938078d21041d07de9e1b54 100644
GIT binary patch
delta 113
zcmZ3+{)KJAV-EJL)KYz~)Y6Gx?4`Lu?103~ypq%+E(R$EPId-4Mg~5R=;S!YwU(Sd
vAf{JpsWl@5djUipBLgp36spadk%22YKd+=HKPM-(h><}6EV((B$&(QP(sCjd
delta 145
zcmeyuwv2tkV?lx3{FKxj{eZ;e+{8Th#N5=0ukE#kkp%-1GxJJPi?|r17&zG(<QN&m
rkYy*kGOpDX@<A2?nPSbzz+M2+$jBgyB0ZUpNt{mtMQF1&lP4np=mjps
--
GitLab