hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parity with old adsr

Browse source
This commit is contained in:
Aria 2025-08-28 00:31:37 -05:00
parent ea017e7622
commit 869141b0a3
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packages/superdough/worklets.mjs
View file

@ -933,6 +933,7 @@ class EnvelopeProcessor extends AudioWorkletProcessor {
this.state = 0; this.state = 0;
this.beginTime = 0; this.beginTime = 0;
this.endTime = 0; this.endTime = 0;
this.attackStart = 0;
} }
_shape(u, c) { _shape(u, c) {
@ -947,29 +948,29 @@ class EnvelopeProcessor extends AudioWorkletProcessor {
} }
} }
_advance(start, target, length, curve) { _advance(start, target, time, curve) {
if (length <= 1 || start === target) { if (time === 0 || start === target) {
this.val = target; this.val = target;
} else { } else {
const u = Math.min(1, this.segIdx / (length - 1)); const u = Math.min(1, (currentTime - this.beginTime) / time);
const us = this._shape(u, curve); const us = this._shape(u, curve);
this.val = start + (target - start) * us; this.val = start + (target - start) * us;
} }
this.segIdx++;
} }
process(_inputs, outputs, params) { process(_inputs, outputs, params) {
const out = outputs[0][0]; const out = outputs[0][0];
if (!out) return true; if (!out) return true;
const begin = pv(params.begin, 0); const begin = pv(params.begin, 0);
this.endTime = pv(params.end, 0);
const retrigger = pv(params.retrigger, 0) >= 0.5; // convert to bool const retrigger = pv(params.retrigger, 0) >= 0.5; // convert to bool
if (begin !== this.beginTime && (this.state === 0 || retrigger)) { if (begin !== this.beginTime && (this.state === 0 || retrigger)) {
// triggered // triggered
this.beginTime = begin; this.beginTime = begin;
this.state = 1; this.state = 1;
this.segIdx = 0; this.endTime = pv(params.end, 0);
this.attackStart = this.val;
} }
const susTime = this.endTime - this.beginTime;
for (let i = 0; i < out.length; i++) { for (let i = 0; i < out.length; i++) {
const attack = pv(params.attack, i); const attack = pv(params.attack, i);
const decay = pv(params.decay, i); const decay = pv(params.decay, i);
@ -981,17 +982,16 @@ class EnvelopeProcessor extends AudioWorkletProcessor {
const peak = pv(params.peak, i); const peak = pv(params.peak, i);
const states = [ const states = [
{ time: Number.POSITIVE_INFINITY, start: 0, target: 0 }, // idle { time: Number.POSITIVE_INFINITY, start: 0, target: 0 }, // idle
{ time: attack, start: 0, target: peak, curve: aCurve }, { time: attack, start: this.attackStart, target: 1, curve: aCurve },
{ time: decay, start: 1, target: sustain, curve: dCurve }, { time: attack + decay, start: 1, target: sustain, curve: dCurve },
{ time: this.endTime - this.beginTime - attack - decay, start: sustain, target: sustain }, { time: susTime, start: sustain, target: sustain },
{ time: release, start: sustain, target: 0, curve: rCurve }, { time: susTime + release, start: sustain, target: 0, curve: rCurve },
] ]
const {time, start, target, curve} = states[this.state]; let {time, start, target, curve} = states[this.state];
const length = Math.floor(time * sampleRate); this._advance(start, target, time, curve);
this._advance(start, target, length, curve); while (currentTime - this.beginTime >= time) {
if (this.segIdx >= length) {
this.state = (this.state + 1) % states.length; this.state = (this.state + 1) % states.length;
this.segIdx = 0; time = states[this.state].time;
} }
out[i] = this.val * peak; out[i] = this.val * peak;
} }