kieran-mcauliffe/max-mod-enum
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lfo movement display

Browse Source
This commit is contained in:
Kieran McAuliffe 2024-07-22 11:51:12 +02:00
parent d395e0b66a
commit 108ecd1a1d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modulators.js
View File

@ -21,6 +21,7 @@ function LfoRow(props){
ListItem(e(NumberBox, {onChange:props.setFreq, value:props.freq, step: 0.1}, null)), ListItem(e(NumberBox, {onChange:props.setFreq, value:props.freq, step: 0.1}, null)),
ListItem(e(NumberBox, {onChange:props.setAmp, value:props.amp, step:0.1}, null)), ListItem(e(NumberBox, {onChange:props.setAmp, value:props.amp, step:0.1}, null)),
ListItem(e(NumberBox, {onChange:props.setPhase, value:props.phase, step:0.1}, null)), ListItem(e(NumberBox, {onChange:props.setPhase, value:props.phase, step:0.1}, null)),
ListItem(e("input", {type: 'range', min: 0, max: 1, step: 0.01, readonly: true, id: `slider-${props.djParam}`})),
ListItem(e(Button, {text:'+', onClick: props.addLfo}, null)), ListItem(e(Button, {text:'+', onClick: props.addLfo}, null)),
ListItem(e(Button, {text:'-', onClick: props.removeLfo}, null)) ListItem(e(Button, {text:'-', onClick: props.removeLfo}, null))
); );
@ -32,7 +33,7 @@ function LfoRow(props){
function indexWave(type, phase){ function indexWave(type, phase){
switch (type){ switch (type){
case "Sine": case "Sine":
return (Math.sin(phase * Math.PI * 2)/2) + 1; return (Math.sin(phase * Math.PI * 2) / 2) + 0.5;
case "SawUp": case "SawUp":
return phase; return phase;
case "SawDown": case "SawDown":
@ -52,17 +53,19 @@ function operateModulators(visibleArr, paramNames, centers, freqs, amps, waveTyp
if (centers.hasOwnProperty(name)){ if (centers.hasOwnProperty(name)){
center = centers[name]; center = centers[name];
} }
let output = operateModulator(center, freqs[i], amps[i], waveTypes[i], phaseArr, i, delta); let output = operateModulator(center, freqs[i], amps[i], waveTypes[i], phaseArr, i, delta, name);
window.dispatchEvent(new CustomEvent('enum', {'detail' : [name, output]})); window.dispatchEvent(new CustomEvent('enum', {'detail' : [name, output]}));
} }
} }
} }
function operateModulator(center, freq, amp, waveType, phaseArr, phaseI, delta){ function operateModulator(center, freq, amp, waveType, phaseArr, phaseI, delta, name){
let oldPhase = phaseArr[phaseI]; let oldPhase = phaseArr[phaseI];
let newPhase = (oldPhase + freq * delta) % 1.00; let newPhase = (oldPhase + freq * delta) % 1.00;
let unscaled = indexWave(waveType, newPhase);
document.getElementById(`slider-${name}`).value = unscaled;
phaseArr[phaseI] = newPhase; phaseArr[phaseI] = newPhase;
return indexWave(waveType, newPhase) * amp + center; return unscaled * amp + center;
} }