stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made all of the updated classes more generic for better flexibility in unittesting

Browse Source
This commit is contained in:
Bas de Jong
2025-10-11 19:31:55 +02:00
parent b101734fd7
commit 1ecdb9a555
15 changed files with 167 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/toop/Main.java
View File

@@ -10,6 +10,8 @@ import org.toop.framework.networking.NetworkingClientManager;
import org.toop.framework.networking.NetworkingInitializationException;
import org.toop.framework.resource.ResourceLoader;
import org.toop.framework.resource.ResourceManager;
import org.toop.framework.resource.resources.MusicAsset;
import org.toop.framework.resource.resources.SoundEffectAsset;
public final class Main {
static void main(String[] args) {
@@ -23,7 +25,7 @@ public final class Main {
new Thread(() -> {
AudioEventListener<?, ?> a =
new AudioEventListener<>(
new MusicManager(),
new MusicManager<>(MusicAsset.class),
new SoundEffectManager(),
new AudioVolumeManager()
); a.initListeners();

1
app/src/main/java/org/toop/app/App.java
View File

@@ -126,6 +126,7 @@ public final class App extends Application {
}
public static void quit() {
new EventFlow().addPostEvent(new AudioEvents.StopAudioManager()).postEvent();
stage.close();
}

11
framework/src/main/java/org/toop/framework/audio/AudioEventListener.java
View File

@@ -24,6 +24,7 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
public void initListeners() {
new EventFlow()
.listen(this::handleStopMusicManager)
.listen(this::handlePlaySound)
.listen(this::handleStopSound)
.listen(this::handleMusicStart)
@@ -35,6 +36,10 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
.listen(this::handleGetMusicVolume);
}
private void handleStopMusicManager(AudioEvents.StopAudioManager event) {
this.musicManager.stop();
}
private void handlePlaySound(AudioEvents.PlayEffect event) {
this.soundEffectManager.play(event.fileName(), event.loop());
}
@@ -48,15 +53,15 @@ public class AudioEventListener<T extends AudioResource, K extends AudioResource
}
private void handleVolumeChange(AudioEvents.ChangeVolume event) {
this.audioVolumeManager.setVolume(event.newVolume(), soundEffectManager, musicManager);
this.audioVolumeManager.setVolume(event.newVolume(), VolumeTypes.VOLUME, soundEffectManager, musicManager);
}
private void handleFxVolumeChange(AudioEvents.ChangeFxVolume event) {
this.audioVolumeManager.setFxVolume(event.newVolume(), soundEffectManager);
this.audioVolumeManager.setVolume(event.newVolume(), VolumeTypes.FX, soundEffectManager);
}
private void handleMusicVolumeChange(AudioEvents.ChangeMusicVolume event) {
this.audioVolumeManager.setMusicVolume(event.newVolume(), musicManager);
this.audioVolumeManager.setVolume(event.newVolume(), VolumeTypes.MUSIC, musicManager);
}
private void handleGetVolume(AudioEvents.GetCurrentVolume event) {

43
framework/src/main/java/org/toop/framework/audio/AudioVolumeManager.java
View File

@@ -4,6 +4,9 @@ import org.toop.framework.audio.interfaces.AudioManager;
import org.toop.framework.audio.interfaces.VolumeManager;
import org.toop.framework.resource.types.AudioResource;
import java.util.Arrays;
import java.util.Objects;
public class AudioVolumeManager implements VolumeManager {
private double volume = 0.0;
private double fxVolume = 0.0;
@@ -19,32 +22,28 @@ public class AudioVolumeManager implements VolumeManager {
return Math.min(1.0, Math.max(0.0, volume / 100));
}
@SafeVarargs
@Override
public <T extends AudioResource, K extends AudioResource> void setVolume(
double newVolume, AudioManager<T> sm, AudioManager<K> mm) {
this.volume = limitVolume(newVolume);
for (T clip : sm.getActiveAudio()) {
this.updateVolume(clip, fxVolume * volume);
}
for (K mediaPlayer : mm.getActiveAudio()) {
this.updateVolume(mediaPlayer, musicVolume * volume);
}
public final void setVolume(double newVolume, VolumeTypes type, AudioManager<? extends AudioResource>... managers) {
double limitedVolume = limitVolume(newVolume);
switch (type) {
case FX -> fxVolume = limitedVolume;
case MUSIC -> musicVolume = limitedVolume;
default -> volume = limitedVolume;
}
@Override
public <T extends AudioResource> void setFxVolume(double newVolume, AudioManager<T> sm) {
this.fxVolume = limitVolume(newVolume);
for (T clip : sm.getActiveAudio()) {
this.updateVolume(clip, fxVolume * volume);
}
}
double effectiveVolume = switch (type) {
case FX -> fxVolume * volume;
case MUSIC -> musicVolume * volume;
default -> volume;
};
@Override
public <T extends AudioResource> void setMusicVolume(double newVolume, AudioManager<T> mm) {
this.musicVolume = limitVolume(newVolume);
for (T mediaPlayer : mm.getActiveAudio()) {
this.updateVolume(mediaPlayer, musicVolume * volume);
}
Arrays.stream(managers)
.filter(Objects::nonNull)
.forEach(manager ->
manager.getActiveAudio().forEach(aud -> updateVolume(aud, effectiveVolume))
);
}
@Override

107
framework/src/main/java/org/toop/framework/audio/MusicManager.java
View File

@@ -1,81 +1,88 @@
package org.toop.framework.audio;
import javafx.application.Platform;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.framework.resource.ResourceManager;
import org.toop.framework.resource.resources.MusicAsset;
import org.toop.framework.resource.resources.BaseResource;
import org.toop.framework.resource.types.AudioResource;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicReference;
public class MusicManager implements org.toop.framework.audio.interfaces.MusicManager<MusicAsset> {
public class MusicManager<T extends AudioResource> implements org.toop.framework.audio.interfaces.MusicManager<T> {
private static final Logger logger = LogManager.getLogger(MusicManager.class);
private final List<MusicAsset> backgroundMusic = new LinkedList<>();
private final Class<T> type;
private final List<T> backgroundMusic = new LinkedList<>();
private int playingIndex = 0;
private boolean playing = false;
private ScheduledExecutorService scheduler;
public MusicManager() {}
public MusicManager(Class<T> type) {
this.type = type;
Runtime.getRuntime().addShutdownHook(new Thread(this::shutdownScheduler));
}
private void increasePlayingIndex() {
playingIndex = (playingIndex + 1) % backgroundMusic.size();
}
@Override
public Collection<MusicAsset> getActiveAudio() {
public Collection<T> getActiveAudio() {
return backgroundMusic;
}
private void addBackgroundMusic(MusicAsset musicAsset) {
private void addBackgroundMusic(T musicAsset) {
backgroundMusic.add(musicAsset);
}
private void shutdownScheduler() {
if (scheduler != null && !scheduler.isShutdown()) {
scheduler.shutdownNow();
scheduler = null;
logger.debug("MusicManager scheduler shut down.");
}
}
@Override
public void stop() {
shutdownScheduler();
Platform.runLater(() -> backgroundMusic.forEach(T::stop));
}
public void play() {
if (playing) {
logger.warn("MusicManager is already playing.");
return;
}
backgroundMusic.clear();
List<MusicAsset> shuffledArray =
new ArrayList<>(
ResourceManager.getAllOfType(MusicAsset.class).stream()
.map(ma ->
initMediaPlayer(ma.getResource()))
@SuppressWarnings("unchecked")
List<T> resources = new ArrayList<>(ResourceManager.getAllOfType((Class<? extends BaseResource>) type)
.stream()
.map(e -> (T) e.getResource())
.toList());
Collections.shuffle(shuffledArray);
backgroundMusic.addAll(shuffledArray);
backgroundMusicPlayer();
}
Collections.shuffle(resources);
backgroundMusic.addAll(resources);
private void backgroundMusicPlayer() {
if (backgroundMusic.isEmpty()) return;
if (playingIndex >= backgroundMusic.size()) {
playingIndex = 0;
}
shutdownScheduler();
scheduler = Executors.newSingleThreadScheduledExecutor();
MusicAsset ma = backgroundMusic.get(playingIndex);
AtomicReference<T> current = new AtomicReference<>(backgroundMusic.get(playingIndex));
if (ma == null) {
logger.error("Background music player is null. Queue: {}",
backgroundMusic.stream().map(e -> e.getMediaPlayer().getMedia().getSource()));
return;
}
logger.info("Background music player is playing: {}", ma.getMediaPlayer().getMedia().getSource()); //TODO shorten to name
ma.getMediaPlayer().play();
this.playing = true;
}
private MusicAsset initMediaPlayer(MusicAsset ma) {
ma.getMediaPlayer().setOnEndOfMedia(() -> ma.getMediaPlayer().stop());
ma.getMediaPlayer().setOnError( () -> {
logger.error("Error playing music: {}", ma.getMediaPlayer().getError()); // TODO
backgroundMusic.remove(ma);
ma.getMediaPlayer().stop();
Platform.runLater(() -> {
T first = current.get();
if (!first.isPlaying()) first.play();
});
ma.getMediaPlayer().setOnStopped( () -> {
ma.getMediaPlayer().stop();
playingIndex++;
this.playing = false;
backgroundMusicPlayer();
scheduler.scheduleAtFixedRate(() -> {
T track = current.get();
if (!track.isPlaying()) {
increasePlayingIndex();
T next = backgroundMusic.get(playingIndex);
current.set(next);
Platform.runLater(() -> {
if (!next.isPlaying()) next.play();
});
return ma;
}
}, 500, 500, TimeUnit.MILLISECONDS);
}
}

4
framework/src/main/java/org/toop/framework/audio/SoundEffectManager.java
View File

@@ -17,11 +17,11 @@ public class SoundEffectManager implements org.toop.framework.audio.interfaces.S
@Override
public void play(String name, boolean loop) {
//TODO
}
@Override
public void stop(long clipId) {
//TODO
}
}

7
framework/src/main/java/org/toop/framework/audio/VolumeTypes.java Normal file
View File

@@ -0,0 +1,7 @@
package org.toop.framework.audio;
public enum VolumeTypes {
VOLUME,
FX,
MUSIC,
}

2
framework/src/main/java/org/toop/framework/audio/events/AudioEvents.java
View File

@@ -6,6 +6,8 @@ import org.toop.framework.eventbus.events.EventWithoutSnowflake;
import org.toop.framework.eventbus.events.EventsBase;
public class AudioEvents extends EventsBase {
public record StopAudioManager() implements EventWithoutSnowflake {}
/** Starts playing a sound. */
public record PlayEffect(String fileName, boolean loop) implements EventWithoutSnowflake {}

2
framework/src/main/java/org/toop/framework/audio/interfaces/AudioManager.java
View File

@@ -1,5 +1,7 @@
package org.toop.framework.audio.interfaces;
import org.toop.framework.audio.VolumeTypes;
import java.util.Collection;
public interface AudioManager<T> {

1
framework/src/main/java/org/toop/framework/audio/interfaces/MusicManager.java
View File

@@ -4,4 +4,5 @@ import org.toop.framework.resource.types.AudioResource;
public interface MusicManager<T extends AudioResource> extends AudioManager<T> {
void play();
void stop();
}

5
framework/src/main/java/org/toop/framework/audio/interfaces/VolumeManager.java
View File

@@ -1,11 +1,10 @@
package org.toop.framework.audio.interfaces;
import org.toop.framework.audio.VolumeTypes;
import org.toop.framework.resource.types.AudioResource;
public interface VolumeManager {
<T extends AudioResource, K extends AudioResource> void setVolume(double newVolume, AudioManager<T> sm, AudioManager<K> mm);
<T extends AudioResource> void setFxVolume(double newVolume, AudioManager<T> sm);
<T extends AudioResource> void setMusicVolume(double newVolume, AudioManager<T> mm);
void setVolume(double newVolume, VolumeTypes types, AudioManager<? extends AudioResource>... ams);
double getVolume();
double getFxVolume();
double getMusicVolume();

18
framework/src/main/java/org/toop/framework/resource/ResourceManager.java
View File

@@ -7,6 +7,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.toop.framework.resource.exceptions.ResourceNotFoundException;
import org.toop.framework.resource.resources.*;
import org.toop.framework.resource.types.AudioResource;
/**
* Centralized manager for all loaded assets in the application.
@@ -96,16 +97,19 @@ public class ResourceManager {
* @param <T> the resource type
* @return a list of assets matching the type
*/
public static <T extends BaseResource> ArrayList<ResourceMeta<T>> getAllOfType(Class<T> type) {
ArrayList<ResourceMeta<T>> list = new ArrayList<>();
for (ResourceMeta<? extends BaseResource> asset : assets.values()) {
if (type.isInstance(asset.getResource())) {
public static <T extends BaseResource> List<ResourceMeta<T>> getAllOfType(Class<T> type) {
List<ResourceMeta<T>> result = new ArrayList<>();
for (ResourceMeta<? extends BaseResource> meta : assets.values()) {
BaseResource res = meta.getResource();
if (type.isInstance(res)) {
@SuppressWarnings("unchecked")
ResourceMeta<T> typed = (ResourceMeta<T>) asset;
list.add(typed);
ResourceMeta<T> typed = (ResourceMeta<T>) meta;
result.add(typed);
}
}
return list;
return result;
}
/**

28
framework/src/main/java/org/toop/framework/resource/resources/MusicAsset.java
View File

@@ -10,6 +10,8 @@ import org.toop.framework.resource.types.LoadableResource;
@FileExtension({"mp3"})
public class MusicAsset extends BaseResource implements LoadableResource, AudioResource {
private MediaPlayer mediaPlayer;
private double volume;
private boolean isPlaying = false;
public MusicAsset(final File audioFile) {
super(audioFile);
@@ -20,10 +22,18 @@ public class MusicAsset extends BaseResource implements LoadableResource, AudioR
return mediaPlayer;
}
private void initPlayer() {
mediaPlayer.setOnEndOfMedia(this::stop);
mediaPlayer.setOnError(this::stop);
mediaPlayer.setOnStopped(() -> isPlaying = false);
}
@Override
public void load() {
if (mediaPlayer == null) {
mediaPlayer = new MediaPlayer(new Media(file.toURI().toString()));
initPlayer();
mediaPlayer.setVolume(volume);
}
this.isLoaded = true;
}
@@ -48,5 +58,23 @@ public class MusicAsset extends BaseResource implements LoadableResource, AudioR
if (mediaPlayer != null) {
mediaPlayer.setVolume(volume);
}
this.volume = volume;
}
@Override
public boolean isPlaying() {
return isPlaying;
}
@Override
public void play() {
getMediaPlayer().play();
isPlaying = true;
}
@Override
public void stop() {
getMediaPlayer().stop();
isPlaying = false;
}
}

17
framework/src/main/java/org/toop/framework/resource/resources/SoundEffectAsset.java
View File

@@ -99,4 +99,21 @@ public class SoundEffectAsset extends BaseResource implements LoadableResource,
}
}
}
@Override
public boolean isPlaying() {
// TODO
return false;
}
@Override
public void play() {
// TODO
}
@Override
public void stop() {
// TODO
}
}

4
framework/src/main/java/org/toop/framework/resource/types/AudioResource.java
View File

@@ -2,5 +2,7 @@ package org.toop.framework.resource.types;
public interface AudioResource {
void updateVolume(double volume);
// TODO play and stop
boolean isPlaying();
void play();
void stop();
}