git push origin developMerge branch 'frostburn-develop' into develop

SeanArchibald · Mar 31, 2022 · 58ff58b · 58ff58b
2 parents 4f3b27a + 91bd17d
commit 58ff58b
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/js/synth/Synth.js b/src/js/synth/Synth.js
@@ -30,36 +30,32 @@ class Synth {
       // set up custom waveforms
       this.custom_waveforms = {
         warm1: this.audioCtx.createPeriodicWave(
-          new Float32Array([0, 1, 0.2, 0.2, 0.2, 0.1, 0.1, 0.05]),
-          new Float32Array([0, 0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0])
+          new Float32Array([0, 10, 2, 2, 2, 1, 1, 0.5]),
+          new Float32Array([0, 0, 0, 0, 0, 0, 0, 0])
         ),
         warm2: this.audioCtx.createPeriodicWave(
-          new Float32Array([0, 1, 0.5, 0.333, 0.2, 0.1]),
-          new Float32Array([0, 0, 0.0, 0.0, 0.0, 0.0])
+          new Float32Array([0, 10, 5, 3.33, 2, 1]),
+          new Float32Array([0, 0, 0, 0, 0, 0])
         ),
         warm3: this.audioCtx.createPeriodicWave(
-          new Float32Array([0, 1, 0.5, 0.5, 0.3]),
-          new Float32Array([0, 0, 0.0, 0.0, 0.0])
+          new Float32Array([0, 10, 5, 5, 3]),
+          new Float32Array([0, 0, 0, 0, 0])
         ),
         warm4: this.audioCtx.createPeriodicWave(
-          new Float32Array([0, 1, 0.2, 0.2, 0.1]),
-          new Float32Array([0, 0, 0.0, 0.0, 0.0])
+          new Float32Array([0, 10, 2, 2, 1]),
+          new Float32Array([0, 0, 0, 0, 0])
         ),
         octaver: this.audioCtx.createPeriodicWave(
-          new Float32Array([0, 1, 0.5, 0, 0.333, 0, 0, 0, 0.25, 0, 0, 0, 0, 0, 0, 0, 0.166]),
+          new Float32Array([0, 1000, 500, 0, 333, 0, 0, 0, 250, 0, 0, 0, 0, 0, 0, 0, 166]),
           new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
         ),
         brightness: this.audioCtx.createPeriodicWave(
-          new Float32Array([
-            0, 1, 0, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.3, 0.1, 0.1, 0.1, 0.1, 0.1
-          ]),
-          new Float32Array([
-            0, 0, 0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
-          ])
+          new Float32Array([0, 10, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 0.75, 0.5, 0.2, 0.1]),
+          new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
         ),
         harmonicbell: this.audioCtx.createPeriodicWave(
-          new Float32Array([0, 1, 0.2, 0.2, 0.2, 0.2, 0, 0, 0, 0, 0, 0.7]),
-          new Float32Array([0, 0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0, 0, 0, 0])
+          new Float32Array([0, 10, 2, 2, 2, 2, 0, 0, 0, 0, 0, 7]),
+          new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])
         ),
         semisine: this.audioCtx.createPeriodicWave(
           new Float32Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]),