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

codeformat

Browse source
This commit is contained in:
Felix Roos 2023-10-03 08:51:35 +02:00
parent 83dfbb84c2
commit 1e352fdf80
2 changed files with 111 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

41
packages/superdough/synth.mjs
View file

@ -20,11 +20,8 @@ const fm = (osc, harmonicityRatio, modulationIndex, wave = 'sine') => {
return mod(modfreq, modgain, wave); return mod(modfreq, modgain, wave);
}; };
export function registerSynthSounds() { export function registerSynthSounds() {
['sine', 'square', 'triangle', ['sine', 'square', 'triangle', 'sawtooth', 'pink', 'white', 'brown'].forEach((wave) => {
'sawtooth', 'pink', 'white',
'brown'].forEach((wave) => {
registerSound( registerSound(
wave, wave,
(t, value, onended) => { (t, value, onended) => {
@ -59,7 +56,11 @@ export function registerSynthSounds() {
} }
// maybe pull out the above frequency resolution?? (there is also getFrequency but it has no default) // maybe pull out the above frequency resolution?? (there is also getFrequency but it has no default)
// make oscillator // make oscillator
const { node: o, stop, dry_node = null } = getOscillator({ const {
node: o,
stop,
dry_node = null,
} = getOscillator({
t, t,
s: wave, s: wave,
freq, freq,
@ -71,7 +72,12 @@ export function registerSynthSounds() {
// FM + FM envelope // FM + FM envelope
let stopFm, fmEnvelope; let stopFm, fmEnvelope;
if (fmModulationIndex) { if (fmModulationIndex) {
const { node: modulator, stop } = fm(dry_node !== null ? dry_node : o, fmHarmonicity, fmModulationIndex, fmWaveform); const { node: modulator, stop } = fm(
dry_node !== null ? dry_node : o,
fmHarmonicity,
fmModulationIndex,
fmWaveform,
);
if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].find((v) => v !== undefined)) { if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].find((v) => v !== undefined)) {
// no envelope by default // no envelope by default
modulator.connect(dry_node !== null ? dry_node.frequency : o.frequency); modulator.connect(dry_node !== null ? dry_node.frequency : o.frequency);
@ -163,16 +169,16 @@ export function getNoiseOscillator({ t, ac, type = 'white' }) {
output[i] = Math.random() * 2 - 1; output[i] = Math.random() * 2 - 1;
} else if (type === 'brown') { } else if (type === 'brown') {
let white = Math.random() * 2 - 1; let white = Math.random() * 2 - 1;
output[i] = (lastOut + (0.02 * white)) / 1.02; output[i] = (lastOut + 0.02 * white) / 1.02;
lastOut = output[i]; lastOut = output[i];
} else if (type === 'pink') { } else if (type === 'pink') {
let white = Math.random() * 2 - 1; let white = Math.random() * 2 - 1;
b0 = 0.99886 * b0 + white * 0.0555179; b0 = 0.99886 * b0 + white * 0.0555179;
b1 = 0.99332 * b1 + white * 0.0750759; b1 = 0.99332 * b1 + white * 0.0750759;
b2 = 0.96900 * b2 + white * 0.1538520; b2 = 0.969 * b2 + white * 0.153852;
b3 = 0.86650 * b3 + white * 0.3104856; b3 = 0.8665 * b3 + white * 0.3104856;
b4 = 0.55000 * b4 + white * 0.5329522; b4 = 0.55 * b4 + white * 0.5329522;
b5 = -0.7616 * b5 - white * 0.0168980; b5 = -0.7616 * b5 - white * 0.016898;
output[i] = b0 + b1 + b2 + b3 + b4 + b5 + b6 + white * 0.5362; output[i] = b0 + b1 + b2 + b3 + b4 + b5 + b6 + white * 0.5362;
output[i] *= 0.11; output[i] *= 0.11;
b6 = white * 0.115926; b6 = white * 0.115926;
@ -186,7 +192,7 @@ export function getNoiseOscillator({ t, ac, type = 'white' }) {
return { return {
node: o, node: o,
stop: (time) => o.stop(time) stop: (time) => o.stop(time),
}; };
} }
@ -196,11 +202,11 @@ export function getOscillator({ s, freq, t, vib, vibmod, partials, noise }) {
let o; let o;
if (['pink', 'white', 'brown'].includes(s)) { if (['pink', 'white', 'brown'].includes(s)) {
let noiseOscillator = getNoiseOscillator({ t: t, ac: getAudioContext(), type: s }) let noiseOscillator = getNoiseOscillator({ t: t, ac: getAudioContext(), type: s });
return { return {
node: noiseOscillator.node, node: noiseOscillator.node,
stop: noiseOscillator.stop stop: noiseOscillator.stop,
} };
} else { } else {
if (!partials || s === 'sine') { if (!partials || s === 'sine') {
o = getAudioContext().createOscillator(); o = getAudioContext().createOscillator();
@ -249,8 +255,8 @@ export function getOscillator({ s, freq, t, vib, vibmod, partials, noise }) {
vibrato_oscillator?.stop(time); vibrato_oscillator?.stop(time);
o.stop(time); o.stop(time);
noiseOscillator.stop(time); noiseOscillator.stop(time);
} },
} };
} }
return { return {
@ -262,4 +268,3 @@ export function getOscillator({ s, freq, t, vib, vibmod, partials, noise }) {
}; };
} }
} }

5
website/src/pages/learn/synths.mdx
View file

@ -35,10 +35,7 @@ flavours of noise, here written from hard to soft.
Some amount of pink noise can also be added to any oscillator by using the `noise` paremeter: Some amount of pink noise can also be added to any oscillator by using the `noise` paremeter:
<MiniRepl <MiniRepl client:idle tune={`note("c3").noise("<0.1 0.25 0.5>").scope()`} />
client:idle
tune={`note("c3").noise("<0.1 0.25 0.5>").scope()`}
/>
### Additive Synthesis ### Additive Synthesis