From ded4dd7b7ef967faf21ce893518a184964f1248c Mon Sep 17 00:00:00 2001
From: Azurlors <florianrichard2001@gmail.com>
Date: Mon, 14 Nov 2022 22:28:47 +0100
Subject: [PATCH] =?UTF-8?q?Affiche=20rudimentaire=20du=20sol=20plus=20mise?=
=?UTF-8?q?=20=C3=A0=20jour=20UML?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
MAVENProject/PlanUML.puml | 33 ++++++++-----------
.../main/java/engine/GameEngineGraphical.java | 2 +-
.../src/main/java/entity/Character.java | 9 +++--
.../src/main/java/environnement/Object.java | 4 +++
.../src/main/java/environnement/Obstacle.java | 2 +-
.../src/main/java/jeu/Controller.java | 10 +++---
MAVENProject/src/main/java/jeu/Jeu.java | 6 ++--
MAVENProject/src/main/java/jeu/Painter.java | 22 +++++++++++--
8 files changed, 50 insertions(+), 38 deletions(-)
create mode 100644 MAVENProject/src/main/java/environnement/Object.java
diff --git a/MAVENProject/PlanUML.puml b/MAVENProject/PlanUML.puml
index 42c30d5..5578772 100644
--- a/MAVENProject/PlanUML.puml
+++ b/MAVENProject/PlanUML.puml
@@ -10,22 +10,16 @@ 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
+environment.Coordonnees <|-- entity.Entity
+environment.Coordonnees *-- jeu.Jeu
+entity.Character *-- jeu.Jeu
interface engine.GameController {
+ Cmd getCommand()
}
-enum engine.Cmd {
-+ LEFT
-+ RIGHT
-+ JUMP
-+ IDLE
-}
+
class engine.GraphicalInterface {
- DrawingPanel panel
+ <<Create>> GraphicalInterface(GamePainter,GameController)
@@ -64,10 +58,9 @@ class engine.GameEngineGraphical {
+ void run()
}
class entity.Character {
+- masse
+ void deplacements()
+ void attaque()
-+ Coordonnees positions
-+ int vmax
}
class entity.Monster{
+ Coordonnees positions
@@ -88,6 +81,8 @@ entity.Entity <|.. entity.Monster
class environment.Object {
}
class environment.Obstacle{
+- HashMap<String, Coordonnees> extremites
+- int static defaultUnit
}
class environment.Coordonnees{
- int x
@@ -105,13 +100,16 @@ class jeu.Painter{
# {static} int HEIGHT
+ <<Create>> Painter()
+ void draw(BufferedImage)
+- void drawCharacter(Graphics2D)
+- void drawSol(Graphics2D)
+- void drawObstacle(Graphics2D)
+ int getWidth()
+ int getHeight()
}
class jeu.Controller {
-- Cmd commandeEnCours
-+ <<Create>> PacmanController()
-+ Cmd getCommand()
+- boolean isRightPressed, isLeftPressed, isSpacePressed
++ <<Create>> Controller()
++ ArrayList<Boolean> getCommand()
+ void keyPressed(KeyEvent)
+ void keyReleased(KeyEvent)
+ void keyTyped(KeyEvent)
@@ -121,14 +119,9 @@ class jeu.Jeu{
+ void evolve(Cmd)
+ boolean isFinished()
}
-<<<<<<< HEAD
class environment.Physique{
- double g
- double lambda
}
-=======
-
-
->>>>>>> b21761b421591b5fad482fd94972d5eb53ff8a31
@enduml
\ No newline at end of file
diff --git a/MAVENProject/src/main/java/engine/GameEngineGraphical.java b/MAVENProject/src/main/java/engine/GameEngineGraphical.java
index e9834fe..2cf5494 100644
--- a/MAVENProject/src/main/java/engine/GameEngineGraphical.java
+++ b/MAVENProject/src/main/java/engine/GameEngineGraphical.java
@@ -65,7 +65,7 @@ public class GameEngineGraphical {
// affiche le game
this.gui.paint();
// met en attente
- Thread.sleep(1);
+ Thread.sleep(2);
}
}
diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java
index df081c6..61e09f5 100644
--- a/MAVENProject/src/main/java/entity/Character.java
+++ b/MAVENProject/src/main/java/entity/Character.java
@@ -6,15 +6,14 @@ import environnement.Physique;
import jeu.Jeu;
public class Character extends Entity{
- //Coordonnees coord;
- //double vitesseMax; // vitesse max
+
double vitesseActuX = 0; // vitesse actuelle supposée nulle au départ
double vitesseActuZ = 0;
- double m;
+ private double masse;
public Character(Coordonnees c,double vitesseMax,double m){
super(c,vitesseMax);
- this.m = m;
+ this.masse = m;
}
@Override
@@ -59,7 +58,7 @@ public class Character extends Entity{
}
public double getM() {
- return m;
+ return masse;
}
diff --git a/MAVENProject/src/main/java/environnement/Object.java b/MAVENProject/src/main/java/environnement/Object.java
new file mode 100644
index 0000000..e268ff7
--- /dev/null
+++ b/MAVENProject/src/main/java/environnement/Object.java
@@ -0,0 +1,4 @@
+package environnement;
+
+public class Object {
+}
diff --git a/MAVENProject/src/main/java/environnement/Obstacle.java b/MAVENProject/src/main/java/environnement/Obstacle.java
index 166306f..570904d 100644
--- a/MAVENProject/src/main/java/environnement/Obstacle.java
+++ b/MAVENProject/src/main/java/environnement/Obstacle.java
@@ -6,7 +6,7 @@ public class Obstacle {
//private final Coordonnees centre;
private HashMap<String, Coordonnees> extremites;
- private int defaultUnit = 10;
+ private static int defaultUnit = 10;
public Obstacle(Coordonnees c){
HashMap<String, Coordonnees> extremites = new HashMap<String,Coordonnees>();
diff --git a/MAVENProject/src/main/java/jeu/Controller.java b/MAVENProject/src/main/java/jeu/Controller.java
index 17afb64..93e4edd 100644
--- a/MAVENProject/src/main/java/jeu/Controller.java
+++ b/MAVENProject/src/main/java/jeu/Controller.java
@@ -24,11 +24,11 @@ public class Controller implements GameController{
*/
@Override
public ArrayList<Boolean> getCommand() {
- ArrayList<Boolean> a = new ArrayList<Boolean>();
- a.add(isRightPressed);
- a.add(isLeftPressed);
- a.add(isSpacePressed);
- return a;
+ ArrayList<Boolean> cmd = new ArrayList<Boolean>();
+ cmd.add(isRightPressed);
+ cmd.add(isLeftPressed);
+ cmd.add(isSpacePressed);
+ return cmd;
}
@Override
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 9cd11d2..a994f98 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -1,13 +1,13 @@
package jeu;
-import engine.Game;
-import environnement.Coordonnees;
-
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
+
import entity.Character;
+import engine.Game;
+import environnement.Coordonnees;
public class Jeu implements Game{
diff --git a/MAVENProject/src/main/java/jeu/Painter.java b/MAVENProject/src/main/java/jeu/Painter.java
index fa86c89..0a63a12 100644
--- a/MAVENProject/src/main/java/jeu/Painter.java
+++ b/MAVENProject/src/main/java/jeu/Painter.java
@@ -1,9 +1,12 @@
package jeu;
import engine.GamePainter;
+import environnement.Obstacle;
+
import java.awt.*;
import java.awt.image.BufferedImage;
import static jeu.Jeu.charac;
+import static jeu.Jeu.getCoordSol;
public class Painter implements GamePainter{
@@ -18,9 +21,8 @@ public class Painter implements GamePainter{
public void draw(BufferedImage im) {
Graphics2D crayon = (Graphics2D) im.getGraphics();
crayon.setColor(Color.blue);
- int x = (int) charac.getCoord().getX();
- int y = (int) charac.getCoord().getZ();
- crayon.fillRect(x-15,y-30,30,60);
+ drawCharacter(crayon);
+ drawSol(crayon);
}
@Override
@@ -32,4 +34,18 @@ public class Painter implements GamePainter{
public int getHeight() {
return HEIGHT;
}
+
+ private void drawCharacter(Graphics2D crayon){
+ int x = (int) charac.getCoord().getX();
+ int y = (int) charac.getCoord().getZ();
+ crayon.fillRect(x-15,y-30,30,60);
+ }
+
+ private void drawObstacle(Graphics2D crayon, Obstacle obstacle){
+
+ }
+
+ private void drawSol(Graphics2D crayon){
+ crayon.drawLine(0,(int) getCoordSol().getZ(),getWidth(),(int) getCoordSol().getZ());
+ }
}
--
GitLab