half working samples

packages/supradough/dough-worklet.mjs

@@ -6,7 +6,19 @@ class DoughProcessor extends AudioWorkletProcessor {
   constructor() {
     super();
     this.dough = new Dough(sampleRate, currentTime);
-    this.port.onmessage = (event) => this.dough.scheduleSpawn(event.data);
+    this.port.onmessage = (event) => {
+      if (event.data.spawn) {
+        this.dough.scheduleSpawn(event.data.spawn);
+      } else if (event.data.sample) {
+        this.dough.loadSample(event.data.sample, event.data.channels);
+      } else if (event.data.samples) {
+        event.data.samples.forEach(([name, channels]) => {
+          this.dough.loadSample(name, channels);
+        });
+      } else {
+        console.log('unrecognized event type', event.data);
+      }
+    };
   }
   process(inputs, outputs, params) {
     if (this.disconnected) {

packages/supradough/dough.mjs

@@ -383,6 +383,19 @@ export class Distort {
 }
 // distortion could be expressed as a function, because it's stateless
 
+export class BufferPlayer {
+  channels = [];
+  pos = 0;
+  update(freq, channel = 0) {
+    if (this.pos >= this.channels[channel].length) {
+      return 0;
+    }
+    let s = this.channels[channel][this.pos];
+    this.pos++;
+    return s;
+  }
+}
+
 export function _rangex(sig, min, max) {
   let logmin = Math.log(min);
   let range = Math.log(max) - logmin;
@@ -403,7 +416,7 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
   return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
 };
 
-let oscillators = {
+let shapes = {
   sine: SineOsc,
   saw: SawOsc,
   zaw: ZawOsc,
@@ -553,11 +566,20 @@ export class DoughVoice {
     this._holdEnd = this._begin + this._duration; // needed for gate
     this._end = this._holdEnd + this.release + 0.01; // needed for despawn
 
+    this.s ??= 'triangle';
     if (this.s === 'saw' || this.s === 'sawtooth') {
       this.s = 'zaw'; // polyblepped saw when fm is applied
     }
-    const SourceClass = oscillators[this.s] ?? TriOsc;
-    this._sound = new SourceClass();
+    if (shapes[this.s]) {
+      const SourceClass = shapes[this.s];
+      this._sound = new SourceClass();
+    } else if (value.samples.has(this.s)) {
+      this._sample = new BufferPlayer();
+      this._sample.channels = value.samples.get(this.s);
+      this._sample.pos = 0;
+    } else {
+      console.warn('sound not found', this.s);
+    }
 
     if (this.penv) {
       this._penv = new ADSR();
@@ -642,7 +664,7 @@ export class DoughVoice {
     return 1 - Math.log(c) * this.eighthOverLogHalf;
   }
   update(t) {
-    if (!this._sound) {
+    if (!this._sound && !this._sample) {
       return 0;
     }
     let s = 0;
@@ -666,10 +688,12 @@ export class DoughVoice {
     }
 
     // sound source
-    if (this.s === 'pulse') {
+    if (this._sound && this.s === 'pulse') {
       s = this._sound.update(freq, this.pw ?? 0.5);
-    } else {
+    } else if (this._sound) {
       s = this._sound.update(freq);
+    } else if (this._sample) {
+      s = this._sample.update(freq, 0); // tbd: stereo samples...
     }
     s = s * this.gain * this.velocity;
 
@@ -738,6 +762,7 @@ export class Dough {
   delaysend = [0, 0];
   delaytime = getDefaultValue('delaytime');
   delayfeedback = getDefaultValue('delayfeedback');
+  samples = new Map();
   t = 0;
   // sampleRate: number, currentTime: number (seconds)
   constructor(sampleRate = 48000, currentTime = 0) {
@@ -747,6 +772,9 @@ export class Dough {
     this._delayL = new Delay();
     this._delayR = new Delay();
   }
+  loadSample(name, channels) {
+    this.samples.set(name, channels);
+  }
   scheduleSpawn(value) {
     if (value._begin === undefined) {
       throw new Error('[dough]: scheduleSpawn expected _begin to be set');
@@ -760,6 +788,7 @@ export class Dough {
   }
   spawn(value) {
     value.id = this.vid++;
+    value.samples = this.samples;
     const voice = new DoughVoice(value);
     this.voices.push(voice);
     // console.log('spawn', voice.id, 'voices:', this.voices.length);