From a1a70274dd43e9dba11f26096a15ef5da509b3d0 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Mon, 1 Apr 2024 18:07:54 +0900 Subject: [PATCH] gui track should obey interface volume setting --- src/net/torvald/terrarum/App.java | 4 ++-- src/net/torvald/terrarum/audio/AudioMixer.kt | 2 +- .../terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index 1e988ce86..12657dc91 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -1976,7 +1976,7 @@ public class App implements ApplicationListener { it.setCurrentTrack(sound); it.setMaxVolumeFun(() -> volume); it.setVolume(volume); - ((BinoPan) Arrays.stream(it.getFilters()).findFirst().get()).setPan(pan); + ((BinoPan) it.getFilters()[1]).setPan(pan); it.play(); } } @@ -1991,7 +1991,7 @@ public class App implements ApplicationListener { it.setCurrentTrack(sound); it.setMaxVolumeFun(() -> volume); it.setVolume(volume); - ((BinoPan) Arrays.stream(it.getFilters()).findFirst().get()).setPan(pan); + ((BinoPan) it.getFilters()[1]).setPan(pan); it.play(); } public static void playGUIsoundHigh(MusicContainer sound, double volume) { playGUIsoundHigh(sound, volume, 0.0f); } diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt index a2140c5e8..d00f689fb 100644 --- a/src/net/torvald/terrarum/audio/AudioMixer.kt +++ b/src/net/torvald/terrarum/audio/AudioMixer.kt @@ -230,7 +230,7 @@ class AudioMixer : Disposable { it.filters[0] = Gain(1f) } - guiTrack.filters[0] = BinoPan(0f) + guiTrack.filters[1] = BinoPan(0f) masterTrack.filters[0] = SoftClp masterTrack.filters[1] = Buffer diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt index e02a6d9c4..4efb82bee 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardControlPanel.kt @@ -307,6 +307,8 @@ private class UIItemKeycap( val homerow: Boolean = false ) : UIItem(parent, initialX, initialY) { + override var suppressHaptic = false + init { if (parent is UIKeyboardControlPanel ) { this.posX = initialX + parent.kbx