diff --git a/src/net/torvald/terrarum/audio/AudioMixer.kt b/src/net/torvald/terrarum/audio/AudioMixer.kt index 9ca933614..bdf791748 100644 --- a/src/net/torvald/terrarum/audio/AudioMixer.kt +++ b/src/net/torvald/terrarum/audio/AudioMixer.kt @@ -95,7 +95,7 @@ object AudioMixer: Disposable { init { - masterTrack.filters[0] = SoftLim + masterTrack.filters[0] = SoftClp masterTrack.filters[1] = Buffer masterTrack.filters[2] = Scope() diff --git a/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt b/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt index d7217f4d2..f33fa6eaf 100644 --- a/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt +++ b/src/net/torvald/terrarum/audio/TerrarumAudioFilter.kt @@ -2,7 +2,6 @@ package net.torvald.terrarum.audio import com.jme3.math.FastMath import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.BUFFER_SIZE -import net.torvald.terrarum.modulebasegame.ui.abs import kotlin.math.absoluteValue import kotlin.math.tanh @@ -27,7 +26,7 @@ object NullFilter : TerrarumAudioFilter() { } } -object SoftLim : TerrarumAudioFilter() { +object SoftClp : TerrarumAudioFilter() { val downForce = arrayOf(1.0f, 1.0f) override fun thru(inbuf0: List, inbuf1: List, outbuf0: List, outbuf1: List) { @@ -55,7 +54,7 @@ class Scope : TerrarumAudioFilter() { val backbufL = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) } val backbufR = Array(BUFFER_SIZE / 16) { FloatArray(BUFFER_SIZE / 4) } - private val sqrt2p = 0.7071067811865476 + private val sqrt2p = 0.7071067811865475 override fun thru(inbuf0: List, inbuf1: List, outbuf0: List, outbuf1: List) { // shift buffer diff --git a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt index 1277601b2..2af7ecf57 100644 --- a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt +++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt @@ -13,9 +13,7 @@ import net.torvald.terrarum.Terrarum.mouseTileX import net.torvald.terrarum.Terrarum.mouseTileY import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE import net.torvald.terrarum.audio.* -import net.torvald.terrarum.audio.MixerTrackProcessor.Companion.BACK_BUF_COUNT import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.BUFFER_SIZE -import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RATED import net.torvald.terrarum.controller.TerrarumController import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.fmod @@ -548,7 +546,7 @@ class BasicDebugInfoWindow : UICanvas() { } // comp marker - track.filters.filterIsInstance().firstOrNull()?.let { + track.filters.filterIsInstance().firstOrNull()?.let { for (ch in 0..1) { val downForceNow = it.downForce[ch] * 1.0 if (downForceNow != 0.0) {