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

fix: filter envelope not advancing

Browse Source
This commit is contained in:
minjaesong
2026-06-14 17:56:20 +09:00
parent 240ce01209
commit 5bfc1cca3a
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tsvm_core/src/net/torvald/tsvm/peripheral/AudioAdapter.kt
View File

@@ -1788,14 +1788,34 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) {
} else if (idx >= maxIdx) {
return env[maxIdx].value / 255.0
} else {
val offset = env[idx].offset.toDouble()
if (offset == 0.0) {
// Advance through zero-duration nodes rather than freezing on them. A node
// whose offset rounds to 0 (sub-4 ms — ThreeFiveMinifloat's smallest non-zero
// step is ≈3.9 ms, so e.g. an SF2 filter mod-env's 1 ms attack stores offset 0)
// is passed instantly, so the envelope must move on to the next node. The old
// code returned here WITHOUT advancing the index, stranding fast-attack filter
// mod-envs at their first node: the filter never opened from its base cutoff to
// the sustain cutoff, so Strings/Flute/Guitar (SF2 base ~600 Hz, sustain ~6 kHz)
// played permanently muffled. The loop stops at a sustain/loop boundary (handled
// by the susEnd branch below and the top-of-function checks) or at maxIdx.
while (idx < maxIdx && !(susOn && idx == susEnd) && env[idx].offset.toDouble() == 0.0) {
idx++
}
if (susOn && idx == susEnd) {
// Reached the sustain/loop end while skipping: hold (single-node sustain) or
// loop back to susStart, mirroring the top-of-function dispatch.
if (susStart != susEnd) { timeBox[0] = 0.0; idx = susStart }
idxBox[0] = idx
return env[idx].value / 255.0
}
idxBox[0] = idx
if (idx >= maxIdx) {
return env[maxIdx].value / 255.0
}
val offset = env[idx].offset.toDouble()
timeBox[0] += tickSec
if (timeBox[0] >= offset) {
timeBox[0] -= offset
idx = if (susOn && idx == susEnd) susStart else (idx + 1).coerceAtMost(maxIdx)
idx = (idx + 1).coerceAtMost(maxIdx)
idxBox[0] = idx
return env[idx].value / 255.0
}