BuboBubo/topos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mockup of polyphony system"

Browse Source 
This reverts commit 1156b31c01.
This commit is contained in:
Raphaël Forment
2023-10-31 19:38:56 +01:00
parent 1156b31c01
commit 04dbac2cd7
1 changed files with 127 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

284
src/classes/SoundEvent.ts
View File

@ -12,9 +12,6 @@ import {
// @ts-ignore // @ts-ignore
} from "superdough"; } from "superdough";
type Param = number | number[];
export type SoundParams = { export type SoundParams = {
dur: number; dur: number;
s?: string; s?: string;
@ -23,101 +20,76 @@ export type SoundParams = {
export class SoundEvent extends AudibleEvent { export class SoundEvent extends AudibleEvent {
nudge: number; nudge: number;
constructor(sound: string | object | (string | object)[], public app: Editor) { constructor(sound: string | object, public app: Editor) {
super(app); super(app);
this.nudge = app.dough_nudge / 100; this.nudge = app.dough_nudge / 100;
if (Array.isArray(sound)) {
this.values = sound.map(s => this.initializeSound(s));
} else {
this.values = this.initializeSound(sound);
}
}
private initializeSound(sound: string | object): object {
if (typeof sound === "string") { if (typeof sound === "string") {
if (sound.includes(":")) { if (sound.includes(":")) {
return { this.values = {
s: sound.split(":")[0], s: sound.split(":")[0],
n: sound.split(":")[1], n: sound.split(":")[1],
dur: this.app.clock.convertPulseToSecond(this.app.clock.ppqn), dur: app.clock.convertPulseToSecond(app.clock.ppqn),
analyze: true, analyze: true,
}; };
} else { } else {
return { s: sound, dur: 0.5, analyze: true }; this.values = { s: sound, dur: 0.5, analyze: true };
} }
} else { } else {
return sound; this.values = sound;
} }
} }
public updateValue = <T>(key: string, value: T): this => { private updateValue<T>(key: string, value: T): this {
if (Array.isArray(this.values)) { this.values[key] = value;
if (Array.isArray(value)) {
let originalLength = this.values.length;
for (let i = 0; i < value.length; i++) {
if (i >= originalLength) {
let newObject = { ...this.values[i % originalLength] };
this.values.push(newObject);
}
this.values[i][key] = value[i];
}
} else {
this.values.forEach(obj => obj[key] = value);
}
} else {
this.values[key] = value;
}
return this; return this;
} }
// ================================================================================ // ================================================================================
// ZZFX Sound Parameters // ZZFX Sound Parameters
// ================================================================================ // ================================================================================
public volume = (value: number) => this.updateValue("volume", value);
public volume = (value: Param) => this.updateValue("volume", value);
public vol = this.volume; public vol = this.volume;
public zrand = (value: Param) => this.updateValue("zrand", value); public zrand = (value: number) => this.updateValue("zrand", value);
public curve = (value: Param) => this.updateValue("curve", value); public curve = (value: number) => this.updateValue("curve", value);
public slide = (value: Param) => this.updateValue("slide", value); public slide = (value: number) => this.updateValue("slide", value);
public sld = this.slide; public sld = this.slide;
public deltaSlide = (value: number | number[]) => this.updateValue("deltaSlide", value); public deltaSlide = (value: number) => this.updateValue("deltaSlide", value);
public dslide = this.deltaSlide; public dslide = this.deltaSlide;
public pitchJump = (value: number) => this.updateValue("pitchJump", value); public pitchJump = (value: number) => this.updateValue("pitchJump", value);
public pj = this.pitchJump; public pj = this.pitchJump;
public pitchJumpTime = (value: number) => public pitchJumpTime = (value: number) =>
this.updateValue("pitchJumpTime", value); this.updateValue("pitchJumpTime", value);
public pjt = this.pitchJumpTime; public pjt = this.pitchJumpTime;
public lfo = (value: Param) => this.updateValue("lfo", value); public lfo = (value: number) => this.updateValue("lfo", value);
public znoise = (value: Param) => this.updateValue("znoise", value); public znoise = (value: number) => this.updateValue("znoise", value);
public noise = (value: Param) => this.updateValue("noise", value); public noise = (value: number) => this.updateValue("noise", value);
public zmod = (value: Param) => this.updateValue("zmod", value); public zmod = (value: number) => this.updateValue("zmod", value);
public zcrush = (value: Param) => this.updateValue("zcrush", value); public zcrush = (value: number) => this.updateValue("zcrush", value);
public zdelay = (value: Param) => this.updateValue("zdelay", value); public zdelay = (value: number) => this.updateValue("zdelay", value);
public sustainVolume = (value: Param) => public sustainVolume = (value: number) =>
this.updateValue("sustainVolume", value); this.updateValue("sustainVolume", value);
public tremolo = (value: Param) => this.updateValue("tremolo", value); public tremolo = (value: number) => this.updateValue("tremolo", value);
public dur = (value: Param) => this.updateValue("dur", value); public dur = (value: number) => this.updateValue("dur", value);
public zzfx = (value: Param[]) => this.updateValue("zzfx", value); public zzfx = (value: number[]) => this.updateValue("zzfx", value);
// ================================================================================ // ================================================================================
// Basic Audio Engine Parameters // Basic Audio Engine Parameters
// ================================================================================ // ================================================================================
// FM Synthesis // FM Synthesis
public fmi = (value: Param) => this.updateValue("fmi", value); public fmi = (value: number) => this.updateValue("fmi", value);
public fmh = (value: Param) => this.updateValue("fmh", value); public fmh = (value: number) => this.updateValue("fmh", value);
public fmenv = (value: "lin" | "exp") => this.updateValue("fmenv", value); public fmenv = (value: "lin" | "exp") => this.updateValue("fmenv", value);
public fmattack = (value: Param) => this.updateValue("fmattack", value); public fmattack = (value: number) => this.updateValue("fmattack", value);
public fmatk = this.fmattack; public fmatk = this.fmattack;
public fmdecay = (value: Param) => this.updateValue("fmdecay", value); public fmdecay = (value: number) => this.updateValue("fmdecay", value);
public fmdec = this.fmdecay; public fmdec = this.fmdecay;
public fmsustain = (value: Param) => this.updateValue("fmsustain", value); public fmsustain = (value: number) => this.updateValue("fmsustain", value);
public fmsus = this.fmsustain; public fmsus = this.fmsustain;
public fmrelease = (value: Param) => this.updateValue("fmrelease", value); public fmrelease = (value: number) => this.updateValue("fmrelease", value);
public fmrel = this.fmrelease; public fmrel = this.fmrelease;
public fmvelocity = (value: Param) => this.updateValue("fmvelocity", value); public fmvelocity = (value: number) => this.updateValue("fmvelocity", value);
public fmvel = this.fmvelocity; public fmvel = this.fmvelocity;
public fmwave = (value: "sine" | "triangle" | "sawtooth" | "square") => public fmwave = (value: "sine" | "triangle" | "sawtooth" | "square") =>
this.updateValue("fmwave", value); this.updateValue("fmwave", value);
@ -125,25 +97,25 @@ export class SoundEvent extends AudibleEvent {
// Filter type // Filter type
public ftype = (value: "12db" | "24db") => this.updateValue("ftype", value); public ftype = (value: "12db" | "24db") => this.updateValue("ftype", value);
public fanchor = (value: Param) => this.updateValue("fanchor", value); public fanchor = (value: number) => this.updateValue("fanchor", value);
// Amplitude Envelope // Amplitude Envelope
public attack = (value: Param) => this.updateValue("attack", value); public attack = (value: number) => this.updateValue("attack", value);
public atk = this.attack; public atk = this.attack;
public decay = (value: Param) => this.updateValue("decay", value); public decay = (value: number) => this.updateValue("decay", value);
public dec = this.decay; public dec = this.decay;
public sustain = (value: Param) => this.updateValue("sustain", value); public sustain = (value: number) => this.updateValue("sustain", value);
public sus = this.sustain; public sus = this.sustain;
public release = (value: Param) => this.updateValue("release", value); public release = (value: number) => this.updateValue("release", value);
public rel = this.release; public rel = this.release;
public adsr = (a: Param, d: Param, s: Param, r: Param) => { public adsr = (a: number, d: number, s: number, r: number) => {
this.attack(a); this.attack(a);
this.decay(d); this.decay(d);
this.sustain(s); this.sustain(s);
this.release(r); this.release(r);
return this; return this;
}; };
public ad = (a: Param, d: Param) => { public ad = (a: number, d: number) => {
this.attack(a); this.attack(a);
this.decay(d); this.decay(d);
this.sustain(0.0); this.sustain(0.0);
@ -152,17 +124,17 @@ export class SoundEvent extends AudibleEvent {
}; };
// Lowpass filter // Lowpass filter
public lpenv = (value: Param) => this.updateValue("lpenv", value); public lpenv = (value: number) => this.updateValue("lpenv", value);
public lpe = (value: Param) => this.updateValue("lpenv", value); public lpe = (value: number) => this.updateValue("lpenv", value);
public lpattack = (value: Param) => this.updateValue("lpattack", value); public lpattack = (value: number) => this.updateValue("lpattack", value);
public lpa = this.lpattack; public lpa = this.lpattack;
public lpdecay = (value: Param) => this.updateValue("lpdecay", value); public lpdecay = (value: number) => this.updateValue("lpdecay", value);
public lpd = this.lpdecay; public lpd = this.lpdecay;
public lpsustain = (value: Param) => this.updateValue("lpsustain", value); public lpsustain = (value: number) => this.updateValue("lpsustain", value);
public lps = this.lpsustain; public lps = this.lpsustain;
public lprelease = (value: Param) => this.updateValue("lprelease", value); public lprelease = (value: number) => this.updateValue("lprelease", value);
public lpr = this.lprelease; public lpr = this.lprelease;
public cutoff = (value: Param, resonance?: Param) => { public cutoff = (value: number, resonance?: number) => {
this.updateValue("cutoff", value); this.updateValue("cutoff", value);
if (resonance) { if (resonance) {
this.resonance(resonance) this.resonance(resonance)
@ -170,7 +142,7 @@ export class SoundEvent extends AudibleEvent {
return this; return this;
} }
public lpf = this.cutoff; public lpf = this.cutoff;
public resonance = (value: Param | number) => { public resonance = (value: number) => {
if (value >= 0 && value <= 1) { if (value >= 0 && value <= 1) {
this.updateValue( this.updateValue(
"resonance", "resonance",
@ -181,11 +153,11 @@ export class SoundEvent extends AudibleEvent {
} }
public lpq = this.resonance; public lpq = this.resonance;
public lpadsr = ( public lpadsr = (
depth: Param, depth: number,
a: Param, a: number,
d: Param, d: number,
s: Param, s: number,
r: Param r: number
) => { ) => {
this.lpenv(depth); this.lpenv(depth);
this.lpattack(a); this.lpattack(a);
@ -195,9 +167,9 @@ export class SoundEvent extends AudibleEvent {
return this; return this;
}; };
public lpad = ( public lpad = (
depth: Param, depth: number,
a: Param, a: number,
d: Param, d: number,
) => { ) => {
this.lpenv(depth); this.lpenv(depth);
this.lpattack(a); this.lpattack(a);
@ -210,19 +182,19 @@ export class SoundEvent extends AudibleEvent {
// Highpass filter // Highpass filter
public hpenv = (value: Param) => this.updateValue("hpenv", value); public hpenv = (value: number) => this.updateValue("hpenv", value);
public hpe = (value: Param) => this.updateValue("hpe", value); public hpe = (value: number) => this.updateValue("hpe", value);
public hpattack = (value: Param) => this.updateValue("hpattack", value); public hpattack = (value: number) => this.updateValue("hpattack", value);
public hpa = this.hpattack; public hpa = this.hpattack;
public hpdecay = (value: Param) => this.updateValue("hpdecay", value); public hpdecay = (value: number) => this.updateValue("hpdecay", value);
public hpd = this.hpdecay; public hpd = this.hpdecay;
public hpsustain = (value: Param) => this.updateValue("hpsustain", value); public hpsustain = (value: number) => this.updateValue("hpsustain", value);
public hpsus = this.hpsustain; public hpsus = this.hpsustain;
public hprelease = (value: Param) => this.updateValue("hprelease", value); public hprelease = (value: number) => this.updateValue("hprelease", value);
public hpr = this.hprelease; public hpr = this.hprelease;
public hcutoff = (value: Param) => this.updateValue("hcutoff", value); public hcutoff = (value: number) => this.updateValue("hcutoff", value);
public hpf = this.hcutoff; public hpf = this.hcutoff;
public hresonance = (value: Param, resonance?: Param) => { public hresonance = (value: number, resonance?: number) => {
this.updateValue("hresonance", value); this.updateValue("hresonance", value);
if (resonance) { if (resonance) {
this.resonance(resonance) this.resonance(resonance)
@ -231,11 +203,11 @@ export class SoundEvent extends AudibleEvent {
} }
public hpq = this.hresonance; public hpq = this.hresonance;
public hpadsr = ( public hpadsr = (
depth: Param, depth: number,
a: Param, a: number,
d: Param, d: number,
s: Param, s: number,
r: Param r: number
) => { ) => {
this.hpenv(depth); this.hpenv(depth);
this.hpattack(a); this.hpattack(a);
@ -245,9 +217,9 @@ export class SoundEvent extends AudibleEvent {
return this; return this;
}; };
public hpad = ( public hpad = (
depth: Param, depth: number,
a: Param, a: number,
d: Param, d: number,
) => { ) => {
this.hpenv(depth); this.hpenv(depth);
this.hpattack(a); this.hpattack(a);
@ -259,17 +231,17 @@ export class SoundEvent extends AudibleEvent {
// Bandpass filter // Bandpass filter
public bpenv = (value: Param) => this.updateValue("bpenv", value); public bpenv = (value: number) => this.updateValue("bpenv", value);
public bpe = (value: Param) => this.updateValue("bpe", value); public bpe = (value: number) => this.updateValue("bpe", value);
public bpattack = (value: Param) => this.updateValue("bpattack", value); public bpattack = (value: number) => this.updateValue("bpattack", value);
public bpa = this.bpattack; public bpa = this.bpattack;
public bpdecay = (value: Param) => this.updateValue("bpdecay", value); public bpdecay = (value: number) => this.updateValue("bpdecay", value);
public bpd = this.bpdecay; public bpd = this.bpdecay;
public bpsustain = (value: Param) => this.updateValue("bpsustain", value); public bpsustain = (value: number) => this.updateValue("bpsustain", value);
public bps = this.bpsustain; public bps = this.bpsustain;
public bprelease = (value: Param) => this.updateValue("bprelease", value); public bprelease = (value: number) => this.updateValue("bprelease", value);
public bpr = this.bprelease; public bpr = this.bprelease;
public bandf = (value: Param, resonance?: Param) => { public bandf = (value: number, resonance?: number) => {
this.updateValue("bandf", value); this.updateValue("bandf", value);
if (resonance) { if (resonance) {
this.resonance(resonance) this.resonance(resonance)
@ -277,14 +249,14 @@ export class SoundEvent extends AudibleEvent {
return this; return this;
} }
public bpf = this.bandf; public bpf = this.bandf;
public bandq = (value: Param) => this.updateValue("bandq", value); public bandq = (value: number) => this.updateValue("bandq", value);
public bpq = this.bandq; public bpq = this.bandq;
public bpadsr = ( public bpadsr = (
depth: Param, depth: number,
a: Param, a: number,
d: Param, d: number,
s: Param, s: number,
r: Param r: number
) => { ) => {
this.bpenv(depth); this.bpenv(depth);
this.bpattack(a); this.bpattack(a);
@ -294,9 +266,9 @@ export class SoundEvent extends AudibleEvent {
return this; return this;
}; };
public bpad = ( public bpad = (
depth: Param, depth: number,
a: Param, a: number,
d: Param, d: number,
) => { ) => {
this.bpenv(depth); this.bpenv(depth);
this.bpattack(a); this.bpattack(a);
@ -307,11 +279,11 @@ export class SoundEvent extends AudibleEvent {
}; };
public freq = (value: Param) => this.updateValue("freq", value); public freq = (value: number) => this.updateValue("freq", value);
public f = this.freq; public f = this.freq;
public vib = (value: Param) => this.updateValue("vib", value); public vib = (value: number) => this.updateValue("vib", value);
public vibmod = (value: Param) => this.updateValue("vibmod", value); public vibmod = (value: number) => this.updateValue("vibmod", value);
public fm = (value: Param | string) => { public fm = (value: number | string) => {
if (typeof value === "number") { if (typeof value === "number") {
this.values["fmi"] = value; this.values["fmi"] = value;
} else { } else {
@ -323,22 +295,22 @@ export class SoundEvent extends AudibleEvent {
}; };
// Sampler looping // Sampler looping
public loop = (value: Param) => this.updateValue("loop", value); public loop = (value: number) => this.updateValue("loop", value);
public loopBegin = (value: Param) => this.updateValue("loopBegin", value); public loopBegin = (value: number) => this.updateValue("loopBegin", value);
public loopEnd = (value: Param) => this.updateValue("loopEnd", value); public loopEnd = (value: number) => this.updateValue("loopEnd", value);
public begin = (value: Param) => this.updateValue("begin", value); public begin = (value: number) => this.updateValue("begin", value);
public end = (value: Param) => this.updateValue("end", value); public end = (value: number) => this.updateValue("end", value);
// Gain management // Gain management
public gain = (value: Param) => this.updateValue("gain", value); public gain = (value: number) => this.updateValue("gain", value);
public dbgain = (value: Param) => public dbgain = (value: number) =>
this.updateValue("gain", Math.min(Math.pow(10, value / 20), 10)); this.updateValue("gain", Math.min(Math.pow(10, value / 20), 10));
public db = this.dbgain; public db = this.dbgain;
public velocity = (value: Param) => this.updateValue("velocity", value); public velocity = (value: number) => this.updateValue("velocity", value);
public vel = this.velocity; public vel = this.velocity;
// Panoramic control (stereo) // Panoramic control (stereo)
public pan = (value: Param) => this.updateValue("pan", value); public pan = (value: number) => this.updateValue("pan", value);
// Frequency management // Frequency management
@ -381,10 +353,10 @@ export class SoundEvent extends AudibleEvent {
} }
}; };
public snd = this.sound; public snd = this.sound;
public cut = (value: Param) => this.updateValue("cut", value); public cut = (value: number) => this.updateValue("cut", value);
public clip = (value: Param) => this.updateValue("clip", value); public clip = (value: number) => this.updateValue("clip", value);
public n = (value: Param) => this.updateValue("n", value); public n = (value: number) => this.updateValue("n", value);
public note = (value: Param | string | null) => { public note = (value: number | string | null) => {
if (typeof value === "string") { if (typeof value === "string") {
return this.updateValue("note", noteNameToMidi(value)); return this.updateValue("note", noteNameToMidi(value));
} else if (typeof value == null || value == undefined) { } else if (typeof value == null || value == undefined) {
@ -393,41 +365,41 @@ export class SoundEvent extends AudibleEvent {
return this.updateValue("note", value); return this.updateValue("note", value);
} }
}; };
public speed = (value: Param) => this.updateValue("speed", value); public speed = (value: number) => this.updateValue("speed", value);
public spd = this.speed; public spd = this.speed;
// Creative sampler effects // Creative sampler effects
public coarse = (value: Param) => this.updateValue("coarse", value); public coarse = (value: number) => this.updateValue("coarse", value);
public crush = (value: Param) => this.updateValue("crush", value); public crush = (value: number) => this.updateValue("crush", value);
public shape = (value: Param) => this.updateValue("shape", value); public shape = (value: number) => this.updateValue("shape", value);
public vowel = (value: Param) => this.updateValue("vowel", value); public vowel = (value: number) => this.updateValue("vowel", value);
public vow = this.vowel; public vow = this.vowel;
// Delay control // Delay control
public delay = (value: Param) => this.updateValue("delay", value); public delay = (value: number) => this.updateValue("delay", value);
public del = this.delay; public del = this.delay;
public delayfeedback = (value: Param) => public delayfeedback = (value: number) =>
this.updateValue("delayfeedback", value); this.updateValue("delayfeedback", value);
public delayfb = this.delayfeedback; public delayfb = this.delayfeedback;
public delaytime = (value: Param) => this.updateValue("delaytime", value); public delaytime = (value: number) => this.updateValue("delaytime", value);
public delayt = this.delaytime; public delayt = this.delaytime;
// Orbit management // Orbit management
public orbit = (value: Param) => this.updateValue("orbit", value); public orbit = (value: number) => this.updateValue("orbit", value);
public o = this.orbit; public o = this.orbit;
// Reverb management // Reverb management
public room = (value: Param) => this.updateValue("room", value); public room = (value: number) => this.updateValue("room", value);
public rm = this.room; public rm = this.room;
public roomfade = (value: Param) => this.updateValue("roomfade", value); public roomfade = (value: number) => this.updateValue("roomfade", value);
public rfade = this.roomfade; public rfade = this.roomfade;
public roomlp = (value: Param) => this.updateValue("roomlp", value); public roomlp = (value: number) => this.updateValue("roomlp", value);
public rlp = this.roomlp; public rlp = this.roomlp;
public roomdim = (value: Param) => this.updateValue("roomdim", value); public roomdim = (value: number) => this.updateValue("roomdim", value);
public rdim = this.roomdim; public rdim = this.roomdim;
public size = (value: Param) => this.updateValue("roomsize", value); public size = (value: number) => this.updateValue("roomsize", value);
public sz = this.size; public sz = this.size;
public rev = (room: Param, size: Param, fade?: Param, lp?: Param, dim?: Param) => { public rev = (room: number, size: number, fade?: number, lp?: number, dim?: number) => {
this.updateValue("room", room) this.updateValue("room", room)
this.updateValue("roomsize", size) this.updateValue("roomsize", size)
if (fade) if (fade)
@ -441,21 +413,21 @@ export class SoundEvent extends AudibleEvent {
} }
// Compressor // Compressor
public comp = (value: Param) => this.updateValue("compressor", value); public comp = (value: number) => this.updateValue("compressor", value);
public cmp = this.comp; public cmp = this.comp;
public ratio = (value: Param) => this.updateValue("compressorRatio", value); public ratio = (value: number) => this.updateValue("compressorRatio", value);
public rt = this.ratio; public rt = this.ratio;
public knee = (value: Param) => this.updateValue("compressorKnee", value); public knee = (value: number) => this.updateValue("compressorKnee", value);
public kn = this.knee; public kn = this.knee;
public compAttack = (value: Param) => public compAttack = (value: number) =>
this.updateValue("compressorAttack", value); this.updateValue("compressorAttack", value);
public cmpa = this.compAttack; public cmpa = this.compAttack;
public compRelease = (value: Param) => public compRelease = (value: number) =>
this.updateValue("compressorRelease", value); this.updateValue("compressorRelease", value);
public cmpr = this.compRelease; public cmpr = this.compRelease;
// Unit // Unit
public stretch = (beat: Param) => { public stretch = (beat: number) => {
this.updateValue("unit", "c"); this.updateValue("unit", "c");
this.updateValue("speed", 1 / beat); this.updateValue("speed", 1 / beat);
this.updateValue("cut", beat); this.updateValue("cut", beat);
@ -487,16 +459,14 @@ export class SoundEvent extends AudibleEvent {
}; };
out = (): void => { out = (): void => {
console.log(this.values) if (this.values.chord) {
if (Array.isArray(this.values)) { this.values.chord.forEach((obj: { [key: string]: number }) => {
this.values.forEach((soundObj) => { const copy = { ...this.values };
superdough(soundObj, this.nudge, soundObj.dur); copy.freq = obj.freq;
superdough(copy, this.nudge, this.values.dur);
}); });
} else { } else {
superdough(this.values, this.nudge, this.values.dur); superdough(this.values, this.nudge, this.values.dur);
} }
}; };
} }