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

fix: fade state may get inconsistent on rapid ui open-close; correct logscale impl

Browse Source
This commit is contained in:
minjaesong
2023-11-19 20:05:44 +09:00
parent d77b8087cb
commit 04144fff08
7 changed files with 39 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,9 +11,7 @@ import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RAT
import net.torvald.terrarum.audio.TerrarumAudioMixerTrack.Companion.SAMPLING_RATEF
import net.torvald.terrarum.modulebasegame.MusicContainer
import net.torvald.terrarum.tryDispose
import kotlin.math.log
import kotlin.math.log10
import kotlin.math.pow
import kotlin.math.*
/**
* Any audio reference fed into this manager will get lost; you must manually store and dispose of them on your own.
@@ -79,6 +77,8 @@ object AudioMixer: Disposable {
private var lpLength = 0.4
private var lpOutFired = false
private var lpInFired = false
private var lpStart = SAMPLING_RATED / 2.0
private var lpTarget = SAMPLING_RATED / 2.0
// TODO make sidechaining work
// TODO master volume controls the master track
@@ -122,28 +122,30 @@ object AudioMixer: Disposable {
if (lpOutFired) {
lpAkku += delta
val x = lpAkku / lpLength
val q = 400.0
val step = (q.pow(x) - 1) / (q - 1) // https://www.desmos.com/calculator/sttaq2qhzm
val cutoff = FastMath.interpolateLinear(step, SAMPLING_RATED / 100.0, SAMPLING_RATED)
// https://www.desmos.com/calculator/dmhve2awxm
val t = (lpAkku / lpLength).coerceIn(0.0, 1.0)
val b = ln(lpStart / lpTarget) / -1.0
val a = lpStart
val cutoff = a * exp(b * t)
faderTrack.forEach { (it.filters[0] as Lowpass).setCutoff(cutoff) }
if (lpAkku >= lpLength) {
lpOutFired = false
faderTrack.forEach { (it.filters[0] as Lowpass).setCutoff(SAMPLING_RATEF) }
faderTrack.forEach { (it.filters[0] as Lowpass).setCutoff(lpTarget) }
}
}
else if (lpInFired) {
lpAkku += delta
val x = lpAkku / lpLength
val q = 400.0
val step = log((q-1) * x + 1.0, q) // https://www.desmos.com/calculator/sttaq2qhzm
val cutoff = FastMath.interpolateLinear(step, SAMPLING_RATED, SAMPLING_RATED / 100.0)
// https://www.desmos.com/calculator/dmhve2awxm
val t = (lpAkku / lpLength).coerceIn(0.0, 1.0)
val b = ln(lpStart / lpTarget) / -1.0
val a = lpStart
val cutoff = a * exp(b * t)
faderTrack.forEach { (it.filters[0] as Lowpass).setCutoff(cutoff) }
if (lpAkku >= lpLength) {
faderTrack.forEach { (it.filters[0] as Lowpass).setCutoff(SAMPLING_RATEF / 100.0) }
faderTrack.forEach { (it.filters[0] as Lowpass).setCutoff(lpTarget) }
lpInFired = false
}
}
@@ -194,6 +196,8 @@ object AudioMixer: Disposable {
lpLength = length.coerceAtLeast(1.0/1024.0)
lpAkku = 0.0
lpOutFired = true
lpStart = (musicTrack.filters[0] as Lowpass).cutoff
lpTarget = SAMPLING_RATED / 2.0
}
}
@@ -202,6 +206,8 @@ object AudioMixer: Disposable {
lpLength = length.coerceAtLeast(1.0/1024.0)
lpAkku = 0.0
lpInFired = true
lpStart = (musicTrack.filters[0] as Lowpass).cutoff
lpTarget = SAMPLING_RATED / 100.0
}
}