diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt index 66a3cf0fe..273695f2b 100644 --- a/src/net/torvald/terrarum/audio/AudioMixer.kt +++ b/src/net/torvald/terrarum/audio/AudioMixer.kt @@ -113,7 +113,7 @@ object AudioMixer: Disposable { fadeBus.addSidechainInput(ambientTrack, 1.0) fadeBus.addSidechainInput(sfxMixTrack, 1.0) fadeBus.filters[0] = Convolv(ModMgr.getFile("basegame", "audio/convolution/EchoThief - CedarCreekWinery.bin")) - fadeBus.filters[1] = Gain(16f) + fadeBus.filters[1] = Gain(10f) fadeBus.filters[3] = Lowpass(SAMPLING_RATE / 2f) masterTrack.addSidechainInput(fadeBus, 1.0) diff --git a/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt b/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt index d0002f6f9..bc80b720e 100644 --- a/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt +++ b/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt @@ -125,10 +125,10 @@ class Lowpass(cutoff0: Float): TerrarumAudioFilter() { val inn = inbuf[ch] - out[0] = (out0[ch].div(16f) + alpha * (inn[0].div(16f) - out0[ch].div(16f))).times(16f) + out[0] = out0[ch] + alpha * (inn[0] - out0[ch]) for (i in 1 until outbuf[ch].size) { - out[i] = (out[i-1].div(16f) + alpha * (inn[i].div(16f) - out[i-1].div(16f))).times(16f) + out[i] = out[i-1] + alpha * (inn[i] - out[i-1]) } out0[ch] = outbuf[ch].last()