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

IT voice retire rule for fadeout=0

Browse Source
This commit is contained in:
minjaesong
2026-05-06 12:15:48 +09:00
parent 75ddfcde0f
commit 5a4d200fdc
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1265,11 +1265,21 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) {
voice.envIndex = wStart voice.envIndex = wStart
voice.envVolume = (inst.volEnvelopes[voice.envIndex].value / 63.0).coerceIn(0.0, 1.0) voice.envVolume = (inst.volEnvelopes[voice.envIndex].value / 63.0).coerceIn(0.0, 1.0)
} else if (voice.envIndex >= maxIdx) { } else if (voice.envIndex >= maxIdx) {
voice.envVolume = (inst.volEnvelopes[maxIdx].value / 63.0).coerceIn(0.0, 1.0) val vEnd = inst.volEnvelopes[maxIdx].value
voice.envVolume = (vEnd / 63.0).coerceIn(0.0, 1.0)
// Schism's "envelope-end + last-value-0 ⇒ cut" rule (player/sndmix.c:493-498):
// applies only in fall-through (no active sustain or loop wrap) since Schism
// suppresses fade_flag inside both wrap branches. Without this rule, instruments
// with fadeout=0 + envelope ending at 0 would silently hold their voices forever.
if (vEnd == 0 && !wrapping) voice.active = false
} else { } else {
val vOffset = inst.volEnvelopes[voice.envIndex].offset.toDouble() val vOffset = inst.volEnvelopes[voice.envIndex].offset.toDouble()
val vCurValue = inst.volEnvelopes[voice.envIndex].value
if (vOffset == 0.0) { if (vOffset == 0.0) {
voice.envVolume = (inst.volEnvelopes[voice.envIndex].value / 63.0).coerceIn(0.0, 1.0) // Reached a terminator point — envelope holds here.
voice.envVolume = (vCurValue / 63.0).coerceIn(0.0, 1.0)
// Same Schism cut rule as above: only when in fall-through.
if (vCurValue == 0 && !wrapping) voice.active = false
} else { } else {
voice.envTimeSec += tickSec voice.envTimeSec += tickSec
if (voice.envTimeSec >= vOffset) { if (voice.envTimeSec >= vOffset) {
@@ -1279,7 +1289,7 @@ class AudioAdapter(val vm: VM) : PeriBase(VM.PERITYPE_SOUND) {
voice.envIndex = nextIdx voice.envIndex = nextIdx
voice.envVolume = (inst.volEnvelopes[voice.envIndex].value / 63.0).coerceIn(0.0, 1.0) voice.envVolume = (inst.volEnvelopes[voice.envIndex].value / 63.0).coerceIn(0.0, 1.0)
} else { } else {
val cur = (inst.volEnvelopes[voice.envIndex].value / 63.0).coerceIn(0.0, 1.0) val cur = (vCurValue / 63.0).coerceIn(0.0, 1.0)
val nxt = (inst.volEnvelopes[(voice.envIndex + 1).coerceAtMost(maxIdx)].value / 63.0).coerceIn(0.0, 1.0) val nxt = (inst.volEnvelopes[(voice.envIndex + 1).coerceAtMost(maxIdx)].value / 63.0).coerceIn(0.0, 1.0)
voice.envVolume = cur + (nxt - cur) * (voice.envTimeSec / vOffset) voice.envVolume = cur + (nxt - cur) * (voice.envTimeSec / vOffset)
} }