@woosh/meep-engine 3.45.0 → 3.47.0

package/src/engine/sound/sopra/definition/effect/EqEffect.js

@@ -1,128 +1,146 @@
-import { combine_hash } from "../../../../../core/collection/array/combine_hash.js";
-import { computeHashFloat } from "../../../../../core/primitives/numbers/computeHashFloat.js";
-import { AbstractAudioEffect } from "./AbstractAudioEffect.js";
-
-/**
- * Filter type, mapped to a WebAudio {@link BiquadFilterType}.
- * @enum {number}
- */
-export const EqFilterType = {
-    Lowpass: 0,
-    Highpass: 1,
-    Bandpass: 2,
-    Lowshelf: 3,
-    Highshelf: 4,
-    Peaking: 5,
-    Notch: 6,
-    Allpass: 7
-};
-
-/**
- * @type {string[]}
- */
-const EQ_FILTER_TYPE_TO_BIQUAD = [
-    'lowpass', 'highpass', 'bandpass', 'lowshelf', 'highshelf', 'peaking', 'notch', 'allpass'
-];
-
-/**
- * Equalizer / filter bus insert, backed by a {@link BiquadFilterNode}.
- */
-export class EqEffect extends AbstractAudioEffect {
-
-    /**
-     * @type {EqFilterType|number}
-     */
-    filterType = EqFilterType.Peaking;
-
-    /**
-     * Cutoff/center frequency in Hz.
-     * @type {number}
-     */
-    frequency = 350;
-
-    /**
-     * Quality factor.
-     * @type {number}
-     */
-    Q = 1;
-
-    /**
-     * Boost/cut in decibels (only used by peaking / shelf filters).
-     * @type {number}
-     */
-    gainDb = 0;
-
-    /**
-     *
-     * @param {{filterType?:EqFilterType|number, frequency?:number, Q?:number, gainDb?:number}} [options]
-     * @returns {EqEffect}
-     */
-    static from({ filterType = EqFilterType.Peaking, frequency = 350, Q = 1, gainDb = 0 } = {}) {
-        const r = new EqEffect();
-
-        r.filterType = filterType;
-        r.frequency = frequency;
-        r.Q = Q;
-        r.gainDb = gainDb;
-
-        return r;
-    }
-
-    /**
-     * @param {BaseAudioContext} ctx
-     * @returns {{input: AudioNode, output: AudioNode}}
-     */
-    build(ctx) {
-        const node = ctx.createBiquadFilter();
-
-        node.type = EQ_FILTER_TYPE_TO_BIQUAD[this.filterType] ?? 'peaking';
-        node.frequency.value = this.frequency;
-        node.Q.value = this.Q;
-        node.gain.value = this.gainDb;
-
-        return { input: node, output: node };
-    }
-
-    /**
-     *
-     * @param {EqEffect} other
-     * @returns {boolean}
-     */
-    equals(other) {
-        return this.filterType === other.filterType
-            && this.frequency === other.frequency
-            && this.Q === other.Q
-            && this.gainDb === other.gainDb;
-    }
-
-    hash() {
-        return combine_hash(
-            this.filterType,
-            computeHashFloat(this.frequency),
-            computeHashFloat(this.Q),
-            computeHashFloat(this.gainDb)
-        );
-    }
-
-    clone() {
-        return EqEffect.from(this);
-    }
-
-    toJSON() {
-        return {
-            filterType: this.filterType,
-            frequency: this.frequency,
-            Q: this.Q,
-            gainDb: this.gainDb
-        };
-    }
-
-    fromJSON({ filterType = EqFilterType.Peaking, frequency = 350, Q = 1, gainDb = 0 }) {
-        this.filterType = filterType;
-        this.frequency = frequency;
-        this.Q = Q;
-        this.gainDb = gainDb;
-    }
-}
-
-EqEffect.typeName = "SopraEqEffect";
+import { hash_mix2 } from "../../../../../core/math/hash/hash_mix2.js";
+import { hash_mix3 } from "../../../../../core/math/hash/hash_mix3.js";
+import { computeHashFloat } from "../../../../../core/primitives/numbers/computeHashFloat.js";
+import { AbstractAudioEffect } from "./AbstractAudioEffect.js";
+
+/**
+ * @typedef {import("./AbstractAudioEffect.js").BuiltAudioEffect} BuiltAudioEffect
+ */
+
+/**
+ * Filter type, mapped to a WebAudio {@link BiquadFilterType}.
+ * @enum {number}
+ */
+export const EqFilterType = {
+    Lowpass: 0,
+    Highpass: 1,
+    Bandpass: 2,
+    Lowshelf: 3,
+    Highshelf: 4,
+    Peaking: 5,
+    Notch: 6,
+    Allpass: 7
+};
+
+/**
+ * @type {string[]}
+ */
+const EQ_FILTER_TYPE_TO_BIQUAD = [
+    'lowpass', 'highpass', 'bandpass', 'lowshelf', 'highshelf', 'peaking', 'notch', 'allpass'
+];
+
+/**
+ * Equalizer / filter insert (on a bus or an event), backed by a {@link BiquadFilterNode}.
+ */
+export class EqEffect extends AbstractAudioEffect {
+
+    /**
+     * @type {EqFilterType|number}
+     */
+    filterType = EqFilterType.Peaking;
+
+    /**
+     * Cutoff/center frequency in Hz.
+     * @type {number}
+     */
+    frequency = 350;
+
+    /**
+     * Quality factor.
+     * @type {number}
+     */
+    Q = 1;
+
+    /**
+     * Boost/cut in decibels (only used by peaking / shelf filters).
+     * @type {number}
+     */
+    gainDb = 0;
+
+    /**
+     *
+     * @param {{filterType?:EqFilterType|number, frequency?:number, Q?:number, gainDb?:number}} [options]
+     * @returns {EqEffect}
+     */
+    static from({ filterType = EqFilterType.Peaking, frequency = 350, Q = 1, gainDb = 0 } = {}) {
+        const r = new EqEffect();
+
+        r.filterType = filterType;
+        r.frequency = frequency;
+        r.Q = Q;
+        r.gainDb = gainDb;
+
+        return r;
+    }
+
+    /**
+     * @param {BaseAudioContext} ctx
+     * @returns {BuiltAudioEffect}
+     */
+    build(ctx) {
+        const node = ctx.createBiquadFilter();
+
+        node.type = EQ_FILTER_TYPE_TO_BIQUAD[this.filterType] ?? 'peaking';
+        node.frequency.value = this.frequency;
+        node.Q.value = this.Q;
+        node.gain.value = this.gainDb;
+
+        return {
+            input: node,
+            output: node,
+            params: [node.frequency, node.Q, node.gain]
+        };
+    }
+
+    /**
+     *
+     * @param {EqEffect} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        return this.filterType === other.filterType
+            && this.frequency === other.frequency
+            && this.Q === other.Q
+            && this.gainDb === other.gainDb;
+    }
+
+    hash() {
+        return hash_mix2(
+            hash_mix3(
+                this.filterType,
+                computeHashFloat(this.frequency),
+                computeHashFloat(this.Q)
+            ),
+            computeHashFloat(this.gainDb)
+        );
+    }
+
+    clone() {
+        return EqEffect.from(this);
+    }
+
+    toJSON() {
+        return {
+            filterType: this.filterType,
+            frequency: this.frequency,
+            Q: this.Q,
+            gainDb: this.gainDb
+        };
+    }
+
+    fromJSON({ filterType = EqFilterType.Peaking, frequency = 350, Q = 1, gainDb = 0 }) {
+        this.filterType = filterType;
+        this.frequency = frequency;
+        this.Q = Q;
+        this.gainDb = gainDb;
+    }
+}
+
+EqEffect.typeName = "SopraEqEffect";
+
+/**
+ * What a built EQ can move while it plays. The filter TYPE is structure, not a parameter.
+ * @readonly
+ * @type {string[]}
+ */
+EqEffect.parameters = ['frequency', 'Q', 'gainDb'];

package/src/engine/sound/sopra/definition/effect/ReverbEffect.d.ts

@@ -48,5 +48,6 @@ export class ReverbEffect extends AbstractAudioEffect {
 export namespace ReverbEffect {
     let typeName: string;
 }
+export type BuiltAudioEffect = import("./AbstractAudioEffect.js").BuiltAudioEffect;
 import { AbstractAudioEffect } from "./AbstractAudioEffect.js";
 //# sourceMappingURL=ReverbEffect.d.ts.map

package/src/engine/sound/sopra/definition/effect/ReverbEffect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReverbEffect.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/sound/sopra/definition/effect/ReverbEffect.js"],"names":[],"mappings":"AAmBA;;;;;;;;;;;GAWG;AACH;IAcI;;;OAGG;IACH,2CAHW;QAAC,YAAY,CAAC,EAAC,MAAM,CAAC;QAAC,UAAU,CAAC,EAAC,MAAM,CAAA;KAAC,GACxC,YAAY,CASxB;IAvBD;;;OAGG;IACH,cAFU,MAAM,CAEG;IAEnB;;;OAGG;IACH,YAFU,MAAM,CAED;IAoCf;;;OAGG;IACH,cAHW,YAAY,GACV,OAAO,CAKnB;IAED,eAKC;IAED,sBAEC;IAED;;;MAKC;IAED;;;aAGC;CACJ;;;;oCA1GmC,0BAA0B"}
+{"version":3,"file":"ReverbEffect.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/sound/sopra/definition/effect/ReverbEffect.js"],"names":[],"mappings":"AAuBA;;;;;;;;;;;GAWG;AACH;IAcI;;;OAGG;IACH,2CAHW;QAAC,YAAY,CAAC,EAAC,MAAM,CAAC;QAAC,UAAU,CAAC,EAAC,MAAM,CAAA;KAAC,GACxC,YAAY,CASxB;IAvBD;;;OAGG;IACH,cAFU,MAAM,CAEG;IAEnB;;;OAGG;IACH,YAFU,MAAM,CAED;IAqCf;;;OAGG;IACH,cAHW,YAAY,GACV,OAAO,CAKnB;IAED,eAKC;IAED,sBAEC;IAED;;;MAKC;IAED;;;aAGC;CACJ;;;;+BA5GY,OAAO,0BAA0B,EAAE,gBAAgB;oCAH5B,0BAA0B"}

package/src/engine/sound/sopra/definition/effect/ReverbEffect.js

@@ -1,9 +1,13 @@
-import { combine_hash } from "../../../../../core/collection/array/combine_hash.js";
+import { hash_mix2 } from "../../../../../core/math/hash/hash_mix2.js";
 import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
 import { computeHashFloat } from "../../../../../core/primitives/numbers/computeHashFloat.js";
 import { reverbImpulseResponse } from "../../../simulation/render/reverbImpulseResponse.js";
 import { AbstractAudioEffect } from "./AbstractAudioEffect.js";
 
+/**
+ * @typedef {import("./AbstractAudioEffect.js").BuiltAudioEffect} BuiltAudioEffect
+ */
+
 /**
  * Seed for the procedural impulse response. Fixed (not authorable): the IR is a decaying noise tail whose
  * audible character comes entirely from `decaySeconds`/`decayPower`, so the noise realisation carries no
@@ -58,7 +62,8 @@ export class ReverbEffect extends AbstractAudioEffect {
 
     /**
      * @param {BaseAudioContext} ctx
-     * @returns {{input: AudioNode, output: AudioNode}}
+     * @returns {BuiltAudioEffect} no params: the tail is baked into the impulse response at build, so
+     *          {@link ReverbEffect.parameters} is empty (inherited)
      */
     build(ctx) {
         const convolver = ctx.createConvolver();
@@ -87,7 +92,7 @@ export class ReverbEffect extends AbstractAudioEffect {
     }
 
     hash() {
-        return combine_hash(
+        return hash_mix2(
             computeHashFloat(this.decaySeconds),
             computeHashFloat(this.decayPower)
         );

package/src/engine/sound/sopra/legacy/SoundEmitter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SoundEmitter.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/sound/sopra/legacy/SoundEmitter.js"],"names":[],"mappings":"AAkBA;;;;;;;GAOG;AACH;IAqTI;;;;OAIG;IACH,4BAFa,YAAY,CAQxB;IA7TD;;;OAGG;IACH,iBAFU,KAAK,UAAU,CAAC,CAEN;IAEpB;;;;;OAKG;IACH,SAFU,SAAO,IAAI,CAEK;IAE1B;;;;OAIG;IACH,sBAAkB;IAElB;;;;OAIG;IACH,sBAAsB;IAEtB;;;OAGG;IACH,cAFU,qBAAqB,CAEW;IAE1C;;;OAGG;IACH,aAFU,wBAAwB,GAAC,MAAM,CAEI;IAE7C;;;OAGG;IACH,OAFU,MAAM,GAAC,iBAAiB,CAExB;IAEV;;;OAGG;IACH,QAFU,OAAO,CAEO;IAExB;;;;OAIG;IACH,eAHW,YAAY,UAqDtB;IAGD;;;;OAIG;IACH,cAHW,MAAM,GAAC,iBAAiB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,iBAAiB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,iBAAiB,SACxB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,GAAC,iBAAiB,GACtB,OAAO,CAInB;IAGD;;;OAGG;IACH,6BAEC;IAED;;;OAGG;IACH,4BAEC;IAED;;;OAGG;IACH,cAFW,YAAY,GADV,OAAO,CAWnB;IAED;;;OAGG;IACH,QAFY,MAAM,CAWjB;IAUD;;OAEG;IACH,2BAEC;IAbD;;;OAGG;IACH,0BAEC;IAiBD;;OAEG;IACH,2BAEC;IAbD;;;OAGG;IACH,0BAEC;IASD;;;;;;;;;;MAYC;IAED,0BA+DC;CAeJ;;;;iBA1VgB,0CAA0C;2BAUhC,iBAAiB;sCADN,4BAA4B;yCAFzB,+BAA+B;kCACtC,wBAAwB;oBAPtC,kCAAkC"}
+{"version":3,"file":"SoundEmitter.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/sound/sopra/legacy/SoundEmitter.js"],"names":[],"mappings":"AAmBA;;;;;;;GAOG;AACH;IAyTI;;;;OAIG;IACH,4BAFa,YAAY,CAQxB;IAjUD;;;OAGG;IACH,iBAFU,KAAK,UAAU,CAAC,CAEN;IAEpB;;;;;OAKG;IACH,SAFU,SAAO,IAAI,CAEK;IAE1B;;;;OAIG;IACH,sBAAkB;IAElB;;;;OAIG;IACH,sBAAsB;IAEtB;;;OAGG;IACH,cAFU,qBAAqB,CAEW;IAE1C;;;OAGG;IACH,aAFU,wBAAwB,GAAC,MAAM,CAEI;IAE7C;;;OAGG;IACH,OAFU,MAAM,GAAC,iBAAiB,CAExB;IAEV;;;OAGG;IACH,QAFU,OAAO,CAEO;IAExB;;;;OAIG;IACH,eAHW,YAAY,UAqDtB;IAGD;;;;OAIG;IACH,cAHW,MAAM,GAAC,iBAAiB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,iBAAiB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,GAAC,iBAAiB,SACxB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,GAAC,iBAAiB,GACtB,OAAO,CAInB;IAGD;;;OAGG;IACH,6BAEC;IAED;;;OAGG;IACH,4BAEC;IAED;;;OAGG;IACH,cAFW,YAAY,GADV,OAAO,CAWnB;IAED;;;OAGG;IACH,QAFY,MAAM,CAejB;IAUD;;OAEG;IACH,2BAEC;IAbD;;;OAGG;IACH,0BAEC;IAiBD;;OAEG;IACH,2BAEC;IAbD;;;OAGG;IACH,0BAEC;IASD;;;;;;;;;;MAYC;IAED,0BA+DC;CAeJ;;;;iBA9VgB,0CAA0C;2BAUhC,iBAAiB;sCADN,4BAA4B;yCAFzB,+BAA+B;kCACtC,wBAAwB;oBAPtC,kCAAkC"}