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

rename controls

Browse source
This commit is contained in:
Jade (Rose) Rowland 2025-09-28 09:19:39 -04:00
parent 91eb50f1c1
commit 23d4bfa9d9
3 changed files with 144 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

162
packages/core/controls.mjs
View file

@ -90,193 +90,191 @@ export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');
/** /**
* Position in the wavetable of the wavetable oscillator * Position in the wavetable of the wavetable oscillator
* *
* @name wtPos * @name wt
* @param {number | Pattern} position Position in the wavetable from 0 to 1 * @param {number | Pattern} position Position in the wavetable from 0 to 1
* @synonyms wavetablePosition * @synonyms wavetablePosition
* @example * @example
* s("squelch").bank("wt_digital").seg(8).note("F1").wtPos("0 0.25 0.5 0.75 1") * s("squelch").bank("wt_digital").seg(8).note("F1").wt("0 0.25 0.5 0.75 1")
*/ */
export const { wtPos, wavetablePosition } = registerControl('wtPos', 'wavetablePosition'); export const { wt, wavetablePosition } = registerControl('wt', 'wavetablePosition');
/**
* Amount of envelope applied wavetable oscillator's position envelope
*
* @name wtenv
* @param {number | Pattern} amount between 0 and 1
*/
export const { wtenv } = registerControl('wtenv');
/** /**
* Attack time of the wavetable oscillator's position envelope * Attack time of the wavetable oscillator's position envelope
* *
* @name wtPosAttack * @name wtattack
* @synonyms wtPosAtt * @synonyms wtatt
* @param {number | Pattern} time attack time in seconds * @param {number | Pattern} time attack time in seconds
*/ */
export const { wtPosAttack, wtPosAtt } = registerControl('wtPosAttack', 'wtPosAtt'); export const { wtattack, wtatt } = registerControl('wtattack', 'wtatt');
/** /**
* Decay time of the wavetable oscillator's position envelope * Decay time of the wavetable oscillator's position envelope
* *
* @name wtPosDecay * @name wtdecay
* @synonyms wtPosDec * @synonyms wtdec
* @param {number | Pattern} time decay time in seconds * @param {number | Pattern} time decay time in seconds
*/ */
export const { wtPosDecay, wtPosDec } = registerControl('wtPosDecay', 'wtPosDec'); export const { wtdecay, wtdec } = registerControl('wtdecay', 'wtdec');
/** /**
* Sustain time of the wavetable oscillator's position envelope * Sustain time of the wavetable oscillator's position envelope
* *
* @name wtPosAttack * @name wtsustain
* @synonyms wtPosSus * @synonyms wtsus
* @param {number | Pattern} gain sustain level (0 to 1) * @param {number | Pattern} gain sustain level (0 to 1)
*/ */
export const { wtPosSustain, wtPosSus } = registerControl('wtPosSustain', 'wtPosSus'); export const { wtsustain, wtsus } = registerControl('wtsustain', 'wtsus');
/** /**
* Release time of the wavetable oscillator's position envelope * Release time of the wavetable oscillator's position envelope
* *
* @name wtPosRelease * @name wtrelease
* @synonyms wtPosRel * @synonyms wtrel
* @param {number | Pattern} time release time in seconds * @param {number | Pattern} time release time in seconds
*/ */
export const { wtPosRelease, wtPosRel } = registerControl('wtPosRelease', 'wtPosRel'); export const { wtrelease, wtrel } = registerControl('wtrelease', 'wtrel');
/** /**
* Rate of the LFO for the wavetable oscillator's position * Rate of the LFO for the wavetable oscillator's position
* *
* @name wtPosRate * @name wtrate
* @param {number | Pattern} rate rate in hertz * @param {number | Pattern} rate rate in hertz
*/ */
export const { wtPosRate } = registerControl('wtPosRate'); export const { wtrate } = registerControl('wtrate');
/**
* cycle synced rate of the LFO for the wavetable oscillator's position
*
* @name wtsync
* @param {number | Pattern} rate rate in cycles
*/
export const { wtsync } = registerControl('wtsync');
/** /**
* Depth of the LFO for the wavetable oscillator's position * Depth of the LFO for the wavetable oscillator's position
* *
* @name wtPosDepth * @name wtdepth
* @param {number | Pattern} depth depth of modulation * @param {number | Pattern} depth depth of modulation
*/ */
export const { wtPosDepth } = registerControl('wtPosDepth'); export const { wtdepth } = registerControl('wtdepth');
/**
* Whether to sync the LFO for the wavetable oscillator's position
*
* @name wtPosSynced
* @param {number | Pattern} synced Whether to sync the lfo to CPM. > 0.5 will be synced
*/
export const { wtPosSynced } = registerControl('wtPosSynced');
/** /**
* Shape of the LFO for the wavetable oscillator's position * Shape of the LFO for the wavetable oscillator's position
* *
* @name wtPosShape * @name wtshape
* @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..) * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
*/ */
export const { wtPosShape } = registerControl('wtPosShape'); export const { wtshape } = registerControl('wtshape');
/** /**
* DC offset of the LFO for the wavetable oscillator's position * DC offset of the LFO for the wavetable oscillator's position
* *
* @name wtPosDCOffset * @name wtdc
* @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
*/ */
export const { wtPosDCOffset } = registerControl('wtPosDCOffset'); export const { wtdc } = registerControl('wtdc');
/** /**
* Skew of the LFO for the wavetable oscillator's position * Skew of the LFO for the wavetable oscillator's position
* *
* @name wtPosSkew * @name wtskew
* @param {number | Pattern} skew How much to bend the LFO shape * @param {number | Pattern} skew How much to bend the LFO shape
*/ */
export const { wtPosSkew } = registerControl('wtPosSkew'); export const { wtskew } = registerControl('wtskew');
/** /**
* Amount of warp (alteration of the waveform) to apply to the wavetable oscillator * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator
* *
* @name wtWarp * @name warp
* @param {number | Pattern} amount Warp of the wavetable from 0 to 1 * @param {number | Pattern} amount Warp of the wavetable from 0 to 1
* @synonyms wavetableWarp * @synonyms wavetableWarp
* @example * @example
* s("basique").bank("wt_digital").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1") * s("basique").bank("wt_digital").seg(8).note("F1").warp("0 0.25 0.5 0.75 1")
* .wtWarpMode("spin") * .warpmode("spin")
*/ */
export const { wtWarp, wavetableWarp } = registerControl('wtWarp', 'wavetableWarp'); export const { warp, wavetableWarp } = registerControl('warp', 'wavetableWarp');
/** /**
* Attack time of the wavetable oscillator's warp envelope * Attack time of the wavetable oscillator's warp envelope
* *
* @name wtWarpAttack * @name warpattack
* @synonyms wtWarpAtt * @synonyms warpatt
* @param {number | Pattern} time attack time in seconds * @param {number | Pattern} time attack time in seconds
*/ */
export const { wtWarpAttack, wtWarpAtt } = registerControl('wtWarpAttack', 'wtWarpAtt'); export const { warpattack, warpatt } = registerControl('warpattack', 'warpatt');
/** /**
* Decay time of the wavetable oscillator's warp envelope * Decay time of the wavetable oscillator's warp envelope
* *
* @name wtWarpDecay * @name warpdecay
* @synonyms wtWarpDec * @synonyms warpdec
* @param {number | Pattern} time decay time in seconds * @param {number | Pattern} time decay time in seconds
*/ */
export const { wtWarpDecay, wtWarpDec } = registerControl('wtWarpDecay', 'wtWarpDec'); export const { warpdecay, warpdec } = registerControl('warpdecay', 'warpdec');
/** /**
* Sustain time of the wavetable oscillator's warp envelope * Sustain time of the wavetable oscillator's warp envelope
* *
* @name wtWarpAttack * @name warpsustain
* @synonyms wtWarpSus * @synonyms warpsus
* @param {number | Pattern} gain sustain level (0 to 1) * @param {number | Pattern} gain sustain level (0 to 1)
*/ */
export const { wtWarpSustain, wtWarpSus } = registerControl('wtWarpSustain', 'wtWarpSus'); export const { warpsustain, warpsus } = registerControl('warpsustain', 'warpsus');
/** /**
* Release time of the wavetable oscillator's warp envelope * Release time of the wavetable oscillator's warp envelope
* *
* @name wtWarpRelease * @name warprelease
* @synonyms wtWarpRel * @synonyms warprel
* @param {number | Pattern} time release time in seconds * @param {number | Pattern} time release time in seconds
*/ */
export const { wtWarpRelease, wtWarpRel } = registerControl('wtWarpRelease', 'wtWarpRel'); export const { warprelease, warprel } = registerControl('warprelease', 'warprel');
/** /**
* Rate of the LFO for the wavetable oscillator's warp * Rate of the LFO for the wavetable oscillator's warp
* *
* @name wtWarpRate * @name warprate
* @param {number | Pattern} rate rate in hertz * @param {number | Pattern} rate rate in hertz
*/ */
export const { wtWarpRate } = registerControl('wtWarpRate'); export const { warprate } = registerControl('warprate');
/** /**
* Depth of the LFO for the wavetable oscillator's warp * Depth of the LFO for the wavetable oscillator's warp
* *
* @name wtWarpDepth * @name warpdepth
* @param {number | Pattern} depth depth of modulation * @param {number | Pattern} depth depth of modulation
*/ */
export const { wtWarpDepth } = registerControl('wtWarpDepth'); export const { warpdepth } = registerControl('warpdepth');
/**
* Whether to sync the LFO for the wavetable oscillator's warp
*
* @name wtWarpSynced
* @param {number | Pattern} synced Whether to sync the lfo to CPM. > 0.5 will be synced
*/
export const { wtWarpSynced } = registerControl('wtWarpSynced');
/** /**
* Shape of the LFO for the wavetable oscillator's warp * Shape of the LFO for the wavetable oscillator's warp
* *
* @name wtWarpShape * @name warpshape
* @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..) * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
*/ */
export const { wtWarpShape } = registerControl('wtWarpShape'); export const { warpshape } = registerControl('warpshape');
/** /**
* DC offset of the LFO for the wavetable oscillator's warp * DC offset of the LFO for the wavetable oscillator's warp
* *
* @name wtWarpDCOffset * @name warpdc
* @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
*/ */
export const { wtWarpDCOffset } = registerControl('wtWarpDCOffset'); export const { warpdc } = registerControl('warpdc');
/** /**
* Skew of the LFO for the wavetable oscillator's warp * Skew of the LFO for the wavetable oscillator's warp
* *
* @name wtWarpSkew * @name warpskew
* @param {number | Pattern} skew How much to bend the LFO shape * @param {number | Pattern} skew How much to bend the LFO shape
*/ */
export const { wtWarpSkew } = registerControl('wtWarpSkew'); export const { warpskew } = registerControl('warpskew');
/** /**
* Type of warp (alteration of the waveform) to apply to the wavetable oscillator. * Type of warp (alteration of the waveform) to apply to the wavetable oscillator.
@ -284,27 +282,43 @@ export const { wtWarpSkew } = registerControl('wtWarpSkew');
* The current options are: none, asym, bendp, bendm, bendmp, sync, quant, fold, pwm, orbit, * The current options are: none, asym, bendp, bendm, bendmp, sync, quant, fold, pwm, orbit,
* spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip * spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip
* *
* @name wtWarpMode * @name warpmode
* @param {number | string | Pattern} mode Warp mode * @param {number | string | Pattern} mode Warp mode
* @synonyms wavetableWarpMode * @synonyms wavetableWarpMode
* @example * @example
* s("morgana").bank("wt_digital").seg(8).note("F1").wtWarp("0 0.25 0.5 0.75 1") * s("morgana").bank("wt_digital").seg(8).note("F1").warp("0 0.25 0.5 0.75 1")
* .wtWarpMode("<asym bendp spin logistic sync wormhole brownian>*2") * .warpmode("<asym bendp spin logistic sync wormhole brownian>*2")
* *
*/ */
export const { wtWarpMode, wavetableWarpMode } = registerControl('wtWarpMode', 'wavetableWarpMode'); export const { warpmode, wavetableWarpMode } = registerControl('warpmode', 'wavetableWarpMode');
/** /**
* Amount of randomness of the initial phase of the wavetable oscillator. * Amount of randomness of the initial phase of the wavetable oscillator.
* *
* @name wtPhaseRand * @name wtphaserand
* @param {number | Pattern} amount Randomness of the initial phase. Between 0 (not random) and 1 (fully random) * @param {number | Pattern} amount Randomness of the initial phase. Between 0 (not random) and 1 (fully random)
* @synonyms wavetablePhaseRand * @synonyms wavetablePhaseRand
* @example * @example
* s("basique").bank("wt_digital").seg(16).wtPhaseRand("<0 1>") * s("basique").bank("wt_digital").seg(16).wtphaserand("<0 1>")
* *
*/ */
export const { wtPhaseRand, wavetablePhaseRand } = registerControl('wtPhaseRand', 'wavetablePhaseRand'); export const { wtphaserand, wavetablePhaseRand } = registerControl('wtphaserand', 'wavetablePhaseRand');
/**
* Amount of envelope applied wavetable oscillator's position envelope
*
* @name warpenv
* @param {number | Pattern} amount between 0 and 1
*/
export const { warpenv } = registerControl('warpenv');
/**
* cycle synced rate of the LFO for the wavetable warp position
*
* @name warpsync
* @param {number | Pattern} rate rate in cycles
*/
export const { warpsync } = registerControl('warpsync');
/** /**
* Define a custom webaudio node to use as a sound source. * Define a custom webaudio node to use as a sound source.

2
packages/superdough/superdough.mjs
View file

@ -555,7 +555,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
audioNodes.forEach((n) => n?.disconnect()); audioNodes.forEach((n) => n?.disconnect());
activeSoundSources.delete(chainID); activeSoundSources.delete(chainID);
}; };
const soundHandle = await onTrigger(t, value, onEnded); const soundHandle = await onTrigger(t, value, onEnded, cps);
if (soundHandle) { if (soundHandle) {
sourceNode = soundHandle.node; sourceNode = soundHandle.node;

88
packages/superdough/wavetable.mjs
View file

@ -14,7 +14,7 @@ import {
import { logger } from './logger.mjs'; import { logger } from './logger.mjs';
const WT_MAX_MIP_LEVELS = 6; const WT_MAX_MIP_LEVELS = 6;
export const WarpMode = Object.freeze({ export const Warpmode = Object.freeze({
NONE: 0, NONE: 0,
ASYM: 1, ASYM: 1,
MIRROR: 2, MIRROR: 2,
@ -177,11 +177,17 @@ const _processTables = (json, baseUrl, frameLen, options = {}) => {
}; };
export function registerWaveTable(key, tables, params) { export function registerWaveTable(key, tables, params) {
registerSound(key, (t, hapValue, onended) => onTriggerSynth(t, hapValue, onended, tables, params?.frameLen ?? 2048), { registerSound(
type: 'wavetable', key,
tables, (t, hapValue, onended, cps) => {
...params, return onTriggerSynth(t, hapValue, onended, tables, cps, params?.frameLen ?? 2048);
}); },
{
type: 'wavetable',
tables,
...params,
},
);
} }
/** /**
@ -214,13 +220,13 @@ export const tables = async (url, frameLen, json, options = {}) => {
}); });
}; };
export async function onTriggerSynth(t, value, onended, tables, frameLen) { export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
const { s, n = 0, duration } = value; const { s, n = 0, duration, wtenv } = value;
const ac = getAudioContext(); const ac = getAudioContext();
const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]); const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
let { wtWarpMode } = value; let { warpmode } = value;
if (typeof wtWarpMode === 'string') { if (typeof warpmode === 'string') {
wtWarpMode = WarpMode[wtWarpMode.toUpperCase()] ?? WarpMode.NONE; warpmode = Warpmode[warpmode.toUpperCase()] ?? Warpmode.NONE;
} }
const frequency = getFrequencyFromValue(value); const frequency = getFrequencyFromValue(value);
const { url, label } = getCommonSampleInfo(value, tables); const { url, label } = getCommonSampleInfo(value, tables);
@ -236,12 +242,12 @@ export async function onTriggerSynth(t, value, onended, tables, frameLen) {
end: envEnd, end: envEnd,
frequency, frequency,
detune: value.detune, detune: value.detune,
position: value.wtPos, position: value.wt,
warp: value.wtWarp, warp: value.warp,
warpMode: wtWarpMode, warpMode: warpmode,
voices: value.unison, voices: value.unison,
spread: value.spread, spread: value.spread,
phaserand: value.wtPhaseRand, phaserand: (value.wtphaserand ?? value.unison > 1) ? 1 : 0,
}, },
{ outputChannelCount: [2] }, { outputChannelCount: [2] },
); );
@ -250,36 +256,52 @@ export async function onTriggerSynth(t, value, onended, tables, frameLen) {
logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight'); logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
return; return;
} }
const posADSRParams = [value.wtPosAttack, value.wtPosDecay, value.wtPosSustain, value.wtPosRelease]; const posADSRParams = [value.wtattack, value.wtdecay, value.wtsustain, value.wtrelease];
const warpADSRParams = [value.wtPosAttack, value.wtPosDecay, value.wtPosSustain, value.wtPosRelease]; const warpADSRParams = [value.warpattack, value.warpdecay, value.warpsustain, value.warprelease];
const wtParams = source.parameters; const wtParams = source.parameters;
const positionParam = wtParams.get('position'); const positionParam = wtParams.get('position');
const warpParam = wtParams.get('warp'); const warpParam = wtParams.get('warp');
let posLFO; let posLFO;
if (posADSRParams.some((p) => p !== undefined)) { if ([wtenv, ...posADSRParams].some((p) => p !== undefined)) {
const [pAttack, pDecay, pSustain, pRelease] = getADSRValues(posADSRParams); const [pAttack, pDecay, pSustain, pRelease] = getADSRValues(posADSRParams, 'linear', [0, 0.5, 0, 0.1]);
getParamADSR(positionParam, pAttack, pDecay, pSustain, pRelease, 0, 1, t, holdEnd, 'linear'); const min = value.wt ?? 0;
} else { const max = (wtenv ?? 0.5) + min;
getParamADSR(positionParam, pAttack, pDecay, pSustain, pRelease, min, max, t, holdEnd, 'linear');
}
let wtrate = value.wtrate;
if (value.wtsync != null) {
wtrate = wtrate = cps * value.wtsync;
}
if ([wtrate, value.wtdepth, value.wtshape, value.wtskew, value.wtdc].some((p) => p != null)) {
const posLFO = getLfo(ac, t, endWithRelease, { const posLFO = getLfo(ac, t, endWithRelease, {
frequency: value.wtPosRate, frequency: wtrate,
depth: value.wtPosDepth, depth: value.wtdepth ?? 0.5,
shape: value.wtPosShape, shape: value.wtshape,
skew: value.wtPosSkew, skew: value.wtskew,
dcoffset: value.wtPosDCOffset ?? 0, dcoffset: value.wtdc ?? 0,
}); });
posLFO.connect(positionParam); posLFO.connect(positionParam);
} }
let warpLFO; let warpLFO;
if (posADSRParams.some((p) => p !== undefined)) { if (posADSRParams.some((p) => p !== undefined)) {
const [wAttack, wDecay, wSustain, wRelease] = getADSRValues(warpADSRParams); const [wAttack, wDecay, wSustain, wRelease] = getADSRValues(warpADSRParams);
getParamADSR(warpParam, wAttack, wDecay, wSustain, wRelease, 0, 1, t, holdEnd, 'linear'); const min = value.warp ?? 0;
} else { const max = (value.warpenv ?? 0.5) + min;
getParamADSR(warpParam, wAttack, wDecay, wSustain, wRelease, min, max, t, holdEnd, 'linear', [0, 0.5, 0, 0.1]);
}
let warprate = value.warprate;
if (value.warpsync != null) {
console.info(value.warpsync);
warprate = warprate = cps * value.warpsync;
}
if ([warprate, value.warpdepth, value.warpshape, value.warpskew, value.warpdc].some((p) => p != null)) {
const warpLFO = getLfo(ac, t, endWithRelease, { const warpLFO = getLfo(ac, t, endWithRelease, {
frequency: value.wtWarpRate, frequency: warprate,
depth: value.wtWarpDepth, depth: value.warpdepth ?? 0.5,
shape: value.wtWarpShape, shape: value.warpshape,
skew: value.wtWarpSkew, skew: value.warpskew,
dcoffset: value.wtWarpDCOffset ?? 0, dcoffset: value.warpdc ?? 0,
}); });
warpLFO.connect(warpParam); warpLFO.connect(warpParam);
} }