From eebfa5c9de8b59b94ec66ddeeafd61b4f4b043f6 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Sun, 21 Jan 2024 20:48:32 +0900
Subject: [PATCH] audio routing optimisations

---
 src/net/torvald/terrarum/audio/AudioMixer.kt       | 14 +++++++-------
 .../torvald/terrarum/ui/BasicDebugInfoWindow.kt    |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt
index a56a5d6b4..64f36ac8e 100644
--- a/src/net/torvald/terrarum/audio/AudioMixer.kt
+++ b/src/net/torvald/terrarum/audio/AudioMixer.kt
@@ -201,7 +201,7 @@ class AudioMixer(val bufferSize: Int): Disposable {
     init {
         // initialise audio paths //
 
-        listOf(musicTrack, ambientTrack1, ambientTrack2, sfxSumBus, guiTrack).forEach {
+        listOf(musicTrack, ambientTrack1, ambientTrack2).forEach {
             it.filters[0] = Gain(1f)
         }
 
@@ -212,16 +212,15 @@ class AudioMixer(val bufferSize: Int): Disposable {
 
         musicTrack.filters[1] = Vecto()
         musicTrack.filters[2] = Spectro()
-        ambientTrack1.filters[1] = Vecto(decibelsToFullscale(32.0).toFloat())
+        ambientTrack1.filters[1] = Vecto(decibelsToFullscale(24.0).toFloat())
         ambientTrack1.filters[2] = Spectro()
-        ambientTrack2.filters[1] = Vecto(decibelsToFullscale(32.0).toFloat())
+        ambientTrack2.filters[1] = Vecto(decibelsToFullscale(24.0).toFloat())
         ambientTrack2.filters[2] = Spectro()
         sfxSumBus.filters[1] = Vecto(0.7071f)
         sfxSumBus.filters[2] = Spectro()
 
         ambSumBus.addSidechainInput(ambientTrack1, 1.0)
         ambSumBus.addSidechainInput(ambientTrack2, 1.0)
-        ambSumBus.filters[0] = Gain(1f) // controlled by the ambient volume config
         ambSumBus.filters[1] = Gain(1f) // controlled by the "openness" controller
 
         listOf(sumBus, convolveBusOpen, convolveBusCave).forEach {
@@ -347,9 +346,10 @@ class AudioMixer(val bufferSize: Int): Disposable {
         (Gdx.audio as? Lwjgl3Audio)?.update()
         masterTrack.volume = masterVolume
         musicTrack.getFilter<Gain>().gain = musicVolume.toFloat() * 0.5f
-        ambSumBus.getFilter<Gain>().gain = ambientVolume.toFloat() * 2
-        sfxSumBus.getFilter<Gain>().gain = sfxVolume.toFloat()
-        guiTrack.getFilter<Gain>().gain = guiVolume.toFloat()
+        ambientTrack1.getFilter<Gain>().gain = ambientVolume.toFloat() * 2
+        ambientTrack2.getFilter<Gain>().gain = ambientVolume.toFloat() * 2
+        sfxSumBus.volume = sfxVolume
+        guiTrack.volume = guiVolume
 
 
         // process fades
diff --git a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
index 6106a6c6b..a9511c1ef 100644
--- a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
+++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
@@ -463,7 +463,7 @@ class BasicDebugInfoWindow : UICanvas() {
     private val stripGap = 1
     private val stripFilterHeight = 16
     private val stripFaderHeight = meterHeight + 20
-    private val numberOfFilters = 16
+    private val numberOfFilters = 14
     private val stripH = stripFaderHeight + stripFilterHeight * numberOfFilters + 16
 
     private val trackBack = listOf(COL_WELL, COL_WELL2)