Merge pull request 'buttons for switching between modes' (#11) from button-headers into main

Reviewed-on: #11

.gitignore

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

common.js

@@ -49,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}`);
     }
 }
@@ -60,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}`);
         
     }

lfogui.css

@@ -3,12 +3,31 @@
   --unlocked-color: #ff5153;
 }
 
+:root {
+    --background: ivory;
+    --active: royalblue;
+    --nonactive: lightsteelblue;
+    --alert: red;
+    --textcolor: #737373;
+}
+
+@import url('https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap');
+
+html {
+    background-color: var(--background);
+}
+
+body {
+    font-family: "Poppins", sans-serif;
+}
+
 html, body {
   width: 100%;
   height: 100%;
   margin: 0px;
   border: 0;
-  overflow: hidden;  /*  Disable scrollbars */
+  overflow-x: hidden; /* no horizontal scrollbar*/
+  overflow-y: scroll;
   display: block;    /* No floating content on sides */
 }
 
@@ -24,6 +43,9 @@ li {
     float: left;
 }
 
+table {
+    overflow: scroll;
+}
 
 input[type=number] {
     width: 50px;
@@ -183,7 +205,15 @@ h5 {
 #pulse {
   animation: pulse-animation 0.2s normal;
 }
+/* :::::::::::::: SELECTING MODULATORS/ENUMERATORS */
 
+.highlighted-button {
+  background-color: gray;
+}
+
+.unhighlighted-button {
+  background-color: white;
+}
 /* :::::::::::::: LOCK CSS */
 
 .locked-component {
@@ -192,10 +222,10 @@ h5 {
   color : white;
 }
 
-.container {
+.header {
   display: flex;
   width: 100%;
-  justify-content: space-between;
+  flex-direction: flex;
 }
 
 /* Locked */

lfogui.js

@@ -4,49 +4,50 @@ var log;
 if (DEBUG)
     log = console.log;
 else
-    log = (msg) => {window.max.outlet("debug " + msg)};
+    log = (msg) => { window.max.outlet("debug " + msg) };
 
 const e = React.createElement;
 
 let lfos = [];
-const MAXLFOS = 20;
+const MAXLFOS = 200;
-const MAXENUMS = 20;
+const MAXENUMS = 200;
 const MAXENUMPOINTS = 10;
+const MAXUSERDEFINED = 4;
 
 
 
 const ViewModes = Object.freeze({
-    MOD:   0,
+    MOD: 0,
-    ENUM:  1
+    ENUM: 1
 });
 
 const LockModes = Object.freeze({
-    UNLOCK:   0,
+    UNLOCK: 0,
-    LOCK:  1
+    LOCK: 1
 });
 
 
 var modPhases = Array(MAXLFOS).fill(0);
 var firstUpdateTime = Date.now();
 
-const MODULATORLABELS = ["inst", "-type-", "---shape---", "-------param-------", "--timebase--", "-min-", "-max", "-phase-", "center"];
+const MODULATORLABELS = ["inst", "type", "shape", "param", "timebase", "min", "max", "phase", "center"];
-const ENUMERATORLABELS = ["inst", "---parameter---", "-# points-"];
+const ENUMERATORLABELS = ["inst", "parameter", "# points"];
 
 
-function parseLfoTimeNonMusical(lfoTime){
+function parseLfoTimeNonMusical(lfoTime) {
-    if (lfoTime.slice(-2) == "hz"){
+    if (lfoTime.slice(-2) == "hz") {
         return parseFloat(lfoTime.slice(0, -2));
     }
-    else if (lfoTime.slice(-2) == "ms"){
+    else if (lfoTime.slice(-2) == "ms") {
         return 1000 / parseFloat(lfoTime.slice(0, -2));
     }
-    else if (lfoTime.slice(-1) == "s"){
+    else if (lfoTime.slice(-1) == "s") {
         return 1 / parseFloat(lfoTime.slice(0, -1));
     }
-    else if ((lfoTime.match(/:/g) || []).length == 2){
+    else if ((lfoTime.match(/:/g) || []).length == 2) {
         return 1 / moment.duration(lfoTime).asSeconds();
     }
-    else if ((lfoTime.match(/\./g) || []).length == 2){
+    else if ((lfoTime.match(/\./g) || []).length == 2) {
         return 0; // ignore musical timings
     }
     else {
@@ -54,13 +55,12 @@ function parseLfoTimeNonMusical(lfoTime){
     }
 }
 
-function nnFreqToHzString(num){
+function nnFreqToHzString(num) {
     return `${num}hz`;
 }
 
 
-function MasterLfoHandler(){
+function MasterLfoHandler() {
-
     let initVisArr = Array(MAXLFOS).fill(false);
     initVisArr[0] = true;
 
@@ -72,7 +72,7 @@ function MasterLfoHandler(){
             setViewMode(ViewModes.MOD);
     };
 
-    const [lockMode, setLockMode] = React.useState(LockModes.LOCK);
+    const [lockMode, setLockMode] = React.useState(LockModes.UNLOCK);
     const toggleLockMode = () => {
         if (lockMode === LockModes.UNLOCK)
             setLockMode(LockModes.LOCK);
@@ -81,14 +81,22 @@ function MasterLfoHandler(){
     };
 
     /// MODULATOR ARRAYS
+    let userDefinedWavesBase = [];
+    let userDefinedFunctionsBase = [];
+    let userDefinedTypesBase = [0, 0, 0, 0]; //0 = wave, 1 = function
 
-    const [userDefinedWave, setUserDefinedWave] = React.useState(Array(50).fill(0));
+    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 [modCenterVals, setModCenterVals] = React.useState({ '1': {}, '2': {}, '3': {}, '4': {} });
 
     const [ticks, setTicks] = React.useState(0);
     const [beatsInMeasure, setBeatsInMeasure] = React.useState(4);
@@ -121,9 +129,9 @@ function MasterLfoHandler(){
     const [enumItemCounts, setEnumItemCounts] = React.useState(Array(MAXENUMPOINTS).fill('2'));
     const [enumDjParamArr, setEnumDjParamArr] = React.useState(Array(MAXENUMPOINTS).fill('NONE'));
 
-    let baseEnumBreakpoints = Array(MAXENUMS).fill(0).map(x => Array(MAXENUMPOINTS+ 1).fill(0));
+    let baseEnumBreakpoints = Array(MAXENUMS).fill(0).map(x => Array(MAXENUMPOINTS + 1).fill(0));
-    for (let i = 0; i < MAXENUMS; i++){
+    for (let i = 0; i < MAXENUMS; i++) {
-        for (let j=0; j < MAXENUMPOINTS + 1; j++){
+        for (let j = 0; j < MAXENUMPOINTS + 1; j++) {
             baseEnumBreakpoints[i][j] = j - 0.5;
         }
     }
@@ -131,12 +139,12 @@ function MasterLfoHandler(){
 
     const getBlankEnumBreakPointRow = () => {
         let arr = []
-        for (let i=0; i< MAXENUMPOINTS + 1; i++)
+        for (let i = 0; i < MAXENUMPOINTS + 1; i++)
             arr.push(i - 0.5)
         return arr;
     }
 
-    const getBlankEnumNameRow = () => {return Array(MAXENUMPOINTS).fill('param')};
+    const getBlankEnumNameRow = () => { return Array(MAXENUMPOINTS).fill('param') };
 
     let baseEnumNames = Array(MAXENUMS).fill(0).map(x => Array(MAXENUMPOINTS).fill('param'));
     const [enumNames, setEnumNames] = React.useState(baseEnumNames);
@@ -158,13 +166,13 @@ function MasterLfoHandler(){
         function handleLoad(event) {
             window.max.getDict(event.detail, (dict) => {
 
-                for (let i = 0; i<dict.data.modArrays.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++) {
+                for (let i = 0; i < allEnumArrays.length; i++) {
                     allEnumArrSetters[i](dict.data.enumArrays[i]);
                 }
-                for (let i = 0; i<allEnumMats.length; i++) {
+                for (let i = 0; i < allEnumMats.length; i++) {
                     allEnumMatSetters[i](dict.data.enumMats[i]);
                 }
             })
@@ -172,29 +180,29 @@ function MasterLfoHandler(){
 
         function handleSave(event) {
             let data = {
-                'modArrays' : allModArrays,
+                'modArrays': allModArrays,
-                'enumArrays' : allEnumArrays,
+                'enumArrays': allEnumArrays,
-                'enumMats' : allEnumMats
+                'enumMats': allEnumMats
             }
-            window.max.setDict(event.detail, {"data" : data});
+            window.max.setDict(event.detail, { "data": data });
             window.max.outlet("saved");
         }
 
 
         // only called internally by 1. Handler after modulator processing 2. LFO outputs
-        function handleEnum(event){
+        function handleEnum(event) {
             let inst = event.detail[0];
             let name = event.detail[1];
             let val = event.detail[2];
 
             // if none of the Enums use this param, then we output it
             let i = 0;
-            while (i < MAXENUMS){
+            while (i < MAXENUMS) {
                 if (enumVisibleArr[i] && enumDjParamArr[i] == name && enumInstanceNumArr[i] == inst)
                     break;
                 i++
             }
-            if (i == MAXENUMS){
+            if (i == MAXENUMS) {
                 window.max.outlet(inst + ' ' + name + ' ' + val);
             }
             else {
@@ -211,25 +219,25 @@ function MasterLfoHandler(){
             let val = event.detail[2];
             // CHECK FOR INDEX OF THIS NAME IN ENUM MATRIX, AND IF IT IS THERE DENUMERATE
             let index = -1;
-            for (let i = 0; i < MAXENUMS; i++){
+            for (let i = 0; i < MAXENUMS; i++) {
                 if (enumDjParamArr[i] == name && enumInstanceNumArr[i] == inst)
                     index = i;
             }
-            if (index != -1){
+            if (index != -1) {
                 val = denumerate(val, enumItemCounts[index], enumBreakPoints[index], enumNames[index]);
             }
 
 
             // if none of the LFOs use this param, then we send it straight to the enum
             let i = 0;
-            while (i < MAXLFOS){
+            while (i < MAXLFOS) {
                 if (modVisibleArr[i] && djParamArr[i] == name && modInstanceNumArr[i] == inst)
                     break;
                 i++;
             }
-            if (i == MAXLFOS){
+            if (i == MAXLFOS) {
 
-                window.dispatchEvent(new CustomEvent('enum', {'detail' : [inst, name, val]}));
+                window.dispatchEvent(new CustomEvent('enum', { 'detail': [inst, name, val] }));
             }
 
             modCenterVals[inst][name] = val;
@@ -241,47 +249,58 @@ function MasterLfoHandler(){
 
         function handleTick(event) {
             let time = (Date.now() - firstUpdateTime) / 1000;
-            let noiseData = {lastPhaseArr, setLastPhaseArr, cachedNoiseValueArr1, setCachedNoiseValueArr1, cachedNoiseValueArr2, setCachedNoiseValueArr2, noiseTypeArr};
+            let noiseData = { lastPhaseArr, setLastPhaseArr, cachedNoiseValueArr1, setCachedNoiseValueArr1, cachedNoiseValueArr2, setCachedNoiseValueArr2, noiseTypeArr };
-            operateModulators(modVisibleArr, modTypeArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, initPhaseArr, noiseData, userDefinedWave, time, beatsInMeasure, ticks);
+            operateModulators(modVisibleArr, modTypeArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, initPhaseArr, noiseData, userDefinedWaves, userDefinedFunctions, userDefinedTypes, time, beatsInMeasure, ticks);
         }
 
         function handleTimeSig(event) {
-            setBeatsInMeasure(parseFloat(event.detail[0]) * parseFloat(event.detail[1])/ 4);
+            setBeatsInMeasure(parseFloat(event.detail[0]) * parseFloat(event.detail[1]) / 4);
         }
 
-        function handleChangeUserWave(event){
+        function handleChangeUserWave(event) {
-            setUserDefinedWave(event.detail);
+            userDefinedWaves[event.detail.index] = event.detail.points;
+            setUserDefinedWaves(userDefinedWaves);
         }
 
-        function handleMaxTicks(event){
+        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){
+        function setNN(event) {
 
-            for (let i=0; i<MAXLFOS; i++){
+            for (let i = 0; i < MAXLFOS; 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++) {
                 minArr[i - MAXLFOS] = event.detail[i];
             }
             setMinArr(minArr);
 
-            for (let i=MAXLFOS*2; i<MAXLFOS * 3; i++){
+            for (let i = MAXLFOS * 2; i < MAXLFOS * 3; i++) {
-                maxArr[i - MAXLFOS*2] = event.detail[i];
+                maxArr[i - MAXLFOS * 2] = event.detail[i];
             }
             setMaxArr(maxArr);
 
-            for (let i=MAXLFOS*3; i<MAXLFOS * 4; i++){
+            for (let i = MAXLFOS * 3; i < MAXLFOS * 4; i++) {
-                initPhaseArr[i - MAXLFOS*3] = parseFloat(event.detail[i]);
+                initPhaseArr[i - MAXLFOS * 3] = parseFloat(event.detail[i]);
 
             }
             setInitPhaseArr(initPhaseArr);
 
-            for (let i=MAXLFOS*4; i<MAXLFOS * 5; i++){
+            for (let i = MAXLFOS * 4; i < MAXLFOS * 5; i++) {
-                let index = i - MAXLFOS*4;
+                let index = i - MAXLFOS * 4;
                 let inst = modInstanceNumArr[index];
                 let param = djParamArr[index];
                 modCenterVals[inst][param] = parseFloat(event.detail[i]);
@@ -292,7 +311,7 @@ function MasterLfoHandler(){
             rerender(!render); // BAD!  SHOULD NOT BE DOING THIS!
         }
 
-        function dumpNN(event){
+        function dumpNN(event) {
             let allNNData = [];
             freqArr.forEach(element => {
                 allNNData.push(parseLfoTimeNonMusical(element));
@@ -302,7 +321,7 @@ function MasterLfoHandler(){
             allNNData = allNNData.concat(initPhaseArr);
 
             let lfoMatchedCenterVals = [];
-            for (let i=0; i<MAXLFOS; i++){
+            for (let i = 0; i < MAXLFOS; i++) {
                 let inst = modInstanceNumArr[i];
                 let param = djParamArr[i];
                 lfoMatchedCenterVals.push(modCenterVals[inst][param]);
@@ -324,6 +343,8 @@ function MasterLfoHandler(){
         window.addEventListener('enum', handleEnum);
         window.addEventListener('timesig', handleTimeSig);
         window.addEventListener('userWave', handleChangeUserWave);
+        window.addEventListener('userFunction', handleChangeUserFunction);
+        window.addEventListener('userDefinedType', handleChangeUserDefinedType);
         window.addEventListener('maxTicks', handleMaxTicks);
 
         return () => {
@@ -336,13 +357,15 @@ function MasterLfoHandler(){
             window.removeEventListener('enum', handleEnum);
             window.removeEventListener('timesig', handleTimeSig);
             window.removeEventListener('userWave', handleChangeUserWave);
+            window.removeEventListener('userFunction', handleChangeUserFunction);
+            window.removeEventListener('userDefinedType', handleChangeUserDefinedType);
             window.removeEventListener('maxTicks', handleMaxTicks);
         };
-    }, [...allModArrays, ...allEnumArrays, ...allEnumMats, userDefinedWave, modCenterVals, render, beatsInMeasure, ticks]);
+    }, [...allModArrays, ...allEnumArrays, ...allEnumMats, userDefinedWaves, userDefinedFunctions, userDefinedTypes, modCenterVals, render, beatsInMeasure, ticks]);
 
 
-    function CheckLinked(inst, param, checkInstArr, checkParamArr){
+    function CheckLinked(inst, param, checkInstArr, checkParamArr) {
-        for (let i = 0; i < checkInstArr.length; i++){
+        for (let i = 0; i < checkInstArr.length; i++) {
             if (checkInstArr[i] == inst && checkParamArr[i] == param)
                 return true;
         }
@@ -353,14 +376,14 @@ function MasterLfoHandler(){
     // Generate Modulators
     ///////
     let modContents = []
-    for (var i = 0; i<MAXLFOS; i++){
+    for (var i = 0; i < MAXLFOS; i++) {
         let id = i;
 
         modContents.push(
 
             e(LfoRow, {
-                locked : lockMode,
+                locked: lockMode,
-                instanceNum : modInstanceNumArr[i],
+                instanceNum: modInstanceNumArr[i],
                 setInstanceNum: CreateParamChanger(modInstanceNumArr, setModInstanceNumArr, i),
 
                 type: modTypeArr[i],
@@ -381,7 +404,7 @@ function MasterLfoHandler(){
                 //setAmp: CreateParamChanger(ampArr, setAmpArr, i),
 
                 min: minArr[i],
-                setMin : CreateParamChanger(minArr, setMinArr, i),
+                setMin: CreateParamChanger(minArr, setMinArr, i),
                 max: maxArr[i],
                 setMax: CreateParamChanger(maxArr, setMaxArr, i),
 
@@ -392,13 +415,13 @@ function MasterLfoHandler(){
                 linked: CheckLinked(modInstanceNumArr[i], djParamArr[i], enumInstanceNumArr, enumDjParamArr),
                 addLfo: () => {
 
-                    if (id < MAXLFOS - 1){
+                    if (id < MAXLFOS - 1) {
 
-                        if (modVisibleArr[id + 1]){ 
+                        if (modVisibleArr[id + 1]) {
 
                             let emptyIndex = modVisibleArr.findIndex((item) => !item);
-                            if (emptyIndex != -1){
+                            if (emptyIndex != -1) {
-                                for (var j = 0; j < allModArrays.length; j++){
+                                for (var j = 0; j < allModArrays.length; j++) {
                                     let array = allModArrays[j];
                                     // remove from all arrays
                                     array.splice(emptyIndex, 1);
@@ -410,7 +433,7 @@ function MasterLfoHandler(){
                         }
                         else {
 
-                            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];
                                 array[id + 1] = modBlankVals[j];
                                 allModSetters[j](array);
@@ -421,7 +444,7 @@ function MasterLfoHandler(){
                     }
                 },
                 removeLfo: () => {
-                    if (modVisibleArr.filter(x=>x).length > 1){
+                    if (modVisibleArr.filter(x => x).length > 1) {
                         let newArr = modVisibleArr.slice();
                         newArr[id] = false;
                         setModVisibleArr(newArr);
@@ -429,7 +452,7 @@ function MasterLfoHandler(){
 
                 }
             },
-        null));
+                null));
     }
 
 
@@ -437,13 +460,13 @@ function MasterLfoHandler(){
     // Generate Enumerators
     ///////
     let enumContents = []
-    for (var i = 0; i<MAXLFOS; i++){
+    for (var i = 0; i < MAXLFOS; i++) {
         let id = i;
         enumContents.push(
             e(EnumeratorRow, {
                 index: i,
-                locked : lockMode,
+                locked: lockMode,
-                instanceNum : enumInstanceNumArr[i],
+                instanceNum: enumInstanceNumArr[i],
                 setInstanceNum: CreateParamChanger(enumInstanceNumArr, setEnumInstanceNumArr, i),
                 enumItems: enumItemCounts[i],
                 setEnumItemCounts: CreateParamChanger(enumItemCounts, setEnumItemCounts, i),
@@ -456,11 +479,11 @@ function MasterLfoHandler(){
                 setDjParam: CreateParamChanger(enumDjParamArr, setEnumDjParamArr, i),
                 linked: CheckLinked(enumInstanceNumArr[i], enumDjParamArr[i], modInstanceNumArr, djParamArr),
                 addEnum: () => {
-                    if (id < MAXLFOS - 1){
+                    if (id < MAXLFOS - 1) {
-                        if (enumVisibleArr[id + 1]){ // if we need to open up space
+                        if (enumVisibleArr[id + 1]) { // if we need to open up space
                             let emptyIndex = enumVisibleArr.findIndex((item) => !item);
-                            if (emptyIndex != -1){
+                            if (emptyIndex != -1) {
-                                for (var j = 0; j < allEnumArrays.length; j++){
+                                for (var j = 0; j < allEnumArrays.length; j++) {
                                     let array = allEnumArrays[j];
                                     // remove from all arrays
                                     array.splice(emptyIndex, 1);
@@ -471,7 +494,7 @@ function MasterLfoHandler(){
 
                                 // Now do the same with matrices
 
-                                for (var j = 0; j < allEnumMats.length; j++){
+                                for (var j = 0; j < allEnumMats.length; j++) {
                                     let mat = allEnumMats[j];
                                     mat.splice(emptyIndex, 1);
                                     mat.splice(id + 1, 0, 0);
@@ -481,15 +504,15 @@ function MasterLfoHandler(){
                             }
                         }
                         else {
-                            for (var j = 0; j < allEnumArrays.length; j++){
+                            for (var j = 0; j < allEnumArrays.length; j++) {
                                 let array = allEnumArrays[j];
-                                array[id+1] = enumBlankVals[j];
+                                array[id + 1] = enumBlankVals[j];
                                 allEnumArrSetters[j](array);
                             }
 
                             // Now do the same with matrices
 
-                            for (var j = 0; j < allEnumMats.length; j++){
+                            for (var j = 0; j < allEnumMats.length; j++) {
                                 let mat = allEnumMats[j];
                                 mat[id + 1] = allGetEnumMatBlankVals[j]();
                                 allEnumMatSetters[j](mat);
@@ -499,7 +522,7 @@ function MasterLfoHandler(){
                     }
                 },
                 removeEnum: () => {
-                    if (enumVisibleArr.filter(x=>x).length > 1){
+                    if (enumVisibleArr.filter(x => x).length > 1) {
                         let newArr = enumVisibleArr.slice();
                         newArr[id] = false;
                         setEnumVisibleArr(newArr);
@@ -511,21 +534,24 @@ function MasterLfoHandler(){
 
 
     var grid;
-    var title;
+    var modButtonClass;
+    var enumButtonClass;
     var labels;
-    if (viewMode === ViewModes.MOD){
+    if (viewMode === ViewModes.MOD) {
         grid = modContents;
-        title = "MODULATORS";
+        modButtonClass = "highlighted-button";
+        enumButtonClass = "unhighlighted-button";
         labels = MODULATORLABELS;
     }
     else {
         grid = enumContents;
-        title = "ENUMERATORS";
+        modButtonClass = "unhighlighted-button";
+        enumButtonClass = "highlighted-button";
         labels = ENUMERATORLABELS;
     }
 
     let lockClass;
-    if (lockMode == LockModes.LOCK){
+    if (lockMode == LockModes.LOCK) {
         lockClass = 'lock';
     }
     else {
@@ -533,23 +559,27 @@ function MasterLfoHandler(){
     }
 
     return e('div', null,
-        e('div', {className: 'container'}, 
+        e('div', { className: 'header' },
-            e(Switch, {ontoggle: toggleViewMode}, null),
+            e('button', { onClick: () => setViewMode(ViewModes.MOD), className: modButtonClass}, 'Modulators'),
-            e('span', {className: lockClass, onClick: toggleLockMode}, null)),
+            e('button', { onClick: () => setViewMode(ViewModes.ENUM), className: enumButtonClass }, 'Enumerators'),
+            //allows lock mode
+            //e('span', { className: lockClass, onClick: toggleLockMode }, null) 
+        ),
 
-        e('h5', null, title),
+        e('table', { id: 'table' },
-        e('ul', null, ...labels.map(x => ListItem(Label(x)))),
+            e('thead', null, e('tr', { id: 'headers' }, ...labels.map(x => e('th', null, x)))),
-        e('div', {id: 'grid'}, ...grid)
+            e('tbody', null, ...grid)
+        )
     );
 }
 
-if (!DEBUG){
+if (!DEBUG) {
     window.max.bindInlet("load", (dictId) => {
-        window.dispatchEvent(new CustomEvent('loadDict', {'detail' : dictId}));
+        window.dispatchEvent(new CustomEvent('loadDict', { 'detail': dictId }));
     });
 
     window.max.bindInlet("save", (dictId) => {
-        window.dispatchEvent(new CustomEvent('saveDict', {'detail' : dictId}));
+        window.dispatchEvent(new CustomEvent('saveDict', { 'detail': dictId }));
     });
 
     window.max.bindInlet("dumpNN", () => {
@@ -557,26 +587,37 @@ if (!DEBUG){
     });
 
     window.max.bindInlet("setNN", (...data) => {
-        window.dispatchEvent(new CustomEvent('setNN', {'detail' : data}));
+        window.dispatchEvent(new CustomEvent('setNN', { 'detail': data }));
     });
 
     window.max.bindInlet("param", (inst, paramName, val) => {
-        
+        window.dispatchEvent(new CustomEvent('param', { 'detail': [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.dispatchEvent(new CustomEvent('timesig', { 'detail': [top, bottom] }));
     });
 
     window.max.bindInlet("ticks", (val) => {
-        window.dispatchEvent(new CustomEvent('maxTicks', {'detail' : val}));
+        window.dispatchEvent(new CustomEvent('maxTicks', { 'detail': val }));
     });
 
-    window.max.bindInlet("userWave", (...points) => {
+    window.max.bindInlet("userWave", (index, ...points) => {
-        window.dispatchEvent(new CustomEvent('userWave', {'detail' : 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

@@ -4,7 +4,7 @@
 
 
 var TYPEOPTIONS = ["LFO", "Noise"];
-var SHAPETYPES = ["Sine", "SawUp", "SawDown", "Tri", "Square", "Custom"];
+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"];
@@ -22,7 +22,9 @@ function ControlType(){
     return e('select', {className: 'control-type'}, Option("LFO"));
 }
 
-
+function DataCell(element) {
+    return e('td', null, element);
+}
 
 function LfoRow(props){
 
@@ -34,34 +36,42 @@ function LfoRow(props){
     let typeOption = null;
 
     if (props.type == "LFO"){
-        typeOption = ListItem(DropDown({locked:props.locked, onChange: props.setShape, value:props.shape, options: SHAPETYPES}));
+        typeOption = DataCell(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}));
+        typeOption = DataCell(DropDown({locked:props.locked, onChange: props.setNoise, value:props.noise, options: NOISETYPES}));
     }
 
-    let content = e('ul', {className: 'lfo-item'},
+    let content = e('tr', {className: 'lfo-item'},
-        ListItem(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})),  
+        DataCell(DropDown({locked:props.locked, onChange: props.setInstanceNum, value:props.instanceNum, options: INSTANCEOPTIONS})),  
-        ListItem(DropDown({locked:props.locked, options: TYPEOPTIONS, onChange: props.setType, value:props.type})), 
+        DataCell(DropDown({locked:props.locked, options: TYPEOPTIONS, onChange: props.setType, value:props.type})), 
         typeOption,
-        ListItem(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
+        DataCell(DropDown({locked:props.locked, onChange: props.setDjParam, value: props.djParam, options: MODPARAMOPTIONS})), 
-        ListItem(e("input", {onChange:props.setFreq, value:props.freq, className:"timeInput"}, null)), 
+        DataCell(e("input", {onChange:props.setFreq, value:props.freq, className:"timeInput"}, null)), 
-        ListItem(e(NumberBox, {onChange:props.setMin, value:props.min, step:0.1}, null)),
+        DataCell(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)),
+        DataCell(e(NumberBox, {onChange:props.setMax, value:props.max, step:0.1}, null)),
-        //ListItem(e(NumberBox, {onChange:props.setAmp, value:props.amp, step:0.1}, null)), 
+        //DataCell(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)), 
+        DataCell(e(NumberBox, {onChange:props.setPhase, value:props.phase, step:0.1}, null)), 
-        ListItem(e("div", {className:"base-val"}, center.toString())),
+        DataCell(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}`})),
+        DataCell(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, locked: props.locked}, null)), 
+        DataCell(e(Button, {text:'+', onClick: props.addLfo, locked: props.locked}, null)), 
-        ListItem(e(Button, {text:'-', onClick: props.removeLfo, locked: props.locked}, null)),
+        DataCell(e(Button, {text:'-', onClick: props.removeLfo, locked: props.locked}, null)),
-        ListItem(e("div", {className:"linked"}, linkedText)),
+        DataCell(e("div", {className:"linked"}, linkedText)),
     );
     if (props.visible){
-        return content
+        return content;
     };
 }
 
-function indexWave(type, phase, userDefinedWave){
+function indexUserWave(phase, index, userDefinedWaves){
+    return parseFloat(userDefinedWaves[index][Math.floor(phase * 50)]) / 127;
+}
+
+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;
@@ -73,12 +83,18 @@ function indexWave(type, phase, userDefinedWave){
             return phase > 0.5? (1-phase) * 2 : phase * 2;
         case "Square":
             return +(phase > 0.5);
-        case "Custom":
+        case "Custom_1":
-            return parseFloat(userDefinedWave[Math.floor(phase * 50)]) / 127
+            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, typeArr, instanceNumArr, paramNames, centers, freqs, mins, maxs, waveTypes, phaseArr, noiseData, userDefinedWave, currTime, beatsInMeasure, ticks){
+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]){
             
@@ -92,7 +108,7 @@ function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, cent
             let output = 0;
             
             if (typeArr[i] == "LFO")
-                output = operateLFO(center, inst, freqs[i], mins[i], maxs[i], waveTypes[i], phaseArr, i, userDefinedWave, name, currTime, beatsInMeasure, ticks);
+                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")
@@ -101,7 +117,7 @@ function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, cent
     }
 }
 
-function operateLFO(center, inst, timeBaseStr, min, max, waveType, phaseArr, phaseIndex, userDefinedWave, name, currTime, beatsInMeasure, maxTicks){
+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;
@@ -113,7 +129,7 @@ function operateLFO(center, inst, timeBaseStr, min, max, waveType, phaseArr, pha
         phase = (currTime * timeBase + parseFloat(phaseArr[phaseIndex])) % 1.00;
     else if (phaseType === PhaseTypes.MUSICAL)
         phase = (maxTicks % timeBase) / timeBase;
-    let unscaled = indexWave(waveType, phase, userDefinedWave);
+    let unscaled = indexWave(waveType, phase, userDefinedWaves, userDefinedFunctions, userDefinedTypes);
     syncDisplay(inst, name, unscaled);
     
     return  unscaled * amp + center + parseFloat(min);
@@ -142,9 +158,6 @@ function operateNoise(center, inst, timeBaseStr, min, max, waveType, phaseArr, i
     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];
@@ -158,13 +171,11 @@ function operateNoise(center, inst, timeBaseStr, min, max, waveType, phaseArr, i
     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){

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 ] ]
+							}
+
+						}
+ ]
+				}
+
+			}
+
+		}
+
+	}
+
+}