diff --git a/src/main/java/engine/Kernel.java b/src/main/java/engine/Kernel.java index c50f348f99cda943463cf44f3c6b2ce28fbcc4ff..1d6d684783f7bf2f99ada1c3cd564afb75706c01 100644 --- a/src/main/java/engine/Kernel.java +++ b/src/main/java/engine/Kernel.java @@ -212,5 +212,9 @@ public class Kernel { return physicEngine.isCollision; } + public void muteSoundEngine(){ + soundEngine.mute(); + } + } diff --git a/src/main/java/engine/sound/SoundEngine.java b/src/main/java/engine/sound/SoundEngine.java index 4c4dfee06d20bd7828e37b5ed12662d264c00e97..259479125eb3e7519bc9557e90c9621eb9ae3274 100644 --- a/src/main/java/engine/sound/SoundEngine.java +++ b/src/main/java/engine/sound/SoundEngine.java @@ -19,6 +19,7 @@ public class SoundEngine implements Engine { public SoundEngine() { } public void playMusic(String location){ + if(isMuted) return; try { File musicPath = new File(location); if (musicPath.exists()) { @@ -58,13 +59,10 @@ public class SoundEngine implements Engine { soundMap.put(soundPath, isPlaying); } - public void muteSoundEngine(){ - isMuted = true; + public void mute(){ + isMuted = !isMuted; } - public void unmuteSoundEngine(){ - isMuted = false; - } @Override diff --git a/src/main/java/pong/PongApp.java b/src/main/java/pong/PongApp.java index 7384b9a4416a6466958850aed2f5877bca3ad7dd..3e3fa3bfcb6110545a926a7ba922148885a000ac 100644 --- a/src/main/java/pong/PongApp.java +++ b/src/main/java/pong/PongApp.java @@ -46,7 +46,7 @@ public class PongApp { components.add(pongBall); Kernel kernel = new Kernel("Pong", width, height, components); - //kernel.playSound("src/main/resources/Sound/minecraft.wav"); + kernel.playSound("src/main/resources/Sound/minecraft.wav"); kernel.addSound("src/main/resources/Sound/hit_racket.wav", kernel.isItACollision()); JButton button = new JButton("Restart"); JButton button2 = new JButton("Mute"); @@ -65,7 +65,7 @@ public class PongApp { } }); - button2.addActionListener(e -> SoundEngine.stopMusic()); + button2.addActionListener(e -> kernel.muteSoundEngine()); kernel.addButton(button); // Add a button to restart the game kernel.addButton(button2); // Add a button to mute the game //kernel.addLabel(muteLabel); // Add a button to mute the game diff --git a/src/test/java/engine/physic/CartesianVectorTest.java b/src/test/java/engine/physic/CartesianVectorTest.java index 7897a558e7ae87052b375cc281e544101dec2620..b452590a2bb0842e174cf5db951142e1c2175d60 100644 --- a/src/test/java/engine/physic/CartesianVectorTest.java +++ b/src/test/java/engine/physic/CartesianVectorTest.java @@ -4,6 +4,9 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*; +/** + * Test class for the CartesianVector class. + */ class CartesianVectorTest { @Test public void testAdd() {