diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000
--- 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 2ff1d615cfb9058347abf5d315105b00558abe95..0000000000000000000000000000000000000000
--- 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 35eb1ddfbbc029bcab630581847471d7f238ec53..0000000000000000000000000000000000000000
--- 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 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000
--- 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 a505de900913b081809f7440046d7803203279d0..0000000000000000000000000000000000000000
--- 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 aa00ffab7828f4818589659c804ec2cfd99baed3..0000000000000000000000000000000000000000
--- 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 712ab9d985c20018a0c97b93d2148ac1ffe588a5..0000000000000000000000000000000000000000
--- 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 110ad632d7ee453dac7eba3417e98c2d44e630c6..0000000000000000000000000000000000000000
--- 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 6c0b8635858dc7ad44b93df54b762707ce49eefc..0000000000000000000000000000000000000000
--- 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 bfb72c772c080d8c7aae675cfa296e3a6ba4c060..0840b23029ded24eea509956c7bbae495845b5dc 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 915c9ad9b72cae4795d854f3d6deac21cc8256f6..31d956cb38633e94ffcd298fadfb9cca5622c6f2 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 6525e8a7123bcb5722f7daa14903341228ebfcf4..16a438a5966f058b8bce483678bd20da90d0d508 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 0da5174f072484eb5d831f019792cd1abe70d5c7..a393971065ff1dc9bce3399c442503a13e329203 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 6b8605459ad062a2fb9bcaeed4342e270080381a..2fb7e05f03ef2068d5ce14875ba88b5e8eafe7c9 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 9626558cd2dea6277044bf3f7a8a503cc53f9cb2..17afb64f5f9af78e65394fdbf9fba11664dfc5a6 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 075979e2dca083787693f43eed5cae80b2bb8e90..4f385a991dee55a0d3c2b69e46c47c2e934cf1ed 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
Binary files a/MAVENProject/target/classes/engine/Cmd.class and /dev/null differ
diff --git a/MAVENProject/target/classes/engine/Game.class b/MAVENProject/target/classes/engine/Game.class
index f184370bcf90dd9b1e0a353c7233b02afbe8508c..7f73ca507c2d79a7df407299dfb176e7a6870645 100644
Binary files a/MAVENProject/target/classes/engine/Game.class and b/MAVENProject/target/classes/engine/Game.class differ
diff --git a/MAVENProject/target/classes/engine/GameController.class b/MAVENProject/target/classes/engine/GameController.class
index db41a0e51ed810f69348c7aebc40cf70b044f703..aa4e909070afad533a51a411f2514161bfe0949e 100644
Binary files a/MAVENProject/target/classes/engine/GameController.class and b/MAVENProject/target/classes/engine/GameController.class differ
diff --git a/MAVENProject/target/classes/engine/GameEngineGraphical.class b/MAVENProject/target/classes/engine/GameEngineGraphical.class
index d78696d676837411d2913bb11e6fa3c93d8fce18..584dd1386a171b0dc38c330b1f02979c3717a25b 100644
Binary files a/MAVENProject/target/classes/engine/GameEngineGraphical.class and b/MAVENProject/target/classes/engine/GameEngineGraphical.class differ
diff --git a/MAVENProject/target/classes/entity/Character.class b/MAVENProject/target/classes/entity/Character.class
index 961cd825e992b33e19ad48ed340b6573797eac2d..8aeb807e07e94b6705daac27ef5d235030f866b2 100644
Binary files a/MAVENProject/target/classes/entity/Character.class and b/MAVENProject/target/classes/entity/Character.class differ
diff --git a/MAVENProject/target/classes/entity/Entity.class b/MAVENProject/target/classes/entity/Entity.class
index b194b2d0b03238e4ca5feaaa4d1a31ea5e015b8d..752e41fda65e67dc6323f5903c4463e6b8710315 100644
Binary files a/MAVENProject/target/classes/entity/Entity.class and b/MAVENProject/target/classes/entity/Entity.class differ
diff --git a/MAVENProject/target/classes/environnement/Coordonnees.class b/MAVENProject/target/classes/environnement/Coordonnees.class
index 6f7588ac0caef9e0ebe2fb7e5747aec79a067645..e7b415d8f21edd13af101ae3d937dcefb7162bf4 100644
Binary files a/MAVENProject/target/classes/environnement/Coordonnees.class and b/MAVENProject/target/classes/environnement/Coordonnees.class differ
diff --git a/MAVENProject/target/classes/model/PacmanController.class b/MAVENProject/target/classes/model/PacmanController.class
deleted file mode 100644
index 35592d36134d88cbaad125dd44b230faded67fcf..0000000000000000000000000000000000000000
Binary files a/MAVENProject/target/classes/model/PacmanController.class and /dev/null differ
diff --git a/MAVENProject/target/classes/model/PacmanGame.class b/MAVENProject/target/classes/model/PacmanGame.class
deleted file mode 100644
index fc54765013d34045f54dd6913506eb0ce2dfe27a..0000000000000000000000000000000000000000
Binary files a/MAVENProject/target/classes/model/PacmanGame.class and /dev/null differ
diff --git a/MAVENProject/target/classes/model/PacmanPainter.class b/MAVENProject/target/classes/model/PacmanPainter.class
deleted file mode 100644
index ed3d5948fc1669fb7bc40f0f1500f9c54ba29e9c..0000000000000000000000000000000000000000
Binary files a/MAVENProject/target/classes/model/PacmanPainter.class and /dev/null differ
diff --git a/MAVENProject/target/classes/start/Main.class b/MAVENProject/target/classes/start/Main.class
index 4fd39d0e8631d8f7e9cbfa6da7880087805c894d..d8ca1e8981320dbbf938078d21041d07de9e1b54 100644
Binary files a/MAVENProject/target/classes/start/Main.class and b/MAVENProject/target/classes/start/Main.class differ