fix custom waveform additive/dots/thick

jberg · Jun 17, 2020 · a508630 · a508630
1 parent 317c6c0
commit a508630
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/equations/presetEquationRunnerWASM.js b/src/equations/presetEquationRunnerWASM.js
@@ -177,9 +177,6 @@ export default class PresetEquationRunnerWASM {
       'scaling',
       'spectrum',
       'smoothing',
-      'usedots',
-      'thick',
-      'additive',
       'r',
       'g',
       'b',

diff --git a/src/rendering/waves/customWaveform.js b/src/rendering/waves/customWaveform.js
@@ -110,13 +110,13 @@ export default class CustomWaveform {
       }
       this.samples = Math.floor(this.samples);
 
+      const baseVals = presetEquationRunner.preset.waves[this.index].baseVals;
+
       const sep = Math.floor(mdVSWaveFrame.sep);
       const scaling = mdVSWaveFrame.scaling;
       const spectrum = mdVSWaveFrame.spectrum;
       const smoothing = mdVSWaveFrame.smoothing;
-      const additive = mdVSWaveFrame.additive;
-      const usedots = mdVSWaveFrame.usedots;
-      const thick = mdVSWaveFrame.thick;
+      const usedots = baseVals.usedots;
 
       const frameR = mdVSWaveFrame.r;
       const frameG = mdVSWaveFrame.g;
@@ -203,8 +203,8 @@ export default class CustomWaveform {
           presetEquationRunner.mdVSFrameMapWaves[this.index] = mdVSNewFrameMapWave;
         } else {
           mdVSWaveFrame.usedots = usedots;
-          mdVSWaveFrame.thick = thick;
-          mdVSWaveFrame.additive = additive;
+          mdVSWaveFrame.thick = baseVals.thick;
+          mdVSWaveFrame.additive = baseVals.additive;
         }
 
         this.mdVSWaveFrame = mdVSWaveFrame;