diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/acl-project.iml b/.idea/acl-project.iml new file mode 100644 index 0000000000000000000000000000000000000000..d6ebd4805981b8400db3e3291c74a743fef9a824 --- /dev/null +++ b/.idea/acl-project.iml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..2ff1d615cfb9058347abf5d315105b00558abe95 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?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 new file mode 100644 index 0000000000000000000000000000000000000000..35eb1ddfbbc029bcab630581847471d7f238ec53 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?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 new file mode 100644 index 0000000000000000000000000000000000000000..26d33521af10bcc7fd8cea344038eaaeb78d0ef5 --- /dev/null +++ b/MAVENProject/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/MAVENProject/.idea/compiler.xml b/MAVENProject/.idea/compiler.xml new file mode 100644 index 0000000000000000000000000000000000000000..a505de900913b081809f7440046d7803203279d0 --- /dev/null +++ b/MAVENProject/.idea/compiler.xml @@ -0,0 +1,13 @@ +<?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 new file mode 100644 index 0000000000000000000000000000000000000000..aa00ffab7828f4818589659c804ec2cfd99baed3 --- /dev/null +++ b/MAVENProject/.idea/encodings.xml @@ -0,0 +1,7 @@ +<?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 new file mode 100644 index 0000000000000000000000000000000000000000..712ab9d985c20018a0c97b93d2148ac1ffe588a5 --- /dev/null +++ b/MAVENProject/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ +<?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 new file mode 100644 index 0000000000000000000000000000000000000000..110ad632d7ee453dac7eba3417e98c2d44e630c6 --- /dev/null +++ b/MAVENProject/.idea/misc.xml @@ -0,0 +1,12 @@ +<?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 new file mode 100644 index 0000000000000000000000000000000000000000..6c0b8635858dc7ad44b93df54b762707ce49eefc --- /dev/null +++ b/MAVENProject/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?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/PlanUML.puml b/MAVENProject/PlanUML.puml index cf9e1920ec25269a3e90b5f4d14b81d248a54b19..4bde9d3363365288fdefe841dfe5729bbba01ae9 100644 --- a/MAVENProject/PlanUML.puml +++ b/MAVENProject/PlanUML.puml @@ -1,5 +1,7 @@ @startuml +title Diagramme UML des Cyberpac 2077 + java.awt.event.KeyListener <|-- engine.GameController engine.GameController <|.. jeu.Controller engine.Game <|.. jeu.Jeu @@ -65,13 +67,13 @@ class entity.Character { + void deplacements() + void attaque() + Coordonnees positions -+ int statVitesse ++ int vmax } class entity.Monster{ + Coordonnees positions + void deplacements() + void attaque() -+ int statVitesse ++ int vmax } diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java index d2f6972bb98fccaae928a6c7e3cf84874e4b2dad..c08c88553340fb3b12b0918c5949451dce350c30 100644 --- a/MAVENProject/src/main/java/entity/Character.java +++ b/MAVENProject/src/main/java/entity/Character.java @@ -1,4 +1,21 @@ package entity; -public class Character { +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/MAVENProject/src/main/java/entity/Entity.java b/MAVENProject/src/main/java/entity/Entity.java new file mode 100644 index 0000000000000000000000000000000000000000..d0c9da22087bb567c35a0d221a1b8fbfab22a6b6 --- /dev/null +++ b/MAVENProject/src/main/java/entity/Entity.java @@ -0,0 +1,15 @@ +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/MAVENProject/src/main/java/environnement/Coordonnees.java b/MAVENProject/src/main/java/environnement/Coordonnees.java new file mode 100644 index 0000000000000000000000000000000000000000..11ca66d0d930c4c5eb4dda4bf6ff02a82d558d1c --- /dev/null +++ b/MAVENProject/src/main/java/environnement/Coordonnees.java @@ -0,0 +1,19 @@ +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)); + } +} diff --git a/MAVENProject/target/classes/engine/Cmd.class b/MAVENProject/target/classes/engine/Cmd.class new file mode 100644 index 0000000000000000000000000000000000000000..96ec15ff91fa40538b1cc5d4dafac9f35303bbef Binary files /dev/null and b/MAVENProject/target/classes/engine/Cmd.class differ diff --git a/MAVENProject/target/classes/engine/DrawingPanel.class b/MAVENProject/target/classes/engine/DrawingPanel.class new file mode 100644 index 0000000000000000000000000000000000000000..80b94b057754a97bb174f1788afafe86b367ef7c Binary files /dev/null and b/MAVENProject/target/classes/engine/DrawingPanel.class differ diff --git a/MAVENProject/target/classes/engine/Game.class b/MAVENProject/target/classes/engine/Game.class new file mode 100644 index 0000000000000000000000000000000000000000..f184370bcf90dd9b1e0a353c7233b02afbe8508c Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..db41a0e51ed810f69348c7aebc40cf70b044f703 Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..d78696d676837411d2913bb11e6fa3c93d8fce18 Binary files /dev/null and b/MAVENProject/target/classes/engine/GameEngineGraphical.class differ diff --git a/MAVENProject/target/classes/engine/GamePainter.class b/MAVENProject/target/classes/engine/GamePainter.class new file mode 100644 index 0000000000000000000000000000000000000000..3d2d5e6004535104b5d2566cbac7c7898e2727c6 Binary files /dev/null and b/MAVENProject/target/classes/engine/GamePainter.class differ diff --git a/MAVENProject/target/classes/engine/GraphicalInterface.class b/MAVENProject/target/classes/engine/GraphicalInterface.class new file mode 100644 index 0000000000000000000000000000000000000000..c20a58112bf323b2805fd399bbce8310086ff412 Binary files /dev/null and b/MAVENProject/target/classes/engine/GraphicalInterface.class differ diff --git a/MAVENProject/target/classes/entity/Character.class b/MAVENProject/target/classes/entity/Character.class new file mode 100644 index 0000000000000000000000000000000000000000..961cd825e992b33e19ad48ed340b6573797eac2d Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..b194b2d0b03238e4ca5feaaa4d1a31ea5e015b8d Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..6f7588ac0caef9e0ebe2fb7e5747aec79a067645 Binary files /dev/null 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 new file mode 100644 index 0000000000000000000000000000000000000000..35592d36134d88cbaad125dd44b230faded67fcf Binary files /dev/null and b/MAVENProject/target/classes/model/PacmanController.class differ diff --git a/MAVENProject/target/classes/model/PacmanGame.class b/MAVENProject/target/classes/model/PacmanGame.class new file mode 100644 index 0000000000000000000000000000000000000000..fc54765013d34045f54dd6913506eb0ce2dfe27a Binary files /dev/null and b/MAVENProject/target/classes/model/PacmanGame.class differ diff --git a/MAVENProject/target/classes/model/PacmanPainter.class b/MAVENProject/target/classes/model/PacmanPainter.class new file mode 100644 index 0000000000000000000000000000000000000000..ed3d5948fc1669fb7bc40f0f1500f9c54ba29e9c Binary files /dev/null and b/MAVENProject/target/classes/model/PacmanPainter.class differ diff --git a/MAVENProject/target/classes/start/Main.class b/MAVENProject/target/classes/start/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..4fd39d0e8631d8f7e9cbfa6da7880087805c894d Binary files /dev/null and b/MAVENProject/target/classes/start/Main.class differ