nn-communication #7

Merged
kieran-mcauliffe merged 4 commits from nn-communication into main 2024-10-22 11:00:25 +02:00
Showing only changes of commit a35fecafae - Show all commits

View File

@ -258,19 +258,29 @@ function MasterLfoHandler(){
} }
function setNN(event){ function setNN(event){
for (let i=0; i<MAXLFOS; i++){ for (let i=0; i<MAXLFOS; i++){
freqArr[i] = nnFreqToHzString(event.detail[i]); freqArr[i] = nnFreqToHzString(event.detail[i]);
} }
setFreqArr(freqArr)
for (let i=MAXLFOS; i<MAXLFOS * 2; i++){ for (let i=MAXLFOS; i<MAXLFOS * 2; i++){
freqArr[i] = nnFreqToHzString(event.detail[i]); minArr[i - MAXLFOS] = event.detail[i];
} }
setMinArr(minArr);
for (let i=MAXLFOS; i<MAXLFOS * 2; i++){ for (let i=MAXLFOS*2; i<MAXLFOS * 3; i++){
freqArr[i] = nnFreqToHzString(event.detail[i]); maxArr[i - MAXLFOS*2] = event.detail[i];
} }
setMaxArr(maxArr);
for (let i=MAXLFOS*3; i<MAXLFOS * 4; i++){
initPhaseArr[i - MAXLFOS*3] = parseFloat(event.detail[i]);
}
setInitPhaseArr(initPhaseArr);
rerender(!render); // BAD! SHOULD NOT BE DOING THIS!
} }
function dumpNN(event){ function dumpNN(event){
@ -280,7 +290,8 @@ function MasterLfoHandler(){
}); });
allNNData = allNNData.concat(minArr); allNNData = allNNData.concat(minArr);
allNNData = allNNData.concat(maxArr); allNNData = allNNData.concat(maxArr);
window.max.outlet("NNdata " + allNNData) allNNData = allNNData.concat(initPhaseArr);
window.max.outlet("NNdata " + allNNData.join(" "));
} }
@ -382,8 +393,6 @@ function MasterLfoHandler(){
for (var j = 0; j < allModArrays.length; j++){ // no space below, easy. for (var j = 0; j < allModArrays.length; j++){ // no space below, easy.
let array = allModArrays[j]; let array = allModArrays[j];
array[id + 1] = modBlankVals[j]; array[id + 1] = modBlankVals[j];
log(j);
log(allModArrays.length);
allModSetters[j](array); allModSetters[j](array);
} }
} }
@ -548,12 +557,6 @@ if (!DEBUG){
window.dispatchEvent(new CustomEvent('userWave', {'detail' : points})); window.dispatchEvent(new CustomEvent('userWave', {'detail' : points}));
}); });
/* window.max.binInlet("userWave", (...points) => {
window.dispatchEvent(new CustomEvent('userWave', {'detail' : [points]}));
log("received user points");
}); */
setInterval(() => { setInterval(() => {
window.dispatchEvent(new CustomEvent('tick')); window.dispatchEvent(new CustomEvent('tick'));
}, 200); }, 200);