debug function waves works now

Reviewed-on: #8

.gitignore

@@ -0,0 +1 @@
+.DS_Store

common.js

@@ -5,7 +5,8 @@ function isNumeric(str) {
   }
 
 function DropDown(props) {
-    return e('select', {type: "number", onChange: props.onChange, value: props.value}, 
+    let className = props.locked ? 'locked-component' : '';
+    return e('select', {className, type: "number", onChange: props.onChange, value: props.value}, 
         ...props.options.map((item) => Option(item)));
 }
 
@@ -18,11 +19,13 @@ function Label(text){
 }
 
 function NumberBox(props){
-    return e('input', {type: "number", onChange: props.onChange, step: props.step, value: props.value, className: props.className}, null);
+    let extraClassName = props.locked ? ' locked-component' : '';
+    return e('input', {type: "number", onChange: props.onChange, step: props.step, value: props.value, className: props.className + extraClassName}, null);
 }
 
 function TextBox(props){
-    return e('input', {type: "text", value: props.value, onChange: props.onChange, id: props.id});
+    let className = props.locked ? 'locked-component' : '';
+    return e('input', {className, type: "text", value: props.value, onChange: props.onChange, id: props.id});
 }
 
 function Option(str, value){
@@ -30,7 +33,8 @@ function Option(str, value){
 }
 
 function Button(props){
-    return e('button', {onClick: props.onClick}, props.text);
+    let className = props.locked ? 'locked-component' : '';
+    return e('button', {onClick: props.onClick, className}, props.text);
 }
 
 function Switch(props){
@@ -45,6 +49,10 @@ function CreateParamChanger(arr, setArr, index, postCB=() => {}, preCB=(val) =>
         newArr[index] = preCB(event.target.value);
         setArr(newArr);
         postCB();
+        setTimeout(() => {
+            window.dispatchEvent(new CustomEvent('saveDict', {'detail' : "localStorage"}));
+        }, 50)
+        
         log(`${index} ${event.target.value}`);
     }
 }
@@ -56,6 +64,9 @@ function CreateMatrixParamChanger(matrix, setMatrix, i, j){
         });
         newMatrix[i][j] = event.target.value;
         setMatrix(newMatrix);
+        setTimeout(() => {
+            window.dispatchEvent(new CustomEvent('saveDict', {'detail' : "localStorage"}));
+        }, 50)
         log(`${i}, ${j} ${event.target.value}`);
         
     }

enums.js

@@ -5,13 +5,13 @@
 
 
 // NOT A REACT FUNCTIONAL COMPONENT.  MERELY RETURNS AN ARRAY WHICH IS UNPACKED
