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

fixing lpq and hpq

Browse Source
This commit is contained in:
Raphaël Forment
2024-01-15 21:45:03 +01:00
parent 61051c9e42
commit 85b0306bb6
1 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/classes/SoundEvent.ts
View File

@ -70,7 +70,7 @@ export class SoundEvent extends AudibleEvent {
phaserDepth: ["phaserDepth", "phasdepth"], phaserDepth: ["phaserDepth", "phasdepth"],
phaserSweep: ["phaserSweep", "phassweep"], phaserSweep: ["phaserSweep", "phassweep"],
phaserCenter: ["phaserCenter", "phascenter"], phaserCenter: ["phaserCenter", "phascenter"],
fmadsr: function ( fmadsr: function(
self: SoundEvent, self: SoundEvent,
a: number, a: number,
d: number, d: number,
@ -83,7 +83,7 @@ export class SoundEvent extends AudibleEvent {
self.updateValue("fmrelease", r); self.updateValue("fmrelease", r);
return self; return self;
}, },
fmad: function (self: SoundEvent, a: number, d: number) { fmad: function(self: SoundEvent, a: number, d: number) {
self.updateValue("fmattack", a); self.updateValue("fmattack", a);
self.updateValue("fmdecay", d); self.updateValue("fmdecay", d);
return self; return self;
@ -94,7 +94,7 @@ export class SoundEvent extends AudibleEvent {
decay: ["decay", "dec"], decay: ["decay", "dec"],
sustain: ["sustain", "sus"], sustain: ["sustain", "sus"],
release: ["release", "rel"], release: ["release", "rel"],
adsr: function ( adsr: function(
self: SoundEvent, self: SoundEvent,
a: number, a: number,
d: number, d: number,
@ -107,18 +107,18 @@ export class SoundEvent extends AudibleEvent {
self.updateValue("release", r); self.updateValue("release", r);
return self; return self;
}, },
ad: function (self: SoundEvent, a: number, d: number) { ad: function(self: SoundEvent, a: number, d: number) {
self.updateValue("attack", a); self.updateValue("attack", a);
self.updateValue("decay", d); self.updateValue("decay", d);
self.updateValue("sustain", 0.0); self.updateValue("sustain", 0.0);
self.updateValue("release", 0.0); self.updateValue("release", 0.0);
return self; return self;
}, },
scope: function (self: SoundEvent) { scope: function(self: SoundEvent) {
self.updateValue("analyze", true); self.updateValue("analyze", true);
return self; return self;
}, },
debug: function (self: SoundEvent, callback?: Function) { debug: function(self: SoundEvent, callback?: Function) {
self.updateValue("debug", true); self.updateValue("debug", true);
if (callback) { if (callback) {
self.updateValue("debugFunction", callback); self.updateValue("debugFunction", callback);
@ -130,27 +130,33 @@ export class SoundEvent extends AudibleEvent {
lpdecay: ["lpdecay", "lpd"], lpdecay: ["lpdecay", "lpd"],
lpsustain: ["lpsustain", "lps"], lpsustain: ["lpsustain", "lps"],
lprelease: ["lprelease", "lpr"], lprelease: ["lprelease", "lpr"],
cutoff: function (self: SoundEvent, value: number, resonance?: number) { cutoff: function(self: SoundEvent, value: number, resonance?: number) {
self.updateValue("cutoff", value); self.updateValue("cutoff", value);
if (resonance) { if (resonance) {
self.updateValue("resonance", resonance); self.updateValue("resonance", resonance);
} }
return self; return self;
}, },
lpf: function (self: SoundEvent, value: number, resonance?: number) { lpf: function(self: SoundEvent, value: number, resonance?: number) {
self.updateValue("cutoff", value); self.updateValue("cutoff", value);
if (resonance) { if (resonance) {
self.updateValue("resonance", resonance); self.updateValue("resonance", resonance);
} }
return self; return self;
}, },
resonance: function (self: SoundEvent, value: number) { resonance: function(self: SoundEvent, value: number) {
if (value >= 0 && value <= 1) { if (value >= 0 && value <= 1) {
self.updateValue("resonance", 50 * value); self.updateValue("resonance", 50 * value);
} }
return self; return self;
}, },
lpadsr: function ( lpq: function(self: SoundEvent, value: number) {
if (value >= 0 && value <= 1) {
self.updateValue("resonance", 50 * value);
}
return self;
},
lpadsr: function(
self: SoundEvent, self: SoundEvent,
depth: number, depth: number,
a: number, a: number,
@ -165,7 +171,7 @@ export class SoundEvent extends AudibleEvent {
self.updateValue("lprelease", r); self.updateValue("lprelease", r);
return self; return self;
}, },
lpad: function (self: SoundEvent, depth: number, a: number, d: number) { lpad: function(self: SoundEvent, depth: number, a: number, d: number) {
self.updateValue("lpenv", depth); self.updateValue("lpenv", depth);
self.updateValue("lpattack", a); self.updateValue("lpattack", a);
self.updateValue("lpdecay", d); self.updateValue("lpdecay", d);
@ -178,25 +184,25 @@ export class SoundEvent extends AudibleEvent {
hpdecay: ["hpdecay", "hpd"], hpdecay: ["hpdecay", "hpd"],
hpsustain: ["hpsustain", "hpsus"], hpsustain: ["hpsustain", "hpsus"],
hprelease: ["hprelease", "hpr"], hprelease: ["hprelease", "hpr"],
hcutoff: function (self: SoundEvent, value: number, resonance?: number) { hcutoff: function(self: SoundEvent, value: number, resonance?: number) {
self.updateValue("hcutoff", value); self.updateValue("hcutoff", value);
if (resonance) { if (resonance) {
self.updateValue("hresonance", resonance); self.updateValue("hresonance", resonance);
} }
return self; return self;
}, },
hpf: function (self: SoundEvent, value: number, resonance?: number) { hpf: function(self: SoundEvent, value: number, resonance?: number) {
self.updateValue("hcutoff", value); self.updateValue("hcutoff", value);
if (resonance) { if (resonance) {
self.updateValue("hresonance", resonance); self.updateValue("hresonance", resonance * 50);
} }
return self; return self;
}, },
hpq: function (self: SoundEvent, value: number) { hpq: function(self: SoundEvent, value: number) {
self.updateValue("hresonance", value); self.updateValue("hresonance", value * 50);
return self; return self;
}, },
hpadsr: function ( hpadsr: function(
self: SoundEvent, self: SoundEvent,
depth: number, depth: number,
a: number, a: number,
@ -211,7 +217,7 @@ export class SoundEvent extends AudibleEvent {
self.updateValue("hprelease", r); self.updateValue("hprelease", r);
return self; return self;
}, },
hpad: function (self: SoundEvent, depth: number, a: number, d: number) { hpad: function(self: SoundEvent, depth: number, a: number, d: number) {
self.updateValue("hpenv", depth); self.updateValue("hpenv", depth);
self.updateValue("hpattack", a); self.updateValue("hpattack", a);
self.updateValue("hpdecay", d); self.updateValue("hpdecay", d);
@ -224,14 +230,14 @@ export class SoundEvent extends AudibleEvent {
bpdecay: ["bpdecay", "bpd"], bpdecay: ["bpdecay", "bpd"],
bpsustain: ["bpsustain", "bps"], bpsustain: ["bpsustain", "bps"],
bprelease: ["bprelease", "bpr"], bprelease: ["bprelease", "bpr"],
bandf: function (self: SoundEvent, value: number, resonance?: number) { bandf: function(self: SoundEvent, value: number, resonance?: number) {
self.updateValue("bandf", value); self.updateValue("bandf", value);
if (resonance) { if (resonance) {
self.updateValue("bandq", resonance); self.updateValue("bandq", resonance);
} }
return self; return self;
}, },
bpf: function (self: SoundEvent, value: number, resonance?: number) { bpf: function(self: SoundEvent, value: number, resonance?: number) {
self.updateValue("bandf", value); self.updateValue("bandf", value);
if (resonance) { if (resonance) {
self.updateValue("bandq", resonance); self.updateValue("bandq", resonance);
@ -239,7 +245,7 @@ export class SoundEvent extends AudibleEvent {
return self; return self;
}, },
bandq: ["bandq", "bpq"], bandq: ["bandq", "bpq"],
bpadsr: function ( bpadsr: function(
self: SoundEvent, self: SoundEvent,
depth: number, depth: number,
a: number, a: number,
@ -254,7 +260,7 @@ export class SoundEvent extends AudibleEvent {
self.updateValue("bprelease", r); self.updateValue("bprelease", r);
return self; return self;
}, },
bpad: function (self: SoundEvent, depth: number, a: number, d: number) { bpad: function(self: SoundEvent, depth: number, a: number, d: number) {
self.updateValue("bpenv", depth); self.updateValue("bpenv", depth);
self.updateValue("bpattack", a); self.updateValue("bpattack", a);
self.updateValue("bpdecay", d); self.updateValue("bpdecay", d);
@ -264,7 +270,7 @@ export class SoundEvent extends AudibleEvent {
}, },
vib: ["vib"], vib: ["vib"],
vibmod: ["vibmod"], vibmod: ["vibmod"],
fm: function (self: SoundEvent, value: number | string) { fm: function(self: SoundEvent, value: number | string) {
if (typeof value === "number") { if (typeof value === "number") {
self.values["fmi"] = value; self.values["fmi"] = value;
} else { } else {
@ -280,11 +286,11 @@ export class SoundEvent extends AudibleEvent {
begin: ["begin"], begin: ["begin"],
end: ["end"], end: ["end"],
gain: ["gain"], gain: ["gain"],
dbgain: function (self: SoundEvent, value: number) { dbgain: function(self: SoundEvent, value: number) {
self.updateValue("gain", Math.min(Math.pow(10, value / 20), 10)); self.updateValue("gain", Math.min(Math.pow(10, value / 20), 10));
return self; return self;
}, },
db: function (self: SoundEvent, value: number) { db: function(self: SoundEvent, value: number) {
self.updateValue("gain", Math.min(Math.pow(10, value / 20), 10)); self.updateValue("gain", Math.min(Math.pow(10, value / 20), 10));
return self; return self;
}, },
@ -307,32 +313,32 @@ export class SoundEvent extends AudibleEvent {
roomlp: ["roomlp", "rlp"], roomlp: ["roomlp", "rlp"],
roomdim: ["roomdim", "rdim"], roomdim: ["roomdim", "rdim"],
sound: ["s", "sound"], sound: ["s", "sound"],
size: function (self: SoundEvent, value: number) { size: function(self: SoundEvent, value: number) {
self.updateValue("roomsize", value); self.updateValue("roomsize", value);
return self; return self;
}, },
sz: function (self: SoundEvent, value: number) { sz: function(self: SoundEvent, value: number) {
self.updateValue("roomsize", value); self.updateValue("roomsize", value);
return self; return self;
}, },
comp: ["comp","compressor", "cmp"], comp: ["comp", "compressor", "cmp"],
ratio: function (self: SoundEvent, value: number) { ratio: function(self: SoundEvent, value: number) {
self.updateValue("compressorRatio", value); self.updateValue("compressorRatio", value);
return self; return self;
}, },
knee: function (self: SoundEvent, value: number) { knee: function(self: SoundEvent, value: number) {
self.updateValue("compressorKnee", value); self.updateValue("compressorKnee", value);
return self; return self;
}, },
compAttack: function (self: SoundEvent, value: number) { compAttack: function(self: SoundEvent, value: number) {
self.updateValue("compressorAttack", value); self.updateValue("compressorAttack", value);
return self; return self;
}, },
compRelease: function (self: SoundEvent, value: number) { compRelease: function(self: SoundEvent, value: number) {
self.updateValue("compressorRelease", value); self.updateValue("compressorRelease", value);
return self; return self;
}, },
stretch: function (self: SoundEvent, beat: number) { stretch: function(self: SoundEvent, beat: number) {
self.updateValue("unit", "c"); self.updateValue("unit", "c");
self.updateValue("speed", 1 / beat); self.updateValue("speed", 1 / beat);
self.updateValue("cut", beat); self.updateValue("cut", beat);
@ -404,7 +410,7 @@ export class SoundEvent extends AudibleEvent {
(soundEvent.key || "C4"), (soundEvent.key || "C4"),
(soundEvent.originalPitch || soundEvent.pitch || 0), (soundEvent.originalPitch || soundEvent.pitch || 0),
(soundEvent.parsedScale || soundEvent.scale || "MAJOR"), (soundEvent.parsedScale || soundEvent.scale || "MAJOR"),
(soundEvent.paramOctave || 0)+(soundEvent.addedOctave || 0) (soundEvent.paramOctave || 0) + (soundEvent.addedOctave || 0)
); );
soundEvent.note = resolvedPitchClass.note; soundEvent.note = resolvedPitchClass.note;
soundEvent.freq = midiToFreq(resolvedPitchClass.note); soundEvent.freq = midiToFreq(resolvedPitchClass.note);
@ -439,7 +445,7 @@ export class SoundEvent extends AudibleEvent {
delete filteredEvent.note; delete filteredEvent.note;
} }
superdough( superdough(
filteredEvent, filteredEvent,
this.nudge - this.app.clock.deviation, this.nudge - this.app.clock.deviation,
filteredEvent.dur filteredEvent.dur
); );