@blibliki/engine 0.1.11 → 0.1.13

package/src/Module/Oscillator.ts

@@ -1,4 +1,3 @@
-import MidiEvent from "../MidiEvent";
 import { now, Oscillator as Osc, ToneOscillatorType } from "tone";
 
 import Note from "../Note";
@@ -32,10 +31,7 @@ class MonoOscillator extends Module<Osc, OscillatorInterface> {
       props: { ...InitialProps, ...props },
     });
 
-    this.note = new Note("C3");
-
-    this.internalModule.sync();
-    this.internalModule.start();
+    this.start(now());
   }
 
   get note(): Note {
@@ -108,28 +104,40 @@ class MonoOscillator extends Module<Osc, OscillatorInterface> {
     this.updateFrequency();
   }
 
-  start() {
-    this.internalModule.start();
+  start(time: number) {
+    const state = this.internalModule.context.transport.state;
+    if (state !== "started") return;
+
+    const oscState = this.internalModule.state;
+
+    if (oscState === "started") {
+      this.internalModule.restart(time);
+    } else {
+      this.internalModule.start(time);
+    }
+  }
+
+  stop(time?: number) {
+    this.internalModule.stop(time);
   }
 
   triggerAttack = (note: Note, triggeredAt: number) => {
     this.setNoteAt(note, triggeredAt);
+    this.start(triggeredAt);
   };
 
-  triggerRelease = (note: Note) => {
+  triggerRelease = (note: Note, triggeredAt: number) => {
     // Do nothing
   };
 
   private updateFrequency(time?: number) {
     if (!this.note) return;
 
-    const freq = this.note.frequency(this.range, this.coarse);
+    const freq = this.note.adjustFrequency(this.range, this.coarse);
 
     if (time) {
-      this.internalModule.restart(time);
-      this.internalModule.frequency.setValueAtTime(freq, time);
+      this.internalModule.frequency.linearRampToValueAtTime(freq, time);
     } else {
-      this.internalModule.restart();
       this.internalModule.frequency.value = freq;
     }
   }
@@ -156,6 +164,14 @@ export default class Oscillator extends PolyModule<
     this.registerInputs();
   }
 
+  start(time: number) {
+    this.audioModules.forEach((audioModule) => audioModule.start(time));
+  }
+
+  stop(time?: number) {
+    this.audioModules.forEach((audioModule) => audioModule.stop(time));
+  }
+
   private registerInputs() {
     this.registerInput({
       name: "midi in",

package/src/Module/PolyModule.ts

@@ -92,7 +92,7 @@ export default abstract class PolyModule<
 
   midiTriggered = (
     midiEvent: MidiEvent,
-    voiceNo: number,
+    voiceNo: number = 0,
     noteIndex?: number
   ) => {
     const audioModule = this.findVoice(voiceNo);

package/src/Module/Sequencer.ts

@@ -1,4 +1,4 @@
-import { Part, Time } from "tone";
+import { now, Part, Time } from "tone";
 import Module, { DummnyInternalModule } from "./Base";
 import { INote } from "../Note";
 import { Output } from "./IO";
@@ -37,18 +37,27 @@ export default class Sequencer extends Module<
     });
 
     this.initializePart();
-    this.start();
+    this.start(now());
     this.registerOutputs();
   }
 
+  get props() {
+    return super.props;
+  }
+
+  set props(value: ISequencer) {
+    if (!this.sequences) this._props["sequences"] = [];
+
+    super.props = { ...this.props, ...value };
+    this.adjust();
+  }
+
   get steps() {
     return this._props["steps"];
   }
 
   set steps(value: number) {
     this._props = { ...this.props, steps: value };
-    this.adjustNumberOfSequences();
-    this.updateBarParts();
   }
 
   get bars() {
@@ -57,9 +66,6 @@ export default class Sequencer extends Module<
 
   set bars(value: number) {
     this._props = { ...this.props, bars: value };
-    this.adjustNumberOfBars();
-    this.adjustNumberOfSequences();
-    this.updateBarParts();
   }
 
   get sequences() {
@@ -69,11 +75,13 @@ export default class Sequencer extends Module<
   set sequences(value: ISequence[][]) {
     const sequences = value;
     this._props = { ...this.props, sequences };
-    this.updateBarParts();
   }
 
-  start() {
-    this.part.start();
+  start(time: number) {
+    const state = this.part.context.transport.state;
+    if (state !== "started") return;
+
+    this.part.start(time);
   }
 
   stop() {
@@ -94,6 +102,14 @@ export default class Sequencer extends Module<
     });
   }
 
+  private adjust() {
+    if (!this.part) return;
+
+    this.adjustNumberOfBars();
+    this.adjustNumberOfSteps();
+    this.updateBarParts();
+  }
+
   private adjustNumberOfBars() {
     const currentBar = this.sequences.length;
     const num = currentBar - this.bars;
@@ -102,16 +118,8 @@ export default class Sequencer extends Module<
     if (num === 0) return;
 
     if (num > 0) {
-      if (this.part) {
-        this.part.remove(`${currentBar}:0:0`);
-        this.part.loopEnd = this.loopEnd;
-      }
       sequences.pop();
     } else {
-      if (this.part) {
-        this.part.add(`${currentBar}:0:0`, currentBar);
-        this.part.loopEnd = this.loopEnd;
-      }
       sequences.push([]);
     }
 
@@ -119,7 +127,7 @@ export default class Sequencer extends Module<
     this.adjustNumberOfBars();
   }
 
-  private adjustNumberOfSequences(bar = 0) {
+  private adjustNumberOfSteps(bar = 0) {
     if (!this.bars) return;
 
     const allSequences = [...this.sequences];
@@ -129,7 +137,7 @@ export default class Sequencer extends Module<
     if (num === 0) {
       if (bar === this.bars - 1) return;
 
-      this.adjustNumberOfSequences(bar + 1);
+      this.adjustNumberOfSteps(bar + 1);
       return;
     }
 
@@ -142,7 +150,7 @@ export default class Sequencer extends Module<
     allSequences[bar] = sequences;
     this.sequences = allSequences;
 
-    this.adjustNumberOfSequences(bar);
+    this.adjustNumberOfSteps(bar);
   }
 
   private updateBarParts() {
@@ -152,6 +160,12 @@ export default class Sequencer extends Module<
 
       return part;
     });
+
+    this.part.clear();
+    this.barParts.forEach((_, bar) => {
+      this.part.add(`${bar}:0:0`, bar);
+    });
+    this.part.loopEnd = this.loopEnd;
   }
 
   private get loopEnd() {

package/src/Module/Volume.ts

@@ -2,13 +2,14 @@ import { Volume as Vol } from "tone";
 
 import Module, { Voicable } from "./Base";
 import PolyModule from "./PolyModule";
+import Note from "../Note";
 
 export interface VolumeInterface extends Voicable {
   volume: number;
 }
 
 const InitialProps: VolumeInterface = {
-  volume: -100,
+  volume: -Infinity,
 };
 
 class MonoVolume extends Module<Vol, VolumeInterface> {
@@ -28,6 +29,15 @@ class MonoVolume extends Module<Vol, VolumeInterface> {
 
     this.internalModule.volume.value = this.volume;
   }
+
+  triggerAttack = (note: Note, triggeredAt: number) => {
+    const db = 20 * Math.log10(note.velocity);
+    this.internalModule.volume.exponentialRampToValueAtTime(db, triggeredAt);
+  };
+
+  triggerRelease = (note: Note, triggeredAt: number) => {
+    // Do nothing
+  };
 }
 
 export default class Volume extends PolyModule<MonoVolume, VolumeInterface> {
@@ -42,5 +52,13 @@ export default class Volume extends PolyModule<MonoVolume, VolumeInterface> {
 
     this.registerBasicInputs();
     this.registerBasicOutputs();
+    this.registerInputs();
+  }
+
+  private registerInputs() {
+    this.registerInput({
+      name: "midi in",
+      pluggable: this.midiTriggered,
+    });
   }
 }

package/src/Module/index.ts

@@ -14,6 +14,7 @@ import Delay from "./Delay";
 import Distortion from "./Distortion";
 import BitCrusher from "./BitCrusher";
 import Sequencer from "./Sequencer";
+import DataSequencer from "./DataSequencer";
 
 export { default } from "./Base";
 export { default as PolyModule } from "./PolyModule";
@@ -22,7 +23,9 @@ export type { ModuleInterface, Connectable, Triggerable } from "./Base";
 export { default as Filter } from "./Filter";
 export { default as Oscillator } from "./Oscillator";
 export { default as Sequencer } from "./Sequencer";
+export { default as DataSequencer } from "./DataSequencer";
 export type { ISequence } from "./Sequencer";
+export type { IDataSequence } from "./DataSequencer";
 
 export {
   Envelope,
@@ -79,6 +82,8 @@ function moduleClassFromType(type: string) {
       return BitCrusher;
     case Sequencer.moduleName:
       return Sequencer;
+    case DataSequencer.moduleName:
+      return DataSequencer;
     default:
       throw Error(`Unknown module type ${type}`);
   }

package/src/Note/index.ts

@@ -6,6 +6,7 @@ const NotesLength = Notes.length;
 
 export interface INote {
   note: string;
+  frequency: number;
   duration: string;
   velocity?: number;
 }
@@ -16,9 +17,14 @@ export default class Note {
   octave: number;
   velocity: number = 1;
   duration: string;
-
-  constructor(eventOrString: Partial<INote> | MIDIMessageEvent | string) {
-    if (typeof eventOrString === "string") {
+  frequency: number;
+
+  constructor(
+    eventOrString: Partial<INote> | MIDIMessageEvent | string | number
+  ) {
+    if (typeof eventOrString === "number") {
+      this.fromFrequency(eventOrString);
+    } else if (typeof eventOrString === "string") {
       this.fromString(eventOrString);
     } else if (eventOrString instanceof MIDIMessageEvent) {
       this.fromEvent(eventOrString);
@@ -39,7 +45,9 @@ export default class Note {
     return `${this.name}${this.octave}`;
   }
 
-  frequency(range: number = 0, coarse: number = 0) {
+  adjustFrequency(range: number = 0, coarse: number = 0) {
+    if (this.frequency) return this.frequency;
+
     let newOctave = this.octave + range;
     let coarseIndex = Notes.indexOf(this.name) + coarse;
     let nameIndex = coarseIndex;
@@ -51,7 +59,6 @@ export default class Note {
       newOctave--;
       nameIndex = NotesLength + nameIndex;
     }
-
     const newName = Notes[nameIndex];
 
     return frequencyTable[`${newName}${newOctave}`];
@@ -64,11 +71,16 @@ export default class Note {
   serialize(): INote {
     return {
       note: this.fullName,
+      frequency: this.frequency,
       velocity: this.velocity,
       duration: this.duration,
     };
   }
 
+  private fromFrequency(frequency: number) {
+    this.frequency = frequency;
+  }
+
   private fromString(string: string) {
     const matches = string.match(/(\w#?)(\d)?/) || [];
 

package/src/index.ts

@@ -5,6 +5,11 @@ export { default as Note } from "./Note";
 
 export type { INote } from "./Note";
 export type { MidiDeviceInterface } from "./MidiDevice";
-export type { ModuleInterface, AudioModule, ISequence } from "./Module";
+export type {
+  ModuleInterface,
+  AudioModule,
+  ISequence,
+  IDataSequence,
+} from "./Module";
 
 export type { SerializeInterface as IOProps } from "./Module/IO";