From 787760b53f348f0ab4ad336b2a4c9ccfc7412f2c Mon Sep 17 00:00:00 2001
From: bosskkev <kossivikevin29@gmail.com>
Date: Sun, 26 Nov 2023 20:22:32 +0100
Subject: [PATCH] unmute and demute
---
src/main/java/engine/Kernel.java | 4 ++++
src/main/java/engine/sound/SoundEngine.java | 8 +++-----
src/main/java/pong/PongApp.java | 4 ++--
src/test/java/engine/physic/CartesianVectorTest.java | 3 +++
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/engine/Kernel.java b/src/main/java/engine/Kernel.java
index c50f348..1d6d684 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 4c4dfee..2594791 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 7384b9a..3e3fa3b 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 7897a55..b452590 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() {
--
GitLab