curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 03:24:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

gui track should obey interface volume setting

Browse Source
This commit is contained in:
minjaesong
2024-04-01 18:07:54 +09:00
parent 576e868996
commit a1a70274dd
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/torvald/terrarum/App.java
View File

@@ -1976,7 +1976,7 @@ public class App implements ApplicationListener {
it.setCurrentTrack(sound); it.setCurrentTrack(sound);
it.setMaxVolumeFun(() -> volume); it.setMaxVolumeFun(() -> volume);
it.setVolume(volume); it.setVolume(volume);
((BinoPan) Arrays.stream(it.getFilters()).findFirst().get()).setPan(pan); ((BinoPan) it.getFilters()[1]).setPan(pan);
it.play(); it.play();
} }
} }
@@ -1991,7 +1991,7 @@ public class App implements ApplicationListener {
it.setCurrentTrack(sound); it.setCurrentTrack(sound);
it.setMaxVolumeFun(() -> volume); it.setMaxVolumeFun(() -> volume);
it.setVolume(volume); it.setVolume(volume);
((BinoPan) Arrays.stream(it.getFilters()).findFirst().get()).setPan(pan); ((BinoPan) it.getFilters()[1]).setPan(pan);
it.play(); it.play();
} }
public static void playGUIsoundHigh(MusicContainer sound, double volume) { playGUIsoundHigh(sound, volume, 0.0f); } public static void playGUIsoundHigh(MusicContainer sound, double volume) { playGUIsoundHigh(sound, volume, 0.0f); }

2
src/net/torvald/terrarum/audio/AudioMixer.kt
View File

@@ -230,7 +230,7 @@ class AudioMixer : Disposable {
it.filters[0] = Gain(1f) it.filters[0] = Gain(1f)
} }
guiTrack.filters[0] = BinoPan(0f) guiTrack.filters[1] = BinoPan(0f)
masterTrack.filters[0] = SoftClp masterTrack.filters[0] = SoftClp
masterTrack.filters[1] = Buffer masterTrack.filters[1] = Buffer

2
src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt
View File

@@ -307,6 +307,8 @@ private class UIItemKeycap(
val homerow: Boolean = false val homerow: Boolean = false
) : UIItem(parent, initialX, initialY) { ) : UIItem(parent, initialX, initialY) {
override var suppressHaptic = false
init { init {
if (parent is UIKeyboardControlPanel ) { if (parent is UIKeyboardControlPanel ) {
this.posX = initialX + parent.kbx this.posX = initialX + parent.kbx