@grame/faustwasm 0.3.0 → 0.3.2

package/0001-Invert-x-y-z-accelerometer-on-Android.patch

@@ -0,0 +1,194 @@
+From 401272a08a44c5c7bc8a33db920fe3bd7a246241 Mon Sep 17 00:00:00 2001
+From: Stephane Letz <letz@grame.fr>
+Date: Mon, 17 Jun 2024 18:04:39 +0200
+Subject: [PATCH] Invert x,y,z accelerometer on Android.
+
+---
+ src/FaustAudioWorkletNode.ts      | 26 +++++++++++++++++++-------
+ src/FaustAudioWorkletProcessor.ts |  6 +++---
+ src/FaustOfflineProcessor.ts      |  8 ++++----
+ src/FaustScriptProcessorNode.ts   | 24 +++++++++++++++++-------
+ src/FaustWebAudioDsp.ts           | 19 +++++++++++++------
+ 5 files changed, 56 insertions(+), 27 deletions(-)
+
+diff --git a/src/FaustAudioWorkletNode.ts b/src/FaustAudioWorkletNode.ts
+index efbb741..ca64f0b 100644
+--- a/src/FaustAudioWorkletNode.ts
++++ b/src/FaustAudioWorkletNode.ts
+@@ -75,11 +75,23 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
+     /** Setup accelerometer and gyroscope handlers */
+     async listenSensors() {
+         if (this.hasAccInput) {
+-            const handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+-                if (!accelerationIncludingGravity) return;
+-                const { x, y, z } = accelerationIncludingGravity;
+-                this.propagateAcc({ x, y, z });
+-            };
++            const isAndroid: boolean = /Android/i.test(navigator.userAgent);
++            console.log(navigator.userAgent);
++            console.log(isAndroid);
++            let handleDeviceMotion = null;
++            if (isAndroid) {
++                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
++                    if (!accelerationIncludingGravity) return;
++                    const { x, y, z } = accelerationIncludingGravity;
++                    this.propagateAcc({ x, y, z }, true);
++                }
++            } else {
++                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
++                    if (!accelerationIncludingGravity) return;
++                    const { x, y, z } = accelerationIncludingGravity;
++                    this.propagateAcc({ x, y, z });
++                }
++            }
+             if (window.DeviceMotionEvent) {
+                 if (typeof (window.DeviceMotionEvent as any).requestPermission === "function") { // for iOS 13+
+                     try {
+@@ -185,9 +197,9 @@ export class FaustAudioWorkletNode<Poly extends boolean = false> extends (global
+     }
+ 
+     get hasAccInput() { return this.#hasAccInput; }
+-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
++    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
+         if (!accelerationIncludingGravity) return;
+-        const e = { type: "acc", data: accelerationIncludingGravity };
++        const e = { type: "acc", data: accelerationIncludingGravity, invert: invert };
+         this.port.postMessage(e);
+     }
+ 
+diff --git a/src/FaustAudioWorkletProcessor.ts b/src/FaustAudioWorkletProcessor.ts
+index 2b9be9a..1eba4e2 100644
+--- a/src/FaustAudioWorkletProcessor.ts
++++ b/src/FaustAudioWorkletProcessor.ts
+@@ -127,7 +127,7 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
+             switch (msg.type) {
+                 // Sensors messages
+                 case "acc": {
+-                    this.propagateAcc(msg.data);
++                    this.propagateAcc(msg.data, msg.invert);
+                     break;
+                 }
+                 case "gyr": {
+@@ -197,8 +197,8 @@ const getFaustAudioWorkletProcessor = <Poly extends boolean = false>(dependencie
+             this.fDSPCode.pitchWheel(channel, wheel);
+         }
+ 
+-        protected propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
+-            this.fDSPCode.propagateAcc(accelerationIncludingGravity);
++        protected propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
++            this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
+         }
+ 
+         protected propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">) {
+diff --git a/src/FaustOfflineProcessor.ts b/src/FaustOfflineProcessor.ts
+index b08414a..d3d6d91 100644
+--- a/src/FaustOfflineProcessor.ts
++++ b/src/FaustOfflineProcessor.ts
+@@ -8,8 +8,8 @@ export interface IFaustOfflineProcessor extends IFaustBaseWebAudioDsp {
+     render(inputs?: Float32Array[], length?: number, onUpdate?: (sample: number) => any): Float32Array[];
+ }
+ 
+-export interface IFaustMonoOfflineProcessor extends IFaustOfflineProcessor, IFaustMonoWebAudioDsp {}
+-export interface IFaustPolyOfflineProcessor extends IFaustOfflineProcessor, IFaustPolyWebAudioDsp {}
++export interface IFaustMonoOfflineProcessor extends IFaustOfflineProcessor, IFaustMonoWebAudioDsp { }
++export interface IFaustPolyOfflineProcessor extends IFaustOfflineProcessor, IFaustPolyWebAudioDsp { }
+ 
+ export class FaustOfflineProcessor<Poly extends boolean = false> {
+     protected fDSPCode!: Poly extends true ? FaustPolyWebAudioDsp : FaustMonoWebAudioDsp;
+@@ -82,8 +82,8 @@ export class FaustOfflineProcessor<Poly extends boolean = false> {
+     destroy() { this.fDSPCode.destroy(); }
+ 
+     get hasAccInput() { return this.fDSPCode.hasAccInput; }
+-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
+-        this.fDSPCode.propagateAcc(accelerationIncludingGravity);
++    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
++        this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
+     }
+ 
+     get hasGyrInput() { return this.fDSPCode.hasGyrInput; }
+diff --git a/src/FaustScriptProcessorNode.ts b/src/FaustScriptProcessorNode.ts
+index 0c73ae8..36ce3b3 100644
+--- a/src/FaustScriptProcessorNode.ts
++++ b/src/FaustScriptProcessorNode.ts
+@@ -39,11 +39,21 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
+     /** Setup accelerometer and gyroscope handlers */
+     async listenSensors() {
+         if (this.hasAccInput) {
+-            const handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
+-                if (!accelerationIncludingGravity) return;
+-                const { x, y, z } = accelerationIncludingGravity;
+-                this.propagateAcc({ x, y, z });
+-            };
++            const isAndroid: boolean = /Android/i.test(navigator.userAgent);
++            let handleDeviceMotion = null;
++            if (isAndroid) {
++                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
++                    if (!accelerationIncludingGravity) return;
++                    const { x, y, z } = accelerationIncludingGravity;
++                    this.propagateAcc({ x, y, z }, true);
++                }
++            } else {
++                handleDeviceMotion = ({ accelerationIncludingGravity }: DeviceMotionEvent) => {
++                    if (!accelerationIncludingGravity) return;
++                    const { x, y, z } = accelerationIncludingGravity;
++                    this.propagateAcc({ x, y, z });
++                }
++            }
+             if (window.DeviceMotionEvent) {
+                 if (typeof (window.DeviceMotionEvent as any).requestPermission === "function") { // for iOS 13+
+                     try {
+@@ -120,8 +130,8 @@ export class FaustScriptProcessorNode<Poly extends boolean = false> extends (glo
+     destroy() { this.fDSPCode.destroy(); }
+ 
+     get hasAccInput() { return this.fDSPCode.hasAccInput; }
+-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
+-        this.fDSPCode.propagateAcc(accelerationIncludingGravity);
++    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
++        this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
+     }
+ 
+     get hasGyrInput() { return this.fDSPCode.hasGyrInput; }
+diff --git a/src/FaustWebAudioDsp.ts b/src/FaustWebAudioDsp.ts
+index b3e728f..c225d11 100644
+--- a/src/FaustWebAudioDsp.ts
++++ b/src/FaustWebAudioDsp.ts
+@@ -514,7 +514,7 @@ export interface IFaustBaseWebAudioDsp {
+     /** Indicating if the DSP handles the accelerometer */
+     readonly hasAccInput: boolean;
+     /** Accelerometer handling */
+-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
++    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean): void;
+ 
+     /** Indicating if the DSP handles the gyroscope */
+     readonly hasGyrInput: boolean;
+@@ -687,15 +687,22 @@ export class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
+     }
+ 
+     get hasAccInput() { return this.fAcc.x.length + this.fAcc.y.length + this.fAcc.z.length > 0; }
+-    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>) {
++    propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean = false) {
+ 
+         // Get accelerometervalues
+         const { x, y, z } = accelerationIncludingGravity;
+ 
+-        // Call the accelerometer handlers
+-        if (x !== null) this.fAcc.x.forEach(handler => handler(x));
+-        if (y !== null) this.fAcc.y.forEach(handler => handler(y));
+-        if (z !== null) this.fAcc.z.forEach(handler => handler(z));
++        if (invert) {
++            // Call the accelerometer handlers
++            if (x !== null) this.fAcc.x.forEach(handler => handler(-x));
++            if (y !== null) this.fAcc.y.forEach(handler => handler(-y));
++            if (z !== null) this.fAcc.z.forEach(handler => handler(-z));
++        } else {
++            // Call the accelerometer handlers
++            if (x !== null) this.fAcc.x.forEach(handler => handler(x));
++            if (y !== null) this.fAcc.y.forEach(handler => handler(y));
++            if (z !== null) this.fAcc.z.forEach(handler => handler(z));
++        }
+     }
+ 
+     get hasGyrInput() { return this.fGyr.x.length + this.fGyr.y.length + this.fGyr.z.length > 0; }
+-- 
+2.37.1 (Apple Git-137.1)
+

package/assets/standalone/faustwasm/index.d.ts

@@ -635,7 +635,7 @@ export interface IFaustBaseWebAudioDsp {
 	/** Indicating if the DSP handles the accelerometer */
 	readonly hasAccInput: boolean;
 	/** Accelerometer handling */
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert: boolean): void;
 	/** Indicating if the DSP handles the gyroscope */
 	readonly hasGyrInput: boolean;
 	/** Gyroscope handling */
@@ -724,7 +724,7 @@ export declare class FaustBaseWebAudioDsp implements IFaustBaseWebAudioDsp {
 	/** Split the soundfile names and return an array of names */
 	static splitSoundfileNames(input: string): string[];
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 	/** Build the accelerometer handler */
@@ -1123,7 +1123,7 @@ export declare class FaustOfflineProcessor<Poly extends boolean = false> {
 	stop(): void;
 	destroy(): void;
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 	/**
@@ -1278,7 +1278,7 @@ export declare class FaustAudioWorkletNode<Poly extends boolean = false> extends
 	protected fDescriptor: FaustUIInputItem[];
 	constructor(context: BaseAudioContext, name: string, factory: LooseFaustDspFactory, options: FaustAudioWorkletNodeOptions<Poly>["processorOptions"], nodeOptions?: Partial<FaustAudioWorkletNodeOptions>);
 	/** Setup accelerometer and gyroscope handlers */
-	listenMotion(): Promise<void>;
+	listenSensors(): Promise<void>;
 	setOutputParamHandler(handler: OutputParamHandler | null): void;
 	getOutputParamHandler(): OutputParamHandler | null;
 	setComputeHandler(handler: ComputeHandler | null): void;
@@ -1293,7 +1293,7 @@ export declare class FaustAudioWorkletNode<Poly extends boolean = false> extends
 	ctrlChange(channel: number, ctrl: number, value: number): void;
 	pitchWheel(channel: number, wheel: number): void;
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 	setParamValue(path: string, value: number): void;
@@ -1341,7 +1341,7 @@ export declare class FaustScriptProcessorNode<Poly extends boolean = false> exte
 	protected fOutputs: Float32Array[];
 	init(instance: Poly extends true ? FaustPolyWebAudioDsp : FaustMonoWebAudioDsp): void;
 	/** Setup accelerometer and gyroscope handlers */
-	listenMotion(): Promise<void>;
+	listenSensors(): Promise<void>;
 	compute(input: Float32Array[], output: Float32Array[]): boolean;
 	setOutputParamHandler(handler: OutputParamHandler): void;
 	getOutputParamHandler(): OutputParamHandler | null;
@@ -1366,7 +1366,7 @@ export declare class FaustScriptProcessorNode<Poly extends boolean = false> exte
 	stop(): void;
 	destroy(): void;
 	get hasAccInput(): boolean;
-	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>): void;
+	propagateAcc(accelerationIncludingGravity: NonNullable<DeviceMotionEvent["accelerationIncludingGravity"]>, invert?: boolean): void;
 	get hasGyrInput(): boolean;
 	propagateGyr(event: Pick<DeviceOrientationEvent, "alpha" | "beta" | "gamma">): void;
 }

package/assets/standalone/faustwasm/index.js

@@ -138,7 +138,7 @@ var getFaustAudioWorkletProcessor = (dependencies, faustData, register = true) =
       const msg = e.data;
       switch (msg.type) {
         case "acc": {
-          this.propagateAcc(msg.data);
+          this.propagateAcc(msg.data, msg.invert);
           break;
         }
         case "gyr": {
@@ -199,8 +199,8 @@ var getFaustAudioWorkletProcessor = (dependencies, faustData, register = true) =
     pitchWheel(channel, wheel) {
       this.fDSPCode.pitchWheel(channel, wheel);
     }
-    propagateAcc(accelerationIncludingGravity) {
-      this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+    propagateAcc(accelerationIncludingGravity, invert = false) {
+      this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
     }
     propagateGyr(event) {
       this.fDSPCode.propagateGyr(event);
@@ -2103,14 +2103,23 @@ var FaustBaseWebAudioDsp = class _FaustBaseWebAudioDsp {
   get hasAccInput() {
     return this.fAcc.x.length + this.fAcc.y.length + this.fAcc.z.length > 0;
   }
-  propagateAcc(accelerationIncludingGravity) {
+  propagateAcc(accelerationIncludingGravity, invert = false) {
     const { x, y, z } = accelerationIncludingGravity;
-    if (x !== null)
-      this.fAcc.x.forEach((handler) => handler(x));
-    if (y !== null)
-      this.fAcc.y.forEach((handler) => handler(y));
-    if (z !== null)
-      this.fAcc.z.forEach((handler) => handler(z));
+    if (invert) {
+      if (x !== null)
+        this.fAcc.x.forEach((handler) => handler(-x));
+      if (y !== null)
+        this.fAcc.y.forEach((handler) => handler(-y));
+      if (z !== null)
+        this.fAcc.z.forEach((handler) => handler(-z));
+    } else {
+      if (x !== null)
+        this.fAcc.x.forEach((handler) => handler(x));
+      if (y !== null)
+        this.fAcc.y.forEach((handler) => handler(y));
+      if (z !== null)
+        this.fAcc.z.forEach((handler) => handler(z));
+    }
   }
   get hasGyrInput() {
     return this.fGyr.x.length + this.fGyr.y.length + this.fGyr.z.length > 0;
@@ -2970,8 +2979,8 @@ var FaustOfflineProcessor = class {
   get hasAccInput() {
     return this.fDSPCode.hasAccInput;
   }
-  propagateAcc(accelerationIncludingGravity) {
-    this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+  propagateAcc(accelerationIncludingGravity, invert = false) {
+    this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
   }
   get hasGyrInput() {
     return this.fDSPCode.hasGyrInput;
@@ -3647,14 +3656,27 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
   }
   // Public API
   /** Setup accelerometer and gyroscope handlers */
-  async listenMotion() {
+  async listenSensors() {
     if (this.hasAccInput) {
-      const handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-        if (!accelerationIncludingGravity)
-          return;
-        const { x, y, z } = accelerationIncludingGravity;
-        this.propagateAcc({ x, y, z });
-      };
+      const isAndroid = /Android/i.test(navigator.userAgent);
+      console.log(navigator.userAgent);
+      console.log(isAndroid);
+      let handleDeviceMotion = null;
+      if (isAndroid) {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z }, true);
+        };
+      } else {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z });
+        };
+      }
       if (window.DeviceMotionEvent) {
         if (typeof window.DeviceMotionEvent.requestPermission === "function") {
           try {
@@ -3755,10 +3777,10 @@ var FaustAudioWorkletNode = class extends (globalThis.AudioWorkletNode || null)
   get hasAccInput() {
     return __privateGet(this, _hasAccInput);
   }
-  propagateAcc(accelerationIncludingGravity) {
+  propagateAcc(accelerationIncludingGravity, invert = false) {
     if (!accelerationIncludingGravity)
       return;
-    const e = { type: "acc", data: accelerationIncludingGravity };
+    const e = { type: "acc", data: accelerationIncludingGravity, invert };
     this.port.postMessage(e);
   }
   get hasGyrInput() {
@@ -3905,14 +3927,25 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
   }
   // Public API
   /** Setup accelerometer and gyroscope handlers */
-  async listenMotion() {
+  async listenSensors() {
     if (this.hasAccInput) {
-      const handleDeviceMotion = ({ accelerationIncludingGravity }) => {
-        if (!accelerationIncludingGravity)
-          return;
-        const { x, y, z } = accelerationIncludingGravity;
-        this.propagateAcc({ x, y, z });
-      };
+      const isAndroid = /Android/i.test(navigator.userAgent);
+      let handleDeviceMotion = null;
+      if (isAndroid) {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z }, true);
+        };
+      } else {
+        handleDeviceMotion = ({ accelerationIncludingGravity }) => {
+          if (!accelerationIncludingGravity)
+            return;
+          const { x, y, z } = accelerationIncludingGravity;
+          this.propagateAcc({ x, y, z });
+        };
+      }
       if (window.DeviceMotionEvent) {
         if (typeof window.DeviceMotionEvent.requestPermission === "function") {
           try {
@@ -4023,8 +4056,8 @@ var FaustScriptProcessorNode = class extends (globalThis.ScriptProcessorNode ||
   get hasAccInput() {
     return this.fDSPCode.hasAccInput;
   }
-  propagateAcc(accelerationIncludingGravity) {
-    this.fDSPCode.propagateAcc(accelerationIncludingGravity);
+  propagateAcc(accelerationIncludingGravity, invert = false) {
+    this.fDSPCode.propagateAcc(accelerationIncludingGravity, invert);
   }
   get hasGyrInput() {
     return this.fDSPCode.hasGyrInput;