-function EnumeratorItems(index, enumBreakPoints, setEnumBreakPoints, enumNames, setEnumNames, djParam){
+function EnumeratorItems(index, enumBreakPoints, setEnumBreakPoints, enumNames, setEnumNames, djParam, locked){
     let items = [];
     for (let i = 0; i < MAXENUMPOINTS; i++){
         
-        items.push(ListItem(e(TextBox, {onChange: CreateMatrixParamChanger(enumNames, setEnumNames, index, i), value: enumNames[index][i], id:`text-${djParam}-${enumNames[index][i]}`}, null)));
+        items.push(ListItem(e(TextBox, {locked, onChange: CreateMatrixParamChanger(enumNames, setEnumNames, index, i), value: enumNames[index][i], id:`text-${djParam}-${enumNames[index][i]}`}, null)));
         // Add 1 to make up for the lower enum bound
-        items.push(ListItem(e(NumberBox, {onChange: CreateMatrixParamChanger(enumBreakPoints, setEnumBreakPoints, index, i + 1), value:enumBreakPoints[index][i + 1]}, null)));
+        items.push(ListItem(e(NumberBox, {locked, onChange: CreateMatrixParamChanger(enumBreakPoints, setEnumBreakPoints, index, i + 1), value:enumBreakPoints[index][i + 1]}, null)));
     }
     return items;
 }
@@ -20,13 +20,13 @@ function EnumeratorRow(props){
     let linkedText = props.linked ? "<- mods" : "";
 
     let content = e('ul', {className: 'lfo-item', id: `${props.djParam}-enum-row`},
-        ListItem(DropDown({onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})), 
+        ListItem(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})), 
-        ListItem(DropDown({onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
+        ListItem(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
-        ListItem(e(NumberBox, {onChange: props.setEnumItemCounts, step:1, value:props.enumItems, className: 'enum-count'}, null)),
+        ListItem(e(NumberBox, {locked:props.locked, onChange: props.setEnumItemCounts, step:1, value:props.enumItems, className: 'enum-count'}, null)),
-        ListItem(e(NumberBox, {onChange: CreateMatrixParamChanger(props.enumBreakPoints, props.setEnumBreakPoints, props.index, 0), value:props.enumBreakPoints[props.index][0], step:0.1}, null)),
+        ListItem(e(NumberBox, {locked:props.locked, onChange: CreateMatrixParamChanger(props.enumBreakPoints, props.setEnumBreakPoints, props.index, 0), value:props.enumBreakPoints[props.index][0], step:0.1}, null)),
-        ...(EnumeratorItems(props.index, props.enumBreakPoints, props.setEnumBreakPoints, props.enumNames, props.setEnumNames, props.djParam).slice(0, props.enumItems * 2)),
+        ...(EnumeratorItems(props.index, props.enumBreakPoints, props.setEnumBreakPoints, props.enumNames, props.setEnumNames, props.djParam, props.locked).slice(0, props.enumItems * 2)),
-        ListItem(e(Button, {text:'+', onClick: props.addEnum}, null)), 
+        ListItem(e(Button, {locked:props.locked, text:'+', onClick: props.addEnum}, null)), 
-        ListItem(e(Button, {text:'-', onClick: props.removeEnum}, null)),
+        ListItem(e(Button, {locked:props.locked, text:'-', onClick: props.removeEnum}, null)),
         ListItem(e("div", {className:"linked"}, linkedText))
     );
     if (props.visible){

lfogui.css

@@ -1,5 +1,9 @@
-html,
+* {
-    body {
+  --locked-color: #5fadbf;
+  --unlocked-color: #ff5153;
+}
+
+html, body {
   width: 100%;
   height: 100%;
   margin: 0px;
@@ -179,3 +183,90 @@ html,
 #pulse {
   animation: pulse-animation 0.2s normal;
 }
+
+/* :::::::::::::: LOCK CSS */
+
+.locked-component {
+  pointer-events: none;
+  background-color: #333333;
+  color : white;
+}
+
+.container {
+  display: flex;
+  width: 100%;
+  justify-content: space-between;
+}
+
+/* Locked */
+.lock {
+  margin-top: 14px;
+  width: 24px;
+  height: 21px;
+  border: 3px solid var(--locked-color);
+  border-radius: 5px;
+  position: relative;
+  cursor: pointer;
+  -webkit-transition: all 0.1s ease-in-out;
+  transition: all 0.1s ease-in-out;
+}
+.lock:after {
+  content: "";
+  display: block;
+  background: var(--locked-color);
+  width: 3px;
+  height: 7px;
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  margin: -3.5px 0 0 -2px;
+  -webkit-transition: all 0.1s ease-in-out;
+  transition: all 0.1s ease-in-out;
+}
+.lock:before {
+  content: "";
+  display: block;
+  width: 10px;
+  height: 10px;
+  bottom: 100%;
+  position: absolute;
+  left: 50%;
+  margin-left: -8px;
+  border: 3px solid var(--locked-color);
+  border-top-right-radius: 50%;
+  border-top-left-radius: 50%;
+  border-bottom: 0;
+  -webkit-transition: all 0.1s ease-in-out;
+  transition: all 0.1s ease-in-out;
+}
+/* Locked Hover */
+.lock:hover:before {
+  height: 12px;
+}
+/* Unlocked */
+.unlocked {
+  transform: rotate(10deg);
+}
+.unlocked:before {
+  bottom: 130%;
+  left: 31%;
+  margin-left: -11.5px;
+  transform: rotate(-45deg);
+}
+.unlocked,
+.unlocked:before {
+  border-color: var(--unlocked-color);
+}
+.unlocked:after {
+  background: var(--unlocked-color);
+}
+/* Unlocked Hover */
+.unlocked:hover {
+  transform: rotate(3deg);
+}
+.unlocked:hover:before {
+  height: 10px;
+  left: 40%;
+  bottom: 124%;
+  transform: rotate(-30deg);
+}

lfogui.js

@@ -12,6 +12,7 @@ let lfos = [];
 const MAXLFOS = 20;
 const MAXENUMS = 20;
 const MAXENUMPOINTS = 10;
+const MAXUSERDEFINED = 4;
 
 
 
@@ -20,6 +21,11 @@ const ViewModes = Object.freeze({
     ENUM:  1
 });
 
+const LockModes = Object.freeze({
+    UNLOCK:   0,
+    LOCK:  1
+});
+
 
 var modPhases = Array(MAXLFOS).fill(0);
 var firstUpdateTime = Date.now();
@@ -28,10 +34,33 @@ const MODULATORLABELS = ["inst", "-type-", "---shape---", "-------param-------",
 const ENUMERATORLABELS = ["inst", "---parameter---", "-# points-"];
 
 
+function parseLfoTimeNonMusical(lfoTime){
+    if (lfoTime.slice(-2) == "hz"){
+        return parseFloat(lfoTime.slice(0, -2));
+    }
+    else if (lfoTime.slice(-2) == "ms"){
+        return 1000 / parseFloat(lfoTime.slice(0, -2));
+    }
+    else if (lfoTime.slice(-1) == "s"){
+        return 1 / parseFloat(lfoTime.slice(0, -1));
+    }
+    else if ((lfoTime.match(/:/g) || []).length == 2){
+        return 1 / moment.duration(lfoTime).asSeconds();
+    }
+    else if ((lfoTime.match(/\./g) || []).length == 2){
+        return 0; // ignore musical timings
+    }
+    else {
+        return 0;
+    }
+}
+
+function nnFreqToHzString(num){
+    return `${num}hz`;
+}
 
 
 function MasterLfoHandler(){
-
     let initVisArr = Array(MAXLFOS).fill(false);
     initVisArr[0] = true;
 
@@ -43,16 +72,36 @@ function MasterLfoHandler(){
             setViewMode(ViewModes.MOD);
     };
 
-    /// MODULATOR ARRAYS
+    const [lockMode, setLockMode] = React.useState(LockModes.LOCK);
+    const toggleLockMode = () => {
+        if (lockMode === LockModes.UNLOCK)
+            setLockMode(LockModes.LOCK);
+        else
+            setLockMode(LockModes.UNLOCK);
+    };
 
+    /// MODULATOR ARRAYS
+    let userDefinedWavesBase = [];
+    let userDefinedFunctionsBase = [];
+    let userDefinedTypesBase = [0, 0, 0, 0]; //0 = wave, 1 = function
+    
+    for (let i=0; i<MAXUSERDEFINED; i++){  
+        userDefinedWavesBase.push(Array(50).fill(0));
+        userDefinedFunctionsBase.push(Array(101).fill(0));
+    }
+    const [userDefinedWaves, setUserDefinedWaves] = React.useState(userDefinedWavesBase);
+    const [userDefinedFunctions, setUserDefinedFunctions] = React.useState(userDefinedFunctionsBase);
+    const [userDefinedTypes, setUserDefinedTypes] = React.useState(userDefinedTypesBase);
     const [modVisibleArr, setModVisibleArr] = React.useState(initVisArr);
+    const [modTypeArr, setModTypeArr] = React.useState(Array(MAXLFOS).fill('LFO'));
     const [modInstanceNumArr, setModInstanceNumArr] = React.useState(Array(MAXLFOS).fill('1'));
 
     const [modCenterVals, setModCenterVals] = React.useState({'1':{}, '2':{}, '3':{}, '4':{}});
 
-    const [bpm, setBpm] = React.useState(100);
+    const [ticks, setTicks] = React.useState(0);
     const [beatsInMeasure, setBeatsInMeasure] = React.useState(4);
 
+    const [noiseTypeArr, setNoiseTypeArr] = React.useState(Array(MAXLFOS).fill('Sine Int.'));
     const [shapeArr, setShapeArr] = React.useState(Array(MAXLFOS).fill('Sine'));
     const [djParamArr, setDjParamArr] = React.useState(Array(MAXLFOS).fill('NONE')); 
 
@@ -62,23 +111,28 @@ function MasterLfoHandler(){
     const [minArr, setMinArr] = React.useState(Array(MAXLFOS).fill('0'));
     const [maxArr, setMaxArr] = React.useState(Array(MAXLFOS).fill('1'));
 
-    const [phaseArr, setPhaseArr] = React.useState(Array(MAXLFOS).fill('0'));
+    const [initPhaseArr, setInitPhaseArr] = React.useState(Array(MAXLFOS).fill('0'));
+    const [lastPhaseArr, setLastPhaseArr] = React.useState(Array(MAXLFOS).fill(0));
+    const [cachedNoiseValueArr1, setCachedNoiseValueArr1] = React.useState(Array(MAXLFOS).fill(0));
+    const [cachedNoiseValueArr2, setCachedNoiseValueArr2] = React.useState(Array(MAXLFOS).fill(0));
 
-    const allModArrays = [modVisibleArr, modInstanceNumArr, shapeArr, djParamArr, freqArr, minArr, maxArr, phaseArr];
+    
-    const allModSetters = [setModVisibleArr, setModInstanceNumArr, setShapeArr, setDjParamArr, setFreqArr, setMinArr, setMaxArr, setPhaseArr];
+
-    const modBlankVals = [true, '1', SHAPETYPES[0], MODPARAMOPTIONS[0], '1hz', '0', '1', '0'];
+    const allModArrays = [modVisibleArr, modTypeArr, modInstanceNumArr, shapeArr, noiseTypeArr, djParamArr, freqArr, minArr, maxArr, initPhaseArr, lastPhaseArr, cachedNoiseValueArr1, cachedNoiseValueArr2];
+    const allModSetters = [setModVisibleArr, setModTypeArr, setModInstanceNumArr, setShapeArr, setNoiseTypeArr, setDjParamArr, setFreqArr, setMinArr, setMaxArr, setInitPhaseArr, setLastPhaseArr, setCachedNoiseValueArr1, setCachedNoiseValueArr2];
+    const modBlankVals = [true, 'LFO', '1', SHAPETYPES[0], NOISETYPES[0], MODPARAMOPTIONS[0], '1hz', '0', '1', '0', 0, 0, 0];
 
 
     /// ENUMERATOR ARRAYS
     const [enumVisibleArr, setEnumVisibleArr] = React.useState(initVisArr);
     const [enumInstanceNumArr, setEnumInstanceNumArr] = React.useState(Array(MAXLFOS).fill('1'));
     const [enumItemCounts, setEnumItemCounts] = React.useState(Array(MAXENUMPOINTS).fill('2'));
-    const [enumDjParamArr, setEnumDjParamArr] = React.useState(Array(MAXENUMPOINTS).fill('attenuation')); 
+    const [enumDjParamArr, setEnumDjParamArr] = React.useState(Array(MAXENUMPOINTS).fill('NONE')); 
 
     let baseEnumBreakpoints = Array(MAXENUMS).fill(0).map(x => Array(MAXENUMPOINTS+ 1).fill(0));
     for (let i = 0; i < MAXENUMS; i++){
         for (let j=0; j < MAXENUMPOINTS + 1; j++){
-            baseEnumBreakpoints[i][j] = j;
+            baseEnumBreakpoints[i][j] = j - 0.5;
         }
     }
     const [enumBreakPoints, setEnumBreakPoints] = React.useState(baseEnumBreakpoints); 
@@ -86,7 +140,7 @@ function MasterLfoHandler(){
     const getBlankEnumBreakPointRow = () => {
         let arr = []
         for (let i=0; i< MAXENUMPOINTS + 1; i++)
-            arr.push(i)
+            arr.push(i - 0.5)
         return arr;
     }
 
@@ -110,17 +164,14 @@ function MasterLfoHandler(){
 
     React.useEffect(() => {
         function handleLoad(event) {
-            
             window.max.getDict(event.detail, (dict) => {
                 
-                for (let i = 0; i<allModArrays.length; i++) {
+                for (let i = 0; i<dict.data.modArrays.length; i++) {
                     allModSetters[i](dict.data.modArrays[i]);
                 }
-
                 for (let i = 0; i<allEnumArrays.length; i++) {
                     allEnumArrSetters[i](dict.data.enumArrays[i]);
                 }
-
                 for (let i = 0; i<allEnumMats.length; i++) {
                     allEnumMatSetters[i](dict.data.enumMats[i]);
                 }
@@ -198,36 +249,119 @@ function MasterLfoHandler(){
 
         function handleTick(event) {
             let time = (Date.now() - firstUpdateTime) / 1000;
-            operateModulators(modVisibleArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, phaseArr, time, bpm, beatsInMeasure);
+            let noiseData = {lastPhaseArr, setLastPhaseArr, cachedNoiseValueArr1, setCachedNoiseValueArr1, cachedNoiseValueArr2, setCachedNoiseValueArr2, noiseTypeArr};
-        }
+            operateModulators(modVisibleArr, modTypeArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, initPhaseArr, noiseData, userDefinedWaves, userDefinedFunctions, userDefinedTypes, time, beatsInMeasure, ticks);
-
-        function handleBpm(event) {
-            setBpm(event.detail);
         }
 
         function handleTimeSig(event) {
             setBeatsInMeasure(parseFloat(event.detail[0]) * parseFloat(event.detail[1])/ 4);
         }
 
+        function handleChangeUserWave(event){
+            userDefinedWaves[event.detail.index] = event.detail.points;
+            setUserDefinedWaves(userDefinedWaves);
+        }
+
+        function handleChangeUserFunction(event) {
+            userDefinedFunctions[event.detail.index] = event.detail.points;
+            setUserDefinedFunctions(userDefinedFunctions);
+        }
+
+        function handleChangeUserDefinedType(event) {
+            userDefinedTypes[event.detail.index-1] = event.detail.type;
+            setUserDefinedTypes(userDefinedTypes);
+        }
+
+        function handleMaxTicks(event){
+            setTicks(event.detail);
+        }
+
+        function setNN(event){
+            
+            for (let i=0; i<MAXLFOS; i++){
+                freqArr[i] = nnFreqToHzString(event.detail[i]);
+            }
+            setFreqArr(freqArr)
+
+            for (let i=MAXLFOS; i<MAXLFOS * 2; i++){
+                minArr[i - MAXLFOS] = event.detail[i];
+            }
+            setMinArr(minArr);
+
+            for (let i=MAXLFOS*2; i<MAXLFOS * 3; 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);
+
+            for (let i=MAXLFOS*4; i<MAXLFOS * 5; i++){
+                let index = i - MAXLFOS*4;
+                let inst = modInstanceNumArr[index];
+                let param = djParamArr[index];
+                modCenterVals[inst][param] = parseFloat(event.detail[i]);
+                
+            }
+            setModCenterVals(modCenterVals);
+
+            rerender(!render); // BAD!  SHOULD NOT BE DOING THIS!
+        }
+
+        function dumpNN(event){
+            let allNNData = [];
+            freqArr.forEach(element => {
+                allNNData.push(parseLfoTimeNonMusical(element));
+            }); 
+            allNNData = allNNData.concat(minArr);
+            allNNData = allNNData.concat(maxArr);
+            allNNData = allNNData.concat(initPhaseArr);
+
+            let lfoMatchedCenterVals = [];
+            for (let i=0; i<MAXLFOS; i++){
+                let inst = modInstanceNumArr[i];
+                let param = djParamArr[i];
+                lfoMatchedCenterVals.push(modCenterVals[inst][param]);
+                if (!lfoMatchedCenterVals[i])
+                    lfoMatchedCenterVals[i] = 0
+                
+            }
+            allNNData = allNNData.concat(lfoMatchedCenterVals);
+            window.max.outlet("NNdata " + allNNData.join(" "));
+        }
+
 
         window.addEventListener('loadDict', handleLoad);
         window.addEventListener('saveDict', handleSave);
+        window.addEventListener('dumpNN', dumpNN);
+        window.addEventListener('setNN', setNN);
         window.addEventListener('tick', handleTick);
         window.addEventListener('param', handleParam);
         window.addEventListener('enum', handleEnum);
-        window.addEventListener('tempo', handleBpm);
         window.addEventListener('timesig', handleTimeSig);
+        window.addEventListener('userWave', handleChangeUserWave);
+        window.addEventListener('userFunction', handleChangeUserFunction);
+        window.addEventListener('userDefinedType', handleChangeUserDefinedType);
+        window.addEventListener('maxTicks', handleMaxTicks);
 
         return () => {
             window.removeEventListener('loadDict', handleLoad);
             window.removeEventListener('saveDict', handleSave);
+            window.removeEventListener('dumpNN', dumpNN);
+            window.removeEventListener('setNN', setNN);
             window.removeEventListener('tick', handleTick);
             window.removeEventListener('param', handleParam);
             window.removeEventListener('enum', handleEnum);
-            window.removeEventListener('tempo', handleBpm);
             window.removeEventListener('timesig', handleTimeSig);
+            window.removeEventListener('userWave', handleChangeUserWave);
+            window.removeEventListener('userFunction', handleChangeUserFunction);
+            window.removeEventListener('userDefinedType', handleChangeUserDefinedType);
+            window.removeEventListener('maxTicks', handleMaxTicks);
         };
-    }, [...allModArrays, ...allEnumArrays, ...allEnumMats, modCenterVals, render, bpm, beatsInMeasure]);
+    }, [...allModArrays, ...allEnumArrays, ...allEnumMats, userDefinedWaves, userDefinedFunctions, userDefinedTypes, modCenterVals, render, beatsInMeasure, ticks]);
 
 
     function CheckLinked(inst, param, checkInstArr, checkParamArr){
@@ -248,10 +382,17 @@ function MasterLfoHandler(){
         modContents.push(
             
             e(LfoRow, {
+                locked : lockMode,
                 instanceNum : modInstanceNumArr[i],
                 setInstanceNum: CreateParamChanger(modInstanceNumArr, setModInstanceNumArr, i),
+
+                type: modTypeArr[i],
+                setType: CreateParamChanger(modTypeArr, setModTypeArr, i),
                 shape: shapeArr[i],
                 setShape: CreateParamChanger(shapeArr, setShapeArr, i),
+
+                noise: noiseTypeArr[i],
+                setNoise: CreateParamChanger(noiseTypeArr, setNoiseTypeArr, i),
                 djParam: djParamArr[i],
                 setDjParam: CreateParamChanger(djParamArr, setDjParamArr, i),
                 centerVals: modCenterVals,
@@ -267,13 +408,15 @@ function MasterLfoHandler(){
                 max: maxArr[i],
                 setMax: CreateParamChanger(maxArr, setMaxArr, i),
 
-                phase: phaseArr[i],
+                phase: initPhaseArr[i],
-                setPhase: CreateParamChanger(phaseArr, setPhaseArr, i),
+                setPhase: CreateParamChanger(initPhaseArr, setInitPhaseArr, i),
                 visible: modVisibleArr[i],
 
                 linked: CheckLinked(modInstanceNumArr[i], djParamArr[i], enumInstanceNumArr, enumDjParamArr),
                 addLfo: () => {
+                    
                     if (id < MAXLFOS - 1){
+                        
                         if (modVisibleArr[id + 1]){ 
                             
                             let emptyIndex = modVisibleArr.findIndex((item) => !item);
@@ -289,6 +432,7 @@ function MasterLfoHandler(){
                             }
                         }
                         else {
+                            
                             for (var j = 0; j < allModArrays.length; j++){ // no space below, easy.
                                 let array = allModArrays[j];
                                 array[id + 1] = modBlankVals[j];
@@ -296,6 +440,7 @@ function MasterLfoHandler(){
                             }
                         }
                         rerender(!render);
+                        
                     }
                 },
                 removeLfo: () => {
@@ -320,7 +465,7 @@ function MasterLfoHandler(){
         enumContents.push(
             e(EnumeratorRow, {
                 index: i,
-
+                locked : lockMode,
                 instanceNum : enumInstanceNumArr[i],
                 setInstanceNum: CreateParamChanger(enumInstanceNumArr, setEnumInstanceNumArr, i),
                 enumItems: enumItemCounts[i],
@@ -402,8 +547,19 @@ function MasterLfoHandler(){
         labels = ENUMERATORLABELS;
     }
 
+    let lockClass;
+    if (lockMode == LockModes.LOCK){
+        lockClass = 'lock';
+    } 
+    else {
+        lockClass = 'lock unlocked';
+    }
+
     return e('div', null, 
+        e('div', {className: 'container'}, 
             e(Switch, {ontoggle: toggleViewMode}, null),
+            e('span', {className: lockClass, onClick: toggleLockMode}, null)),
+        
         e('h5', null, title),
         e('ul', null, ...labels.map(x => ListItem(Label(x)))),
         e('div', {id: 'grid'}, ...grid)
@@ -419,19 +575,42 @@ if (!DEBUG){
         window.dispatchEvent(new CustomEvent('saveDict', {'detail' : dictId}));
     });
 
-    window.max.bindInlet("param", (inst, paramName, val) => {
+    window.max.bindInlet("dumpNN", () => {
-        
+        window.dispatchEvent(new CustomEvent('dumpNN'));
-        window.dispatchEvent(new CustomEvent('param', {'detail' : [inst, paramName, val]}));
     });
 
-    window.max.bindInlet("tempo", (val) => {
+    window.max.bindInlet("setNN", (...data) => {
-        window.dispatchEvent(new CustomEvent('tempo', {'detail' : val}));
+        window.dispatchEvent(new CustomEvent('setNN', {'detail' : data}));
+    });
+
+    window.max.bindInlet("param", (inst, paramName, val) => {
+        window.dispatchEvent(new CustomEvent('param', {'detail' : [inst, paramName, val]}));
     });
 
     window.max.bindInlet("timesig", (top, bottom) => {
         window.dispatchEvent(new CustomEvent('timesig', {'detail' : [top, bottom]}));
     });
 
+    window.max.bindInlet("ticks", (val) => {
+        window.dispatchEvent(new CustomEvent('maxTicks', {'detail' : val}));
+    });
+
+    window.max.bindInlet("userWave", (index, ...points) => {
+        let data = {points, index};
+        window.dispatchEvent(new CustomEvent('userWave', {'detail' : data}));
+    });
+    
+    window.max.bindInlet("userFunction", (index, ...points) => {
+        //list of 101 points between 0-100
+        let data = {points, index};
+        window.dispatchEvent(new CustomEvent('userFunction', {'detail': data}));
+    });
+
+    window.max.bindInlet("userDefinedType", (index, type) => {
+        let data = {index, type};
+        window.dispatchEvent(new CustomEvent('userDefinedType', {'detail': data}));
+    })
+
     setInterval(() => {
         window.dispatchEvent(new CustomEvent('tick'));
     }, 200);

modulators.js

@@ -2,7 +2,10 @@
 // MODULATORS
 /////////////////////////
 
-var SHAPETYPES = ["Sine", "SawUp", "SawDown", "Tri", "Square"];
+
+var TYPEOPTIONS = ["LFO", "Noise"];
+var SHAPETYPES = ["Sine", "SawUp", "SawDown", "Tri", "Square", "Custom_1", "Custom_2", "Custom_3", "Custom_4"];
+var NOISETYPES = ["Rand", "Line Int.", "Sine Int."]
 
 var INSTANCEOPTIONS = ["1", "2", "3", "4"];
 
@@ -10,6 +13,11 @@ const MODPARAMOPTIONS = ["NONE", "stream", "pulse_length", "eventfulness", "even
     "harmoniclarity", "melodic_cohesion", "melody_scope", "tonic_pitch", "pitch_center", "pitch_range", "dynamics",
     "attenuation", "chordal_weight", "tonality-profile", "ostinato-buffer", "ostinato", "meter", "scale"];
 
+const PhaseTypes = Object.freeze({
+    MUSICAL:   Symbol("musical"),
+    TIME:  Symbol("time")
+    });
+
 function ControlType(){
     return e('select', {className: 'control-type'}, Option("LFO"));
 }
@@ -23,11 +31,20 @@ function LfoRow(props){
     if (!center)
         center = 0;
 
+    let typeOption = null;
+
+    if (props.type == "LFO"){
+        typeOption = ListItem(DropDown({locked:props.locked, onChange: props.setShape, value:props.shape, options: SHAPETYPES}));
+    }
+    else if (props.type == "Noise"){
+        typeOption = ListItem(DropDown({locked:props.locked, onChange: props.setNoise, value:props.noise, options: NOISETYPES}));
+    }
+
     let content = e('ul', {className: 'lfo-item'},
-        ListItem(DropDown({onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})),  
+        ListItem(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})),  
-        ListItem(ControlType()), 
+        ListItem(DropDown({locked:props.locked, options: TYPEOPTIONS, onChange: props.setType, value:props.type})), 
-        ListItem(DropDown({onChange: props.setShape, value:props.shape, options: SHAPETYPES})), 
+        typeOption,
-        ListItem(DropDown({onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
+        ListItem(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
         ListItem(e("input", {onChange:props.setFreq, value:props.freq, className:"timeInput"}, null)), 
         ListItem(e(NumberBox, {onChange:props.setMin, value:props.min, step:0.1}, null)),
         ListItem(e(NumberBox, {onChange:props.setMax, value:props.max, step:0.1}, null)),
@@ -35,16 +52,25 @@ function LfoRow(props){
         ListItem(e(NumberBox, {onChange:props.setPhase, value:props.phase, step:0.1}, null)), 
         ListItem(e("div", {className:"base-val"}, center.toString())),
         ListItem(e("input", {type: 'range', min: 0, max: 1, step: 0.01, readonly: true, id: `slider-${props.instanceNum}-${props.djParam}`})),
-        ListItem(e(Button, {text:'+', onClick: props.addLfo}, null)), 
+        ListItem(e(Button, {text:'+', onClick: props.addLfo, locked: props.locked}, null)), 
-        ListItem(e(Button, {text:'-', onClick: props.removeLfo}, null)),
+        ListItem(e(Button, {text:'-', onClick: props.removeLfo, locked: props.locked}, null)),
         ListItem(e("div", {className:"linked"}, linkedText)),
     );
     if (props.visible){
-        return content
+        return content;
     };
 }
 
-function indexWave(type, phase){
+function indexUserWave(phase, index, userDefinedWaves){
+    return parseFloat(userDefinedWaves[index][Math.floor(phase * 50)]) / 127;
+}
+
+//TODO doesn't work well yet
+function indexUserFunction(phase, index, userDefinedFunctions){
+    return parseFloat(userDefinedFunctions[index][Math.floor(phase * 101)]) / 127;
+}
+
+function indexWave(type, phase, userDefinedWaves, userDefinedFunctions, userDefinedTypes){
     switch (type){
         case "Sine":
             return (Math.sin(phase * Math.PI * 2) / 2) + 0.5;
@@ -56,10 +82,18 @@ function indexWave(type, phase){
             return phase > 0.5? (1-phase) * 2 : phase * 2;
         case "Square":
             return +(phase > 0.5);
+        case "Custom_1":
+            return userDefinedTypes[0] == 0 ? indexUserWave(phase, 1, userDefinedWaves) : indexUserFunction(phase, 1, userDefinedFunctions);
+        case "Custom_2":
+            return userDefinedTypes[1] == 0 ? indexUserWave(phase, 2, userDefinedWaves) : indexUserFunction(phase, 2, userDefinedFunctions);
+        case "Custom_3":
+            return userDefinedTypes[2] == 0 ? indexUserWave(phase, 3, userDefinedWaves) : indexUserFunction(phase, 3, userDefinedFunctions);
+        case "Custom_4":
+            return userDefinedTypes[3] == 0 ? indexUserWave(phase, 4, userDefinedWaves) : indexUserFunction(phase, 4, userDefinedFunctions);
     }
 }
 
-function operateModulators(visibleArr, instanceNumArr, paramNames, centers, freqs, mins, maxs, waveTypes, phaseArr, currTime, bpm, beatsInMeasure){
+function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, centers, freqs, mins, maxs, waveTypes, phaseArr, noiseData, userDefinedWaves, userDefinedFunctions, userDefinedTypes, currTime, beatsInMeasure, ticks){
     for (let i=0; i<paramNames.length; i++){
         if (visibleArr[i]){
             
@@ -69,54 +103,121 @@ function operateModulators(visibleArr, instanceNumArr, paramNames, centers, freq
             if (centers[inst].hasOwnProperty(name)){
                 center = centers[inst][name];   
             }
-            let output = operateModulator(center, inst, freqs[i], mins[i], maxs[i], waveTypes[i], phaseArr, i, name, currTime, bpm, beatsInMeasure);
+
+            let output = 0;
+            
+            if (typeArr[i] == "LFO")
+                output = operateLFO(center, inst, freqs[i], mins[i], maxs[i], waveTypes[i], phaseArr, i, userDefinedWaves, userDefinedFunctions, userDefinedTypes, name, currTime, beatsInMeasure, ticks);
+            else
+                output = operateNoise(center, inst, freqs[i], mins[i], maxs[i], waveTypes[i], phaseArr, i, name, noiseData, currTime, beatsInMeasure, ticks);
             if (name !== "NONE")
                 window.dispatchEvent(new CustomEvent('enum', {'detail' : [inst, name, output]}));
         }
     }
 }
 
-function operateModulator(center, inst, freq, min, max, waveType, phaseArr, phaseI, name, currTime, bpm, beatsInMeasure){
+function operateLFO(center, inst, timeBaseStr, min, max, waveType, phaseArr, phaseIndex, userDefinedWaves, userDefinedFunctions, userDefinedTypes, name, currTime, beatsInMeasure, maxTicks){
     let amp = parseFloat(max) - parseFloat(min);
+    let phaseType;
+    let timeBase;
     
-    freq = parseLfoTime(freq, bpm, beatsInMeasure);
+    [timeBase, phaseType] = parseLfoTime(timeBaseStr, beatsInMeasure);
-    let phase = (currTime * freq + parseFloat(phaseArr[phaseI])) % 1.00;
+    let phase;
-    let unscaled = indexWave(waveType, phase);
-    let el = document.getElementById(`slider-${inst}-${name}`);
     
-    if (el)
+    if (phaseType === PhaseTypes.TIME)
-        el.value = unscaled;
+        phase = (currTime * timeBase + parseFloat(phaseArr[phaseIndex])) % 1.00;
+    else if (phaseType === PhaseTypes.MUSICAL)
+        phase = (maxTicks % timeBase) / timeBase;
+    let unscaled = indexWave(waveType, phase, userDefinedWaves, userDefinedFunctions, userDefinedTypes);
+    syncDisplay(inst, name, unscaled);
     
     return  unscaled * amp + center + parseFloat(min);
 }
 
+function syncDisplay(inst, name, val) {
+    let el = document.getElementById(`slider-${inst}-${name}`);
     
-function parseLfoTime(lfoTime, bpm, beatsInMeasure){
+    if (el)
+        el.value = val;
+}
+
+// For now, we're only using sine interpolation
+function operateNoise(center, inst, timeBaseStr, min, max, waveType, phaseArr, index, name, noiseData, currTime, beatsInMeasure, maxTicks){
+    
+    let amp = parseFloat(max) - parseFloat(min);
+    let phaseType;
+    let timeBase;
+    let noiseType = noiseData.noiseTypeArr[index];
+    
+    [timeBase, phaseType] = parseLfoTime(timeBaseStr, beatsInMeasure);
+    let phase;
+
+    if (phaseType === PhaseTypes.TIME)
+        phase = (currTime * timeBase + parseFloat(phaseArr[index])) % 1.00;
+    else if (phaseType === PhaseTypes.MUSICAL)
+        phase = (maxTicks % timeBase) / timeBase;
+    
+    if (noiseData.cachedNoiseValueArr1[index] == 0 || noiseData.lastPhaseArr[index] > phase){ // occurs if the phase reset to 0 or at the very start
+
+        noiseData.cachedNoiseValueArr2[index] = noiseData.cachedNoiseValueArr1[index];
+        if (noiseData.cachedNoiseValueArr1[index] == 0)
+            noiseData.cachedNoiseValueArr2[index] = center;
+
+        noiseData.cachedNoiseValueArr1[index] = Math.random();
+        noiseData.setCachedNoiseValueArr1(noiseData.cachedNoiseValueArr1);
+        noiseData.setCachedNoiseValueArr2(noiseData.cachedNoiseValueArr2);
+    }
+    noiseData.lastPhaseArr[index] = phase;
+    noiseData.setLastPhaseArr(noiseData.lastPhaseArr);
+
+    //let unscaled = (noiseData.cachedNoiseValueArr[index][1] - noiseData.cachedNoiseValueArr[index][0]) * sinePhase + noiseData.cachedNoiseValueArr[index][0];
+    let unscaled = interpolateNoise(noiseType, noiseData.cachedNoiseValueArr1[index], noiseData.cachedNoiseValueArr2[index], phase);
+    syncDisplay(inst, name, unscaled);
+    
+    return  unscaled * amp + center + parseFloat(min);
+}
+
+function interpolateNoise(type, cachedVal1, cachedVal2, phase){
+    let interpVal;
+
+    switch (type){
+        case "Sine Int.":
+            interpVal = (Math.sin(Math.PI + Math.PI * phase) + 1) / 2;
+            break;
+        case "Rand":
+            interpVal = 0;
+            break;
+        case "Line Int.":
+            interpVal = phase;
+            break;
+    }
+    return (cachedVal2 - cachedVal1) * interpVal + cachedVal1;
+}
+
+// actual returns the period for musical timing, to avoid floating point errors
+function parseLfoTime(lfoTime, beatsInMeasure){
     if (lfoTime.slice(-2) == "hz"){
-        return parseFloat(lfoTime.slice(0, -2));
+        return [parseFloat(lfoTime.slice(0, -2)), PhaseTypes.TIME];
     }
     else if (lfoTime.slice(-2) == "ms"){
-        return 1000 / parseFloat(lfoTime.slice(0, -2));
+        return [1000 / parseFloat(lfoTime.slice(0, -2)), PhaseTypes.TIME];
     }
     else if (lfoTime.slice(-1) == "s"){
-        return 1 / parseFloat(lfoTime.slice(0, -1));
+        return [1 / parseFloat(lfoTime.slice(0, -1)), PhaseTypes.TIME];
     }
     else if ((lfoTime.match(/:/g) || []).length == 2){
-        return 1 / moment.duration(lfoTime).asSeconds();
+        return [1 / moment.duration(lfoTime).asSeconds(), PhaseTypes.TIME];
     }
     else if ((lfoTime.match(/\./g) || []).length == 2){
-        return musicalTimingToFreq(...lfoTime.split('.'), bpm, beatsInMeasure)
+        return [musicalTimingToFreq(...lfoTime.split('.'), beatsInMeasure), PhaseTypes.MUSICAL];
     }
     else {
-        return 0;
+        return [0, PhaseTypes.TIME];
     }
 }
 
-function musicalTimingToFreq(bars, beats, ticks, bpm, beatsInMeasure){
+function musicalTimingToFreq(bars, beats, ticks, beatsInMeasure){
-    let totalTicks = (parseFloat(bars) * parseFloat(beatsInMeasure) + beats) * 480 + parseFloat(ticks);
+    let totalTicks = (parseFloat(bars) * parseFloat(beatsInMeasure) + parseFloat(beats)) * 480 + parseFloat(ticks);
-    let tpm = bpm * 480;
+    return totalTicks;
-    let cyclesPerMinute = tpm / totalTicks;
-    let hz = cyclesPerMinute / 60;
-    return hz;
 }
 

myStorage.json

@@ -0,0 +1,25 @@
+{
+	"pattrstorage" : 	{
+		"name" : "myStorage",
+		"slots" : 		{
+			"1" : 			{
+				"id" : 1,
+				"data" : 				{
+					"dicto" : [ 						{
+							"data" : 							{
+								"enumArrays" : [ [ 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], [ "1", "1", "4", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1" ], [ "2", "2", "2", 2, "2", "2", "2", "2", "2", "2" ], [ "attenuation", "attenuation", "meter", "NONE", "attenuation", "attenuation", "attenuation", "attenuation", "attenuation", "attenuation" ] ],
+								"enumMats" : [ [ [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ "0", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ -0.5, 0.5, 1.5, 2.5, 3.5, 4.5, 5.5, 6.5, 7.5, 8.5, 9.5 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ], [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] ], [ [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "4 4", "3 4", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ], [ "param", "param", "param", "param", "param", "param", "param", "param", "param", "param" ] ] ],
+								"modArrays" : [ [ 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], [ "Noise", "Noise", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO", "LFO" ], [ "1", "4", "4", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1" ], [ "SawDown", "Custom_1", "Custom_3", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine", "Sine" ], [ "Rand", "Rand", "Rand", "Rand", "Rand", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int.", "Sine Int." ], [ "metriclarity", "event_length", "pulse_length", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE", "NONE" ], [ "2s", "4.3hz", "4.8hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz", "1hz" ], [ "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0" ], [ "3", "1", "1.5", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1" ], [ "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0" ], [ 0.600000000000001, 0.160000000000025, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], [ 0.954455089059444, 0.525043204441318, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ], [ 0.060893203710041, 0.221410648105745, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ]
+							}
+
+						}
+ ]
+				}
+
+			}
+
+		}
+
+	}
+
+}