debug function waves works now

.gitignore

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

lfogui.js

@@ -12,6 +12,7 @@ let lfos = [];
 const MAXLFOS = 20;
 const MAXENUMS = 20;
 const MAXENUMPOINTS = 10;
+const MAXUSERDEFINED = 4;
 
 
 
@@ -81,11 +82,16 @@ function MasterLfoHandler(){
 
     /// MODULATOR ARRAYS
     let userDefinedWavesBase = [];
+    let userDefinedFunctionsBase = [];
+    let userDefinedTypesBase = [0, 0, 0, 0]; //0 = wave, 1 = function
     
-    for (let i=0; i<4; i++){  
+    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'));
@@ -244,7 +250,7 @@ function MasterLfoHandler(){
         function handleTick(event) {
             let time = (Date.now() - firstUpdateTime) / 1000;
             let noiseData = {lastPhaseArr, setLastPhaseArr, cachedNoiseValueArr1, setCachedNoiseValueArr1, cachedNoiseValueArr2, setCachedNoiseValueArr2, noiseTypeArr};
-            operateModulators(modVisibleArr, modTypeArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, initPhaseArr, noiseData, userDefinedWaves, time, beatsInMeasure, ticks);
+            operateModulators(modVisibleArr, modTypeArr, modInstanceNumArr, djParamArr, modCenterVals, freqArr, minArr, maxArr, shapeArr, initPhaseArr, noiseData, userDefinedWaves, userDefinedFunctions, userDefinedTypes, time, beatsInMeasure, ticks);
         }
 
         function handleTimeSig(event) {
@@ -256,6 +262,16 @@ function MasterLfoHandler(){
             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);
         }
@@ -327,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 () => {
@@ -339,9 +357,11 @@ 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, userDefinedWaves, modCenterVals, render, beatsInMeasure, ticks]);
+    }, [...allModArrays, ...allEnumArrays, ...allEnumMats, userDefinedWaves, userDefinedFunctions, userDefinedTypes, modCenterVals, render, beatsInMeasure, ticks]);
 
 
     function CheckLinked(inst, param, checkInstArr, checkParamArr){
@@ -564,7 +584,6 @@ if (!DEBUG){
     });
 
     window.max.bindInlet("param", (inst, paramName, val) => {
-        
         window.dispatchEvent(new CustomEvent('param', {'detail' : [inst, paramName, val]}));
     });
 
@@ -580,6 +599,17 @@ if (!DEBUG){
         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'));

modulators.js

@@ -57,15 +57,20 @@ function LfoRow(props){
         ListItem(e("div", {className:"linked"}, linkedText)),
     );
     if (props.visible){
-        return content
+        return content;
     };
 }
 
 function indexUserWave(phase, index, userDefinedWaves){
-    return parseFloat(userDefinedWaves[index][Math.floor(phase * 50)]) / 127
+    return parseFloat(userDefinedWaves[index][Math.floor(phase * 50)]) / 127;
 }
 
-function indexWave(type, phase, userDefinedWaves){
+//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;
@@ -78,17 +83,17 @@ function indexWave(type, phase, userDefinedWaves){
         case "Square":
             return +(phase > 0.5);
         case "Custom_1":
-            return indexUserWave(phase, 1, userDefinedWaves);
+            return userDefinedTypes[0] == 0 ? indexUserWave(phase, 1, userDefinedWaves) : indexUserFunction(phase, 1, userDefinedFunctions);
         case "Custom_2":
-            return indexUserWave(phase, 2, userDefinedWaves);
+            return userDefinedTypes[1] == 0 ? indexUserWave(phase, 2, userDefinedWaves) : indexUserFunction(phase, 2, userDefinedFunctions);
         case "Custom_3":
-            return indexUserWave(phase, 3, userDefinedWaves);
+            return userDefinedTypes[2] == 0 ? indexUserWave(phase, 3, userDefinedWaves) : indexUserFunction(phase, 3, userDefinedFunctions);
         case "Custom_4":
-            return indexUserWave(phase, 4, userDefinedWaves);
+            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, userDefinedWaves, 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]){
             
@@ -102,7 +107,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, userDefinedWaves, 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")
@@ -111,7 +116,7 @@ function operateModulators(visibleArr, typeArr, instanceNumArr, paramNames, cent
     }
 }
 
-function operateLFO(center, inst, timeBaseStr, min, max, waveType, phaseArr, phaseIndex, userDefinedWaves, 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;
@@ -123,7 +128,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, userDefinedWaves);
+    let unscaled = indexWave(waveType, phase, userDefinedWaves, userDefinedFunctions, userDefinedTypes);
     syncDisplay(inst, name, unscaled);
     
     return  unscaled * amp + center + parseFloat(min);
@@ -151,9 +156,6 @@ function operateNoise(center, inst, timeBaseStr, min, max, waveType, phaseArr, i
         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
 
@@ -168,13 +170,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 ] ]
+							}
+
+						}
+ ]
+				}
+
+			}
+
+		}
+
+	}
+
+}