diff --git a/MAVENProject/src/main/java/engine/DrawingPanel.java b/MAVENProject/src/main/java/engine/DrawingPanel.java index 04e5b49b4fc19d248dbb24e18c25907034417525..306a968c8b58026923b627343e9c0ed224a4db62 100644 --- a/MAVENProject/src/main/java/engine/DrawingPanel.java +++ b/MAVENProject/src/main/java/engine/DrawingPanel.java @@ -49,8 +49,8 @@ public class DrawingPanel extends JPanel { */ public DrawingPanel(GamePainter painter) { super(); - this.width = painter.getWidth(); - this.height = painter.getHeight(); + this.width = jeu.Painter.getWidth(); + this.height = jeu.Painter.getHeight(); this.setPreferredSize(new Dimension(this.width, this.height)); this.painter=painter; diff --git a/MAVENProject/src/main/java/engine/GameEngineGraphical.java b/MAVENProject/src/main/java/engine/GameEngineGraphical.java index 57078d9e416e45bf3eb588efc639a7a29fdf729c..34feb247562da8947b872701af9ea01ec4e73737 100644 --- a/MAVENProject/src/main/java/engine/GameEngineGraphical.java +++ b/MAVENProject/src/main/java/engine/GameEngineGraphical.java @@ -71,7 +71,7 @@ public class GameEngineGraphical { this.gui.paint(); } // met en attente - Thread.sleep(2); + Thread.sleep(1); } } diff --git a/MAVENProject/src/main/java/engine/GamePainter.java b/MAVENProject/src/main/java/engine/GamePainter.java index 790d64fa73c1108a3f7535bad11f49392c32ab46..b66f5a3c26d72fb91a3786665f4359347c50006f 100644 --- a/MAVENProject/src/main/java/engine/GamePainter.java +++ b/MAVENProject/src/main/java/engine/GamePainter.java @@ -19,8 +19,4 @@ public interface GamePainter { */ public abstract void draw(BufferedImage image); - public abstract int getWidth(); - - public abstract int getHeight(); - } diff --git a/MAVENProject/src/main/java/engine/MenuPanel.java b/MAVENProject/src/main/java/engine/MenuPanel.java index 4b0dea77d63ffebc450e8ec87827cedbff80eba9..e726e83284eb330a03be1dc390ab636abc0e26bd 100644 --- a/MAVENProject/src/main/java/engine/MenuPanel.java +++ b/MAVENProject/src/main/java/engine/MenuPanel.java @@ -1,6 +1,7 @@ package engine; import javax.swing.*; +import java.awt.*; public class MenuPanel { @@ -14,11 +15,14 @@ public class MenuPanel { public MenuPanel(){ JFrame f=new JFrame(); f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.setLayout(new BorderLayout()); + f.setPreferredSize(new Dimension(jeu.Painter.getWidth(), jeu.Painter.getHeight())); this.button = new JButton("Nouvelle partie"); JPanel panel = new JPanel(); - panel.add(button); + panel.add(button,BorderLayout.CENTER); f.getContentPane().add(panel); + f.pack(); f.setVisible(true); f.getContentPane().setFocusable(true); diff --git a/MAVENProject/src/main/java/entity/ShootingCharacter.java b/MAVENProject/src/main/java/entity/ShootingCharacter.java index d7f547c9913ef0b30deedf85bd57c8781b1cf878..8f5412d3e88aee87f0764e9fd78e99f1cdbacf1c 100644 --- a/MAVENProject/src/main/java/entity/ShootingCharacter.java +++ b/MAVENProject/src/main/java/entity/ShootingCharacter.java @@ -37,7 +37,7 @@ public class ShootingCharacter extends Character{ } kunaiReloading = (kunaiReloading+1)%300; if (stockKunai == stockMaxKunai) { //pour apprecier la duree de rechargement totale - System.out.println("yo"); + //System.out.println("yo"); } } } diff --git a/MAVENProject/src/main/java/jeu/Painter.java b/MAVENProject/src/main/java/jeu/Painter.java index 9d5f5245e100e6a29e747978545554bc42f37266..d1db92fd93e3d760d10a2dc806360f050ff75f7e 100644 --- a/MAVENProject/src/main/java/jeu/Painter.java +++ b/MAVENProject/src/main/java/jeu/Painter.java @@ -148,7 +148,6 @@ public class Painter implements GamePainter{ } private void drawMap(Graphics2D crayon){ - //System.out.println("Nombre obstacle :"+Jeu.getObstacleTable().size()); for (Obstacle obs : Jeu.getObstacleTable()){ if (!collision(gameCharacter.getHitBox(), obs.getHitbox())){ crayon.setColor(Color.blue); @@ -228,13 +227,11 @@ public class Painter implements GamePainter{ zCam = -HEIGHT/2 +(int) coordonneesCam.getZ()-decalage; } - @Override - public int getWidth() { + public static int getWidth() { return WIDTH; } - @Override - public int getHeight() { + public static int getHeight() { return HEIGHT; } diff --git a/MAVENProject/src/main/resources/Music/failsound.mp3 b/MAVENProject/src/main/resources/Music/failsound.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..e728d37dedad50c6b7ce7f89b0c19c78339c9c30 Binary files /dev/null and b/MAVENProject/src/main/resources/Music/failsound.mp3 differ