diff --git a/MAVENProject/PlanUML.puml b/MAVENProject/PlanUML.puml new file mode 100644 index 0000000000000000000000000000000000000000..4b5d18e108df2e73bec47915699eca6063be617f --- /dev/null +++ b/MAVENProject/PlanUML.puml @@ -0,0 +1,74 @@ +@startuml +interface engine.GameController { ++ Cmd getCommand() +} +class model.PacmanController { +- Cmd commandeEnCours ++ <<Create>> PacmanController() ++ Cmd getCommand() ++ void keyPressed(KeyEvent) ++ void keyReleased(KeyEvent) ++ void keyTyped(KeyEvent) +} +enum engine.Cmd { ++ LEFT ++ RIGHT ++ UP ++ IDLE +} +class engine.GraphicalInterface { +- DrawingPanel panel ++ <<Create>> GraphicalInterface(GamePainter,GameController) ++ void paint() +} +class model.PacmanGame { ++ <<Create>> PacmanGame(String) ++ void evolve(Cmd) ++ boolean isFinished() +} +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[]) +} +class model.PacmanPainter { +# {static} int WIDTH +# {static} int HEIGHT ++ <<Create>> PacmanPainter() ++ void draw(BufferedImage) ++ int getWidth() ++ int getHeight() +} +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() +} + + +java.awt.event.KeyListener <|-- engine.GameController +engine.GameController <|.. model.PacmanController +engine.Game <|.. model.PacmanGame +javax.swing.JPanel <|-- engine.DrawingPanel +engine.GamePainter <|.. model.PacmanPainter +@enduml \ No newline at end of file diff --git a/MAVENProject/src/main/java/engine/Cmd.java b/MAVENProject/src/main/java/engine/Cmd.java index 5dac240f1f1bba481bded682140b348cfaf65ba6..5a9196e14b63fb2a543ca0fecb6e8075323f7e25 100644 --- a/MAVENProject/src/main/java/engine/Cmd.java +++ b/MAVENProject/src/main/java/engine/Cmd.java @@ -5,5 +5,5 @@ package engine; * */ public enum Cmd { - LEFT,RIGHT,UP,DOWN,IDLE; + LEFT,RIGHT,UP,IDLE; } diff --git a/MAVENProject/src/main/java/model/PacmanController.java b/MAVENProject/src/main/java/model/PacmanController.java index a69318e28e39f08f0f0fa7730dcd2dbdd2dca681..4513391ba1c416c31e0057460c402effad1b027c 100644 --- a/MAVENProject/src/main/java/model/PacmanController.java +++ b/MAVENProject/src/main/java/model/PacmanController.java @@ -44,10 +44,17 @@ public class PacmanController implements GameController { switch (e.getKeyChar()) { // si on appuie sur 'q',commande joueur est gauche - case 'l': - case 'L': + case 'q': + case 'Q': this.commandeEnCours = Cmd.LEFT; break; + case 'd': + case 'D': + this.commandeEnCours = Cmd.RIGHT; + break; + case ' ': + this.commandeEnCours = Cmd.UP; + break; } } diff --git a/MAVENProject/src/main/java/model/PacmanGame.java b/MAVENProject/src/main/java/model/PacmanGame.java index ba44c56d53467fd7cc9931bb3b62785dab1ba7fc..181b4294e8a91dd1dc8379ab998012bc85ab097f 100644 --- a/MAVENProject/src/main/java/model/PacmanGame.java +++ b/MAVENProject/src/main/java/model/PacmanGame.java @@ -42,6 +42,7 @@ public class PacmanGame implements Game { @Override public void evolve(Cmd commande) { System.out.println("Execute "+commande); + } /** diff --git a/MAVENProject/src/main/java/model/PacmanPainter.java b/MAVENProject/src/main/java/model/PacmanPainter.java index 9f33ee42e6954c893e3971105e18bc59c52e7870..8052e6cc077ff8ae505be79a1ffd1f622fccaccf 100644 --- a/MAVENProject/src/main/java/model/PacmanPainter.java +++ b/MAVENProject/src/main/java/model/PacmanPainter.java @@ -17,7 +17,7 @@ public class PacmanPainter implements GamePainter { /** * la taille des cases */ - protected static final int WIDTH = 100; + protected static final int WIDTH = 1000; protected static final int HEIGHT = 100; /** @@ -36,7 +36,7 @@ public class PacmanPainter implements GamePainter { public void draw(BufferedImage im) { Graphics2D crayon = (Graphics2D) im.getGraphics(); crayon.setColor(Color.blue); - crayon.fillOval(0,0,10,10); + crayon.fillOval(20,20,10,10); } @Override