Merge branch 'main' of github.com:Bubobubobubobubo/Topos

Bubobubobubobubo · Nov 14, 2023 · 9dc6456 · 9dc6456
2 parents 3b6f02b + 5802f68
commit 9dc6456
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 48 deletions.
diff --git a/dev-dist/sw.js b/dev-dist/sw.js
diff --git a/src/classes/SoundEvent.ts b/src/classes/SoundEvent.ts
@@ -254,7 +254,7 @@ export class SoundEvent extends AudibleEvent {
     roomfade: ["roomfade", "rfade"],
     roomlp: ["roomlp", "rlp"],
     roomdim: ["roomdim", "rdim"],
-    sound: ["sound", "s"],
+    sound: ["s","sound"],
     size: (value: number) => {
       this.updateValue("roomsize", value);
       return this;
@@ -435,8 +435,15 @@ export class SoundEvent extends AudibleEvent {
     const events = objectWithArraysToArrayOfObjects(this.values, [
       "parsedScale",
     ]);
+
     for (const event of events) {
-      superdough(event, this.nudge - this.app.clock.deviation, event.dur);
+      // Filter non superdough parameters
+      // TODO: Should filter relevant fields for superdough
+      // const filteredEvent = filterObject(event, ["analyze","note","dur","freq","s"]);
+      const filteredEvent = event;
+      // No need for note if there is freq
+      if(filteredEvent.freq) { delete filteredEvent.note; }
+      superdough(filteredEvent, this.nudge - this.app.clock.deviation, filteredEvent.dur);
     }
   };
 }