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

Working audio rocker in settings menu.

Browse Source
This commit is contained in:
lieght
2025-10-03 04:42:48 +02:00
parent 83130806a8
commit 5a200a8a70
3 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/main/java/org/toop/app/menu/OptionsMenu.java
View File

@@ -1,9 +1,8 @@
package org.toop.app.menu;
import javafx.geometry.Pos;
import javafx.scene.control.*;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Label;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;
@@ -11,6 +10,8 @@ import javafx.scene.layout.VBox;
import org.toop.app.App;
import org.toop.framework.asset.ResourceManager;
import org.toop.framework.asset.resources.LocalizationAsset;
import org.toop.framework.audio.events.AudioEvents;
import org.toop.framework.eventbus.EventFlow;
import org.toop.local.AppContext;
import java.awt.*;
@@ -34,6 +35,7 @@ public final class OptionsMenu extends Menu {
screenDeviceSelectorCreation(),
displayModeSelectorCreation(),
selectFullscreenCreation(),
volumeSelectorCreation(),
exitOptionsButton);
optionsBox.setAlignment(Pos.CENTER);
@@ -113,4 +115,28 @@ public final class OptionsMenu extends Menu {
return setFullscreen;
}
private Slider volumeSelectorCreation() {
Slider volumeSlider = new Slider(0, 100, 50);
new EventFlow()
.addPostEvent(AudioEvents.GetCurrentVolume.class)
.onResponse(AudioEvents.GetCurrentVolumeReponse.class, event -> {
volumeSlider.setValue(event.currentVolume() * 100);
}).asyncPostEvent();
volumeSlider.setShowTickLabels(true);
volumeSlider.setShowTickMarks(true);
volumeSlider.setMajorTickUnit(25);
volumeSlider.setMinorTickCount(4);
volumeSlider.setBlockIncrement(5);
volumeSlider.setMaxWidth(225);
Label valueLabel = new Label(String.valueOf((int) volumeSlider.getValue()));
volumeSlider.valueProperty().addListener((obs, oldVal, newVal) -> {
valueLabel.setText(String.valueOf(newVal.intValue()));
new EventFlow().addPostEvent(new AudioEvents.ChangeVolume(newVal.doubleValue()/100.0))
.asyncPostEvent();
});
return volumeSlider;
}
}

7
framework/src/main/java/org/toop/framework/audio/SoundManager.java
View File

@@ -37,6 +37,7 @@ public class SoundManager {
.listen(this::handleStopSound)
.listen(this::handleMusicStart)
.listen(this::handleVolumeChange)
.listen(this::handleGetCurrentVolume)
.listen(AudioEvents.playOnClickButton.class, _ -> {
try {
playSound("hitsound0.wav", false);
@@ -70,6 +71,12 @@ public class SoundManager {
for (MediaPlayer mediaPlayer : this.activeMusic) {
mediaPlayer.setVolume(this.volume);
}
IO.println("Volume: " + this.volume);
}
private void handleGetCurrentVolume(AudioEvents.GetCurrentVolume event) {
new EventFlow().addPostEvent(new AudioEvents.GetCurrentVolumeReponse(volume, event.snowflakeId()))
.asyncPostEvent();
}
private void handleMusicStart(AudioEvents.StartBackgroundMusic e) {

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

@@ -1,9 +1,12 @@
package org.toop.framework.audio.events;
import org.toop.framework.asset.resources.MusicAsset;
import org.toop.framework.eventbus.events.EventWithSnowflake;
import org.toop.framework.eventbus.events.EventWithoutSnowflake;
import org.toop.framework.eventbus.events.EventsBase;
import java.util.Map;
public class AudioEvents extends EventsBase {
/** Starts playing a sound. */
public record PlayAudio(String fileName, boolean loop)
@@ -13,5 +16,27 @@ public class AudioEvents extends EventsBase {
public record StartBackgroundMusic() implements EventWithoutSnowflake {}
public record ChangeVolume(double newVolume) implements EventWithoutSnowflake {}
public record GetCurrentVolume(long snowflakeId) implements EventWithSnowflake {
@Override
public Map<String, Object> result() {
return Map.of();
}
@Override
public long eventSnowflake() {
return snowflakeId;
}
}
public record GetCurrentVolumeReponse(double currentVolume, long snowflakeId) implements EventWithSnowflake {
@Override
public Map<String, Object> result() {
return Map.of();
}
@Override
public long eventSnowflake() {
return snowflakeId;
}
}
public record playOnClickButton() implements EventWithoutSnowflake {}
}