diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 92c424babe02454fa3ed7e496120e2c98576476e..0000000000000000000000000000000000000000 --- a/.gitignore +++ /dev/null @@ -1,142 +0,0 @@ -dossiers_python/ABR.py -dossiers_python/Calculatrice.py -dossiers_python/calculs.py -dossiers_python/constellation.pdf -dossiers_python/constellation.py -dossiers_python/courbe tutorat.png -dossiers_python/domino.pdf -dossiers_python/domino.py -dossiers_python/DS_INFO.py -dossiers_python/examen_blanc-2018_Louis_Malterre.py -dossiers_python/LinkedList.py -dossiers_python/principal_puissance_4.py -dossiers_python/Puissance_4.py -dossiers_python/satellite.pdf -dossiers_python/satellite.py -dossiers_python/test listes et tuples.py -dossiers_python/test_visual_studio.py -dossiers_python/tirage_au_sort_sans_remise.py -dossiers_python/tkinter_tests.py -dossiers_python/TP_1_INFO_CASINO_Louis_Malterre.pdf -dossiers_python/TP_1_INFO_CASINO.py -dossiers_python/Tutorat3_S6.py -dossiers_python/tutorat4_2.py -dossiers_python/tutorat4_exo1.pdf -dossiers_python/tutorat4_exos2_3.pdf -dossiers_python/tutorat4.py -dossiers_python/__pycache__/Puissance_4.cpython-39.pyc -dossiers_python/__pycache__/satellite.cpython-37.pyc -Dossiers_C_Cpp/tests_C.c -dossiers_java_verdun/.metadata/.lock -dossiers_java_verdun/.metadata/.log -dossiers_java_verdun/.metadata/version.ini -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.history/1c/203f49637bda001c16ece3b36c1e12af -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.history/84/d0c4d86c7fda001c16ece3b36c1e12af -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.history/ae/40a000807bda001c16ece3b36c1e12af -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.location -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/.markers -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/.indexes/af/history.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/.indexes/e4/e0/history.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/org.eclipse.jdt.core/state.dat -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.junit.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.urischeme.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi -dossiers_java_verdun/.metadata/.plugins/org.eclipse.egit.core/.org.eclipse.egit.core.cmp/.project -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/1006839657.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/1167275426.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/2059211254.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.junit/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser -dossiers_java_verdun/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log -dossiers_java_verdun/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.16.3.20211002-1029.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup -dossiers_java_verdun/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.ui.intro/introstate -dossiers_java_verdun/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml -dossiers_java_verdun/AppliDebug/.classpath -dossiers_java_verdun/AppliDebug/.project -dossiers_java_verdun/AppliDebug/Fourniture.zip -dossiers_java_verdun/AppliDebug/.settings/org.eclipse.jdt.core.prefs -dossiers_java_verdun/AppliDebug/Fourniture/.DS_Store -dossiers_java_verdun/AppliDebug/Fourniture/testEtat1.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat2.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat3.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat4.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat5.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat6.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat7.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat8.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat9.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat10.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat11.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat12.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat13.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat14.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat15.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat16.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat17.jar -dossiers_java_verdun/AppliDebug/Fourniture/META-INF/MANIFEST.MF -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._.DS_Store -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat1.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat2.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat3.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat4.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat5.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat6.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat7.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat8.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat9.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat10.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat11.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat12.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat13.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat14.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat15.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat16.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat17.jar -dossiers_java_verdun/AppliDebug/bin/Debugueur/Debug.class -dossiers_java_verdun/AppliDebug/src/Debugueur/Debug.java -dossiers_java_verdun/AppliDebug/testEtat/Conteneur.class -dossiers_java_verdun/AppliDebug/testEtat/DebordementConteneur.class -dossiers_java_verdun/AppliDebug/testEtat/ErreurConteneur.class -dossiers_java_verdun/Debugueur/README.md -dossiers_java_verdun/Debugueur/.vscode/settings.json -dossiers_java_verdun/test_java/.classpath -dossiers_java_verdun/test_java/.project -dossiers_java_verdun/test_java/.vscode/settings.json -dossiers_java_verdun/test_java/bin/test_java/Test.class -dossiers_java_verdun/test_java/src/test_java/Debugueur.java -dossiers_java_verdun/test_java/src/test_java/Test.java -dossiers_java_verdun/test_vs_java/bin/.project -projet_ACL/test.java diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/engine/Cmd.class b/MAVENProject/target/classes/engine/Cmd.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/engine/Cmd.class rename to MAVENProject/target/classes/engine/Cmd.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/engine/DrawingPanel.class b/MAVENProject/target/classes/engine/DrawingPanel.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/engine/DrawingPanel.class rename to MAVENProject/target/classes/engine/DrawingPanel.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/engine/Game.class b/MAVENProject/target/classes/engine/Game.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/engine/Game.class rename to MAVENProject/target/classes/engine/Game.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GameController.class b/MAVENProject/target/classes/engine/GameController.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GameController.class rename to MAVENProject/target/classes/engine/GameController.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GameEngineGraphical.class b/MAVENProject/target/classes/engine/GameEngineGraphical.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GameEngineGraphical.class rename to MAVENProject/target/classes/engine/GameEngineGraphical.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GamePainter.class b/MAVENProject/target/classes/engine/GamePainter.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GamePainter.class rename to MAVENProject/target/classes/engine/GamePainter.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GraphicalInterface.class b/MAVENProject/target/classes/engine/GraphicalInterface.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/engine/GraphicalInterface.class rename to MAVENProject/target/classes/engine/GraphicalInterface.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/entity/Character.class b/MAVENProject/target/classes/entity/Character.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/entity/Character.class rename to MAVENProject/target/classes/entity/Character.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/entity/Entity.class b/MAVENProject/target/classes/entity/Entity.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/entity/Entity.class rename to MAVENProject/target/classes/entity/Entity.class diff --git a/MAVENProject/target/classes/environnement/Coordonnees.class b/MAVENProject/target/classes/environnement/Coordonnees.class new file mode 100644 index 0000000000000000000000000000000000000000..6c3e1aeffbc68a431a3f6e89bf773969bcab551b Binary files /dev/null and b/MAVENProject/target/classes/environnement/Coordonnees.class differ diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/jeu/Controller.class b/MAVENProject/target/classes/jeu/Controller.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/jeu/Controller.class rename to MAVENProject/target/classes/jeu/Controller.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/jeu/Jeu.class b/MAVENProject/target/classes/jeu/Jeu.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/jeu/Jeu.class rename to MAVENProject/target/classes/jeu/Jeu.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/jeu/Painter.class b/MAVENProject/target/classes/jeu/Painter.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/jeu/Painter.class rename to MAVENProject/target/classes/jeu/Painter.class diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/start/Main.class b/MAVENProject/target/classes/start/Main.class similarity index 100% rename from projet_ACL/acl-project-main/MAVENProject/target/classes/start/Main.class rename to MAVENProject/target/classes/start/Main.class diff --git a/code.code-workspace b/code.code-workspace deleted file mode 100644 index 362d7c25bb405a5cc76d0c7518cc240999a574f4..0000000000000000000000000000000000000000 --- a/code.code-workspace +++ /dev/null @@ -1,7 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ] -} \ No newline at end of file diff --git a/projet_ACL/acl-project-main/.gitignore b/projet_ACL/acl-project-main/.gitignore deleted file mode 100644 index 65a7549f09c1c4f72c5292c6a8ececcf788235e7..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/.gitignore +++ /dev/null @@ -1,141 +0,0 @@ -dossiers_python/ABR.py -dossiers_python/Calculatrice.py -dossiers_python/calculs.py -dossiers_python/constellation.pdf -dossiers_python/constellation.py -dossiers_python/courbe tutorat.png -dossiers_python/domino.pdf -dossiers_python/domino.py -dossiers_python/DS_INFO.py -dossiers_python/examen_blanc-2018_Louis_Malterre.py -dossiers_python/LinkedList.py -dossiers_python/principal_puissance_4.py -dossiers_python/Puissance_4.py -dossiers_python/satellite.pdf -dossiers_python/satellite.py -dossiers_python/test listes et tuples.py -dossiers_python/test_visual_studio.py -dossiers_python/tirage_au_sort_sans_remise.py -dossiers_python/tkinter_tests.py -dossiers_python/TP_1_INFO_CASINO_Louis_Malterre.pdf -dossiers_python/TP_1_INFO_CASINO.py -dossiers_python/Tutorat3_S6.py -dossiers_python/tutorat4_2.py -dossiers_python/tutorat4_exo1.pdf -dossiers_python/tutorat4_exos2_3.pdf -dossiers_python/tutorat4.py -dossiers_python/__pycache__/Puissance_4.cpython-39.pyc -dossiers_python/__pycache__/satellite.cpython-37.pyc -Dossiers_C_Cpp/tests_C.c -dossiers_java_verdun/.metadata/.lock -dossiers_java_verdun/.metadata/.log -dossiers_java_verdun/.metadata/version.ini -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.history/1c/203f49637bda001c16ece3b36c1e12af -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.history/84/d0c4d86c7fda001c16ece3b36c1e12af -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.history/ae/40a000807bda001c16ece3b36c1e12af -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.location -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/.markers -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/.indexes/af/history.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/.indexes/e4/e0/history.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.projects/AppliDebug/org.eclipse.jdt.core/state.dat -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.junit.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jsch.core.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.browser.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.urischeme.prefs -dossiers_java_verdun/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi -dossiers_java_verdun/.metadata/.plugins/org.eclipse.egit.core/.org.eclipse.egit.core.cmp/.project -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/1006839657.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/1167275426.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/1865797976.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/2059211254.index -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/assumedExternalFilesCache -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/externalFilesCache -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/indexNamesMap.txt -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/javaLikeNames.txt -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.junit/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser -dossiers_java_verdun/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log -dossiers_java_verdun/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.16.3.20211002-1029.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup -dossiers_java_verdun/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.ui.intro/dialog_settings.xml -dossiers_java_verdun/.metadata/.plugins/org.eclipse.ui.intro/introstate -dossiers_java_verdun/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml -dossiers_java_verdun/AppliDebug/.classpath -dossiers_java_verdun/AppliDebug/.project -dossiers_java_verdun/AppliDebug/Fourniture.zip -dossiers_java_verdun/AppliDebug/.settings/org.eclipse.jdt.core.prefs -dossiers_java_verdun/AppliDebug/Fourniture/.DS_Store -dossiers_java_verdun/AppliDebug/Fourniture/testEtat1.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat2.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat3.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat4.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat5.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat6.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat7.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat8.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat9.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat10.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat11.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat12.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat13.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat14.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat15.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat16.jar -dossiers_java_verdun/AppliDebug/Fourniture/testEtat17.jar -dossiers_java_verdun/AppliDebug/Fourniture/META-INF/MANIFEST.MF -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._.DS_Store -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat1.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat2.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat3.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat4.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat5.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat6.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat7.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat8.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat9.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat10.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat11.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat12.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat13.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat14.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat15.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat16.jar -dossiers_java_verdun/AppliDebug/__MACOSX/Fourniture/._testEtat17.jar -dossiers_java_verdun/AppliDebug/bin/Debugueur/Debug.class -dossiers_java_verdun/AppliDebug/src/Debugueur/Debug.java -dossiers_java_verdun/AppliDebug/testEtat/Conteneur.class -dossiers_java_verdun/AppliDebug/testEtat/DebordementConteneur.class -dossiers_java_verdun/AppliDebug/testEtat/ErreurConteneur.class -dossiers_java_verdun/Debugueur/README.md -dossiers_java_verdun/Debugueur/.vscode/settings.json -dossiers_java_verdun/test_java/.classpath -dossiers_java_verdun/test_java/.project -dossiers_java_verdun/test_java/.vscode/settings.json -dossiers_java_verdun/test_java/bin/test_java/Test.class -dossiers_java_verdun/test_java/src/test_java/Debugueur.java -dossiers_java_verdun/test_java/src/test_java/Test.java -dossiers_java_verdun/test_vs_java/bin/.project \ No newline at end of file diff --git a/projet_ACL/acl-project-main/Backlog complet b/projet_ACL/acl-project-main/Backlog complet deleted file mode 100644 index fd9ed5c7c3e638a8e7225e6303ca2242b555c09c..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/Backlog complet +++ /dev/null @@ -1,22 +0,0 @@ -Fonctionnalités : -Vison: Le héros a pour but de récupérer les 3 clés puis de battre un boss -Le Héros : -• Se déplace sur le terrain (déplacement horizontale + saute) de jeu dans un environnement 2D -• Attaques disponibles pour le héros (attaque mêlée ou distance) -Environnement : -• Plateau de jeu en 2 dimensions ( -• Sol généré par défaut -• Plateformes dans l’environnement 2D impossible à traverser -• Scrolling centré sur le héros -• Trésors : si le héros arrive sur cette case il gagne une clé -Monstres : -• Monstres défendant les coffres -• Monstres se déplacent cycliquement -• Montres se déplacent vers le héros si celui-ci est dans sa ligne de mire -• Boss plus grand et plus fort que les autres montres -Attaques : -• Le Héros est tué après 3 attaques des monstres -• Les monstres sont tués après une attaque du héros sauf pour le boss -Interface : -• Possibilité de voir le nombre de vie restante après sur l’écran de jeu -• Attaques à distance et mêlée pour monstre et héros diff --git a/projet_ACL/acl-project-main/Backlog sprint 1 b/projet_ACL/acl-project-main/Backlog sprint 1 deleted file mode 100644 index b57082dc9ee6ef9559eb843cde54f0eeb984a791..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/Backlog sprint 1 +++ /dev/null @@ -1,5 +0,0 @@ -Environnement : -• Créer un environnement 2D graphique -• Implémenter les déplacements simples du personnage -• Collision du personnage avec l’environnement -• Création simple de la map diff --git a/projet_ACL/acl-project-main/Diagramme_UML_ACL_Sprint1.docx b/projet_ACL/acl-project-main/Diagramme_UML_ACL_Sprint1.docx deleted file mode 100644 index 93ebdd24593a816360c83c3d0ab249e9ac943a9c..0000000000000000000000000000000000000000 Binary files a/projet_ACL/acl-project-main/Diagramme_UML_ACL_Sprint1.docx and /dev/null differ diff --git "a/projet_ACL/acl-project-main/Distribution des t\303\242ches" "b/projet_ACL/acl-project-main/Distribution des t\303\242ches" deleted file mode 100644 index 0f19b3eb7c1d1631fb785378bb15f1daa1942099..0000000000000000000000000000000000000000 --- "a/projet_ACL/acl-project-main/Distribution des t\303\242ches" +++ /dev/null @@ -1,2 +0,0 @@ -Environnement et personnage : Louis MALTERRE et Louis BRUGNEAUX -Interface graphique : Florian RICHARD et Bruno LACOTE diff --git a/projet_ACL/acl-project-main/MAVENProject/PlanUML.puml b/projet_ACL/acl-project-main/MAVENProject/PlanUML.puml deleted file mode 100644 index 4bde9d3363365288fdefe841dfe5729bbba01ae9..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/PlanUML.puml +++ /dev/null @@ -1,121 +0,0 @@ -@startuml - -title Diagramme UML des Cyberpac 2077 - -java.awt.event.KeyListener <|-- engine.GameController -engine.GameController <|.. jeu.Controller -engine.Game <|.. jeu.Jeu -javax.swing.JPanel <|-- engine.DrawingPanel -engine.GameController <|-- engine.GameEngineGraphical -engine.Game <|-- engine.GameEngineGraphical -engine.GamePainter <|-- engine.GameEngineGraphical -engine.GraphicalInterface <|-- engine.GameEngineGraphical -engine.Cmd <|-- jeu.Controller -engine.DrawingPanel <|-- engine.GraphicalInterface -engine.GamePainter <|-- engine.DrawingPanel -environment.Coordonnees <|-- entity.Character -environment.Coordonnees <|-- entity.Monster -engine.GamePainter <|.. environment.Obstacle - -interface engine.GameController { -+ Cmd getCommand() -} -enum engine.Cmd { -+ LEFT -+ RIGHT -+ JUMP -+ IDLE -} -class engine.GraphicalInterface { -- DrawingPanel panel -+ <<Create>> GraphicalInterface(GamePainter,GameController) -+ void paint() -} - -class engine.DrawingPanel { -- {static} long serialVersionUID -- GamePainter painter -- BufferedImage nextImage -- BufferedImage currentImage -- int width -+ <<Create>> DrawingPanel(GamePainter) -+ void drawGame() -+ void paint(Graphics) -} - -class start.Main { -+ {static} void main(String[]) -} -interface engine.GamePainter { -+ {abstract}void draw(BufferedImage) -+ {abstract}int getWidth() -+ {abstract}int getHeight() -} -interface engine.Game { -+ void evolve(Cmd) -+ boolean isFinished() -} -class engine.GameEngineGraphical { -- Game game -- GamePainter gamePainter -- GameController gameController -- GraphicalInterface gui -+ <<Create>> GameEngineGraphical(Game,GamePainter,GameController) -+ void run() -} -class entity.Character { -+ void deplacements() -+ void attaque() -+ Coordonnees positions -+ int vmax -} -class entity.Monster{ -+ Coordonnees positions -+ void deplacements() -+ void attaque() -+ int vmax -} - - -interface entity.Entity{ -+ void deplacements() -+ void attaque() -} -entity.Entity <|.. entity.Character -entity.Entity <|.. entity.Monster - - -class environment.Object { -} -class environment.Obstacle{ -} -class environment.Coordonnees{ -+ int x -+ int z -+ {static} int distance(Object,Object) -} - - -class jeu.Painter{ -# {static} int WIDTH -# {static} int HEIGHT -+ <<Create>> Painter() -+ void draw(BufferedImage) -+ int getWidth() -+ int getHeight() -} -class jeu.Controller { -- Cmd commandeEnCours -+ <<Create>> PacmanController() -+ Cmd getCommand() -+ void keyPressed(KeyEvent) -+ void keyReleased(KeyEvent) -+ void keyTyped(KeyEvent) -} -class jeu.Jeu{ -+ <<Create>> Jeu(String) -+ void evolve(Cmd) -+ boolean isFinished() -} - -@enduml \ No newline at end of file diff --git a/projet_ACL/acl-project-main/MAVENProject/pom.xml b/projet_ACL/acl-project-main/MAVENProject/pom.xml deleted file mode 100644 index 60902a9c62ec07ceb2737e97ffaaea713a635eac..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/pom.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>ACLISN2022.cyberpac2077</groupId> - <artifactId>MAVENProject</artifactId> - <version>1.0-SNAPSHOT</version> - - - <properties> - <maven.compiler.source>17</maven.compiler.source> - <maven.compiler.target>17</maven.compiler.target> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - -</project> \ No newline at end of file diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/Cmd.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/Cmd.java deleted file mode 100644 index c4554b05b9737cabdafadd96efd3b453609a93a8..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/Cmd.java +++ /dev/null @@ -1,9 +0,0 @@ -package engine; - -/** - * @author Horatiu Cirstea - * - */ -public enum Cmd { - LEFT,RIGHT,JUMP,IDLE; -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/DrawingPanel.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/DrawingPanel.java deleted file mode 100644 index 9586bce41c8b8c519d0a4c541a0f1df1d3f2950c..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/DrawingPanel.java +++ /dev/null @@ -1,96 +0,0 @@ -package engine; - -/** - * @author Horatiu Cirstea, Vincent Thomas - * - */ -import java.awt.Dimension; -import java.awt.Graphics; -import java.awt.image.BufferedImage; - -import javax.swing.JPanel; - -public class DrawingPanel extends JPanel { - - /** - * - */ - private static final long serialVersionUID = 1L; - - /** - * la clase chargee de Dessiner - */ - private GamePainter painter; - - /** - * image suivante est l'image cachee sur laquelle dessiner - */ - private BufferedImage nextImage; - - /** - * image en cours est l'image entrain d'etre affichee - */ - private BufferedImage currentImage; - - /** - * la taille des images - */ - private int width, height; - - /** - * constructeur Il construit les images pour doublebuffering ainsi que le - * Panel associe. Les images stockent le painter et on demande au panel la - * mise a jour quand le painter est fini - * - * @param width - * largeur de l'image - * @param height - * hauteur de l'image - */ - public DrawingPanel(GamePainter painter) { - super(); - this.width = painter.getWidth(); - this.height = painter.getHeight(); - this.setPreferredSize(new Dimension(this.width, this.height)); - this.painter=painter; - - // cree l'image buffer et son graphics - this.nextImage = new BufferedImage(width, height, - BufferedImage.TYPE_INT_RGB); - this.currentImage = new BufferedImage(width, height, - BufferedImage.TYPE_INT_RGB); - } - - /** - * demande de mettre a jour le rendu de l'image sur le Panel. Creer une - * nouvelle image vide sur laquelle dessiner - */ - public void drawGame() { - // generer la nouvelle image - this.painter.draw(this.nextImage); - - // inverses les images doublebuffereing - BufferedImage temp = this.currentImage; - // l'image a dessiner est celle qu'on a construite - this.currentImage = this.nextImage; - // l'ancienne image est videe - this.nextImage = temp; - this.nextImage.getGraphics() - .fillRect(0, 0, this.width, this.height); - // met a jour l'image a afficher sur le panel - this.repaint(); - } - - /** - * redefinit la methode paint consiste a dessiner l'image en cours - * - * @param g - * graphics pour dessiner - */ - public void paint(Graphics g) { - super.paint(g); - g.drawImage(this.currentImage, 0, 0, getWidth(), getHeight(), 0, 0, - getWidth(), getHeight(), null); - } - -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/Game.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/Game.java deleted file mode 100644 index 12005596b711bcf72fcc217fd91a57fe0b3998db..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/Game.java +++ /dev/null @@ -1,24 +0,0 @@ -package engine; - -/** - * @author Horatiu Cirstea, Vincent Thomas - * - * un jeu qui peut evoluer (avant de se terminer) sur un plateau width x - * height - */ -public interface Game { - - /** - * methode qui contient l'evolution du jeu en fonction de la commande - * - * @param userCmd - * commande utilisateur - */ - public void evolve(Cmd userCmd); - - /** - * @return true si et seulement si le jeu est fini - */ - public boolean isFinished(); - -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GameController.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GameController.java deleted file mode 100644 index 461a610c19b38db3408f0f2de88470771e19a300..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GameController.java +++ /dev/null @@ -1,21 +0,0 @@ -package engine; - -import java.awt.event.KeyListener; - -/** - * @author Horatiu Cirstea - * - * controleur qui envoie des commandes au jeu - * - */ -public interface GameController extends KeyListener { - - /** - * quand on demande les commandes, le controleur retourne la commande en - * cours - * - * @return commande faite par le joueur - */ - public Cmd getCommand(); - -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GameEngineGraphical.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GameEngineGraphical.java deleted file mode 100644 index c2d643da69e7822bd42e23e094fd9bf83454cfd9..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GameEngineGraphical.java +++ /dev/null @@ -1,70 +0,0 @@ -package engine; - -/** - * @author Horatiu Cirstea, Vincent Thomas - * - * moteur de game generique. - * On lui passe un game et un afficheur et il permet d'executer un game. - */ -public class GameEngineGraphical { - - /** - * le game a executer - */ - private Game game; - - /** - * l'afficheur a utiliser pour le rendu - */ - private GamePainter gamePainter; - - /** - * le controlleur a utiliser pour recuperer les commandes - */ - private GameController gameController; - - /** - * l'interface graphique - */ - private GraphicalInterface gui; - - /** - * construit un moteur - * - * @param game - * game a lancer - * @param gamePainter - * afficheur a utiliser - * @param gameController - * controlleur a utiliser - * - */ - public GameEngineGraphical(Game game, GamePainter gamePainter, GameController gameController) { - // creation du game - this.game = game; - this.gamePainter = gamePainter; - this.gameController = gameController; - } - - /** - * permet de lancer le game - */ - public void run() throws InterruptedException { - - // creation de l'interface graphique - this.gui = new GraphicalInterface(this.gamePainter,this.gameController); - - // boucle de game - while (!this.game.isFinished()) { - // demande controle utilisateur - Cmd c = this.gameController.getCommand(); - // fait evoluer le game - this.game.evolve(c); - // affiche le game - this.gui.paint(); - // met en attente - Thread.sleep(100); - } - } - -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GamePainter.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GamePainter.java deleted file mode 100644 index 790d64fa73c1108a3f7535bad11f49392c32ab46..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GamePainter.java +++ /dev/null @@ -1,26 +0,0 @@ -package engine; - -import java.awt.image.BufferedImage; - -/** - * @author Horatiu Cirstea, Vincent Thomas - * - * represente la maniere de dessiner sur un JPanel - * - */ -public interface GamePainter { - - /** - * methode dessiner a completer. Elle construit une image correspondant au - * jeu. Game est un attribut de l'afficheur - * - * @param image - * image sur laquelle dessiner - */ - public abstract void draw(BufferedImage image); - - public abstract int getWidth(); - - public abstract int getHeight(); - -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GraphicalInterface.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GraphicalInterface.java deleted file mode 100644 index 19d20bdbefba47579a4f99e24eb200d5cc426b43..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/engine/GraphicalInterface.java +++ /dev/null @@ -1,50 +0,0 @@ -package engine; - -import javax.swing.JFrame; - - -/** - * @author Horatiu Cirstea, Vincent Thomas - * - * interface graphique avec son controller et son afficheur - * - */ -public class GraphicalInterface { - - /** - * le Panel pour l'afficheur - */ - private DrawingPanel panel; - - /** - * la construction de l'interface graphique: JFrame avec panel pour le game - * - * @param gamePainter l'afficheur a utiliser dans le moteur - * @param gameController l'afficheur a utiliser dans le moteur - * - */ - public GraphicalInterface(GamePainter gamePainter, GameController gameController){ - JFrame f=new JFrame(); - f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - - // attacher le panel contenant l'afficheur du game - this.panel=new DrawingPanel(gamePainter); - f.setContentPane(this.panel); - - // attacher controller au panel du game - this.panel.addKeyListener(gameController); - - f.pack(); - f.setVisible(true); - f.getContentPane().setFocusable(true); - f.getContentPane().requestFocus(); - } - - /** - * mise a jour du dessin - */ - public void paint() { - this.panel.drawGame(); - } - -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/entity/Character.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/entity/Character.java deleted file mode 100644 index c08c88553340fb3b12b0918c5949451dce350c30..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/entity/Character.java +++ /dev/null @@ -1,21 +0,0 @@ -package entity; - -import environnement.Coordonnees; - -public class Character extends Entity{ - Coordonnees coord; - int vitesseMax; // vitesse max - - public Character(Coordonnees c,int vitesseMax){ - super(c,vitesseMax); - - } - - public void deplacements(){ - - } - - public void attaque(){ - - } -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/entity/Entity.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/entity/Entity.java deleted file mode 100644 index d0c9da22087bb567c35a0d221a1b8fbfab22a6b6..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/entity/Entity.java +++ /dev/null @@ -1,15 +0,0 @@ -package entity; - -import environnement.Coordonnees; - -public abstract class Entity { - Coordonnees coord; - int vitesseMax; - - public Entity(Coordonnees c,int vitesseMax){ - this.coord = c; - this.vitesseMax = vitesseMax; - } - public void deplacements(){} - public void attaque(){} -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/environnement/Coordonnees.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/environnement/Coordonnees.java deleted file mode 100644 index 0692f20db3b2d059424081833655827cdbad6e0e..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/environnement/Coordonnees.java +++ /dev/null @@ -1,23 +0,0 @@ -package environnement; - -import java.lang.ProcessBuilder.Redirect.Type; - -import entity.Entity; - -public class Coordonnees { - int x; - int z; - - public Coordonnees(int x,int z){ - this.x = x; - this.z = z; - } - - public static int distance(Object o1,Object o2){ - //if ((o1 instanceof Entity) || (o2 instanceof Entity))return Math.sqrt(Math.pow(o1.coord.x - o2.coord.x, 2) + Math.pow(o1.coord.y - o2.coord.y,2)); - return 0; - } - public static void fonctionTestCommit(){ - System.out.println("test"); - } -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Controller.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Controller.java deleted file mode 100644 index 2134babf087465e811041437dbbf022552bc5662..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Controller.java +++ /dev/null @@ -1,55 +0,0 @@ -package jeu; - -import engine.Cmd; -import engine.GameController; - -import java.awt.event.KeyEvent; - -public class Controller implements GameController{ - /* - * commande en cours - */ - private Cmd commandeEnCours; - - /* - * construction du controleur par defaut le controleur n'a pas de commande - */ - - public Controller() { - this.commandeEnCours = Cmd.IDLE; - } - - public Cmd getCommand() { - return this.commandeEnCours; - } - @Override - - public void keyPressed(KeyEvent e) { - - switch (e.getKeyChar()) { - // si on appuie sur 'q',commande joueur est gauche - case 'q': - case 'Q': - this.commandeEnCours = Cmd.LEFT; - break; - case 'd': - case 'D': - this.commandeEnCours = Cmd.RIGHT; - break; - case ' ': - this.commandeEnCours = Cmd.JUMP; - break; - } - } - @Override - - public void keyReleased(KeyEvent e) { - this.commandeEnCours = Cmd.IDLE; - } - @Override - - public void keyTyped(KeyEvent e) { - - } - -} \ No newline at end of file diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Jeu.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Jeu.java deleted file mode 100644 index a78f0dad3e73a9d6c21eb619df2f8fba24704f94..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Jeu.java +++ /dev/null @@ -1,47 +0,0 @@ -package jeu; - -import engine.Cmd; -import engine.Game; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; - -public class Jeu implements Game{ - - public Jeu(String source) { - BufferedReader helpReader; - try { - helpReader = new BufferedReader(new FileReader(source)); - String line; - while ((line = helpReader.readLine()) != null) { - System.out.println(line); - } - helpReader.close(); - } catch (IOException e) { - System.out.println("Help not available"); - } - } - - @Override - public void evolve(Cmd commande) { - System.out.println("Execute "+commande); - switch (commande) { - case LEFT: - break; - case RIGHT: - break; - case JUMP: - break; - case IDLE: - break; - } - } - - @Override - public boolean isFinished() { - // le jeu n'est jamais fini - return false; - } - -} \ No newline at end of file diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Painter.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Painter.java deleted file mode 100644 index 55d5f8ac9b0464074d7a03a6c06c00bd9f2fc9e5..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/jeu/Painter.java +++ /dev/null @@ -1,32 +0,0 @@ -package jeu; - -import engine.GamePainter; - -import java.awt.*; -import java.awt.image.BufferedImage; - -public class Painter implements GamePainter{ - - protected static final int WIDTH = 1000; - protected static final int HEIGHT = 100; - - public Painter() { - } - - @Override - public void draw(BufferedImage im) { - Graphics2D crayon = (Graphics2D) im.getGraphics(); - crayon.setColor(Color.blue); - crayon.fillOval(20,20,10,10); - } - - @Override - public int getWidth() { - return WIDTH; - } - - @Override - public int getHeight() { - return HEIGHT; - } -} diff --git a/projet_ACL/acl-project-main/MAVENProject/src/main/java/start/Main.java b/projet_ACL/acl-project-main/MAVENProject/src/main/java/start/Main.java deleted file mode 100644 index 2f32ec436e408e915fe62c6e5cbf1bed1b0da739..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/MAVENProject/src/main/java/start/Main.java +++ /dev/null @@ -1,25 +0,0 @@ -package start; - -import jeu.Painter; -import engine.GameEngineGraphical; -import jeu.Controller; -import jeu.Jeu; - -/** - * lancement du moteur avec le jeu - */ -public class Main { - - public static void main(String[] args) throws InterruptedException { - - // creation du jeu particulier et de son afficheur - Jeu game = new Jeu("helpFilePacman.txt"); - Painter painter = new Painter(); - Controller controller = new Controller(); - - // classe qui lance le moteur de jeu generique - GameEngineGraphical engine = new GameEngineGraphical(game, painter, controller); - engine.run(); - } - -} diff --git a/projet_ACL/acl-project-main/MAVENProject/target/classes/environnement/Coordonnees.class b/projet_ACL/acl-project-main/MAVENProject/target/classes/environnement/Coordonnees.class deleted file mode 100644 index 382e9e1f5e4465d1caf716c9789ffaaa2892df70..0000000000000000000000000000000000000000 Binary files a/projet_ACL/acl-project-main/MAVENProject/target/classes/environnement/Coordonnees.class and /dev/null differ diff --git a/projet_ACL/acl-project-main/README.md b/projet_ACL/acl-project-main/README.md deleted file mode 100644 index cb64c4815ffb6304f02cf714d211db420869a4ef..0000000000000000000000000000000000000000 --- a/projet_ACL/acl-project-main/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# ACL project - -Louis Brugneaux -Florian richard -Bruno Lacote -Louis Malterre