pixi-live2d-display-advanced 0.4.0 → 0.5.0

package/dist/cubism2.es.js

@@ -23,6 +23,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { utils as utils$1, Matrix, Texture, Transform, Point, ObservablePoint } from "@pixi/core";
+import { Sound, webaudio } from "@pixi/sound";
 import { Container } from "@pixi/display";
 const LOGICAL_WIDTH = 2;
 const LOGICAL_HEIGHT = 2;
@@ -77,7 +78,7 @@ const config = {
   preserveExpressionOnMotion: true,
   cubism4: CubismConfig
 };
-const VERSION = "v0.4.0";
+const VERSION = "v0.5.0";
 const logger = {
   log(tag, ...messages) {
     if (config.logLevel <= config.LOG_LEVEL_VERBOSE) {
@@ -3711,58 +3712,55 @@ class SoundManager {
    * @param file - URL of the sound file.
    * @param onFinish - Callback invoked when the playback has finished.
    * @param onError - Callback invoked when error occurs.
-   * @param crossOrigin - Cross origin setting.
    * @return Created audio element.
    */
-  static add(file, onFinish, onError, crossOrigin) {
-    const audio = new Audio(file);
-    audio.volume = this._volume;
-    audio.preload = "auto";
-    audio.crossOrigin = crossOrigin;
-    audio.addEventListener("ended", () => {
-      this.dispose(audio);
-      onFinish == null ? void 0 : onFinish();
-    });
-    audio.addEventListener("error", (e) => {
-      this.dispose(audio);
-      logger.warn(TAG$2, `Error occurred on "${file}"`, e.error);
-      onError == null ? void 0 : onError(e.error);
+  static add(file, onFinish, onError) {
+    return __async(this, null, function* () {
+      try {
+        const task = new Promise((resolve, reject) => {
+          const audio = Sound.from({
+            url: file,
+            volume: this._volume,
+            preload: true,
+            complete: () => {
+              this.dispose(audio);
+              onFinish == null ? void 0 : onFinish();
+            },
+            loaded: () => {
+              if (!(audio.media instanceof webaudio.WebAudioMedia)) {
+                reject(new Error(`Error: ${file} is not WebAudioMedia`));
+              }
+              debugger;
+              resolve(audio);
+            }
+          });
+        });
+        return yield task;
+      } catch (e) {
+        logger.warn(TAG$2, `Error occurred on "${file}"`, e);
+        onError == null ? void 0 : onError(e);
+        return null;
+      }
     });
-    this.audios.push(audio);
-    return audio;
   }
   /**
    * Plays the sound.
    * @param audio - An audio element.
-   * @return Promise that resolves when the audio is ready to play, rejects when error occurs.
    */
   static play(audio) {
-    return new Promise((resolve, reject) => {
-      var _a;
-      (_a = audio.play()) == null ? void 0 : _a.catch((e) => {
-        audio.dispatchEvent(new ErrorEvent("error", { error: e }));
-        reject(e);
-      });
-      if (audio.readyState === audio.HAVE_ENOUGH_DATA) {
-        resolve();
-      } else {
-        audio.addEventListener("canplaythrough", resolve);
-      }
-    });
-  }
-  static addContext(audio) {
-    const context = new AudioContext();
-    this.contexts.push(context);
-    return context;
+    audio.play();
   }
   static addAnalyzer(audio, context) {
-    const source = context.createMediaElementSource(audio);
+    const media = audio.media;
+    const source = context.createBufferSource();
+    source.buffer = media.buffer;
     const analyser = context.createAnalyser();
     analyser.fftSize = config.fftSize;
     analyser.minDecibels = -90;
     analyser.maxDecibels = -10;
     analyser.smoothingTimeConstant = 0.85;
     source.connect(analyser);
+    source.start(0);
     analyser.connect(context.destination);
     this.analysers.push(analyser);
     return analyser;
@@ -3773,17 +3771,21 @@ class SoundManager {
    * @return Returns value to feed into lip sync
    */
   static analyze(analyser) {
-    if (analyser != void 0) {
-      const pcmData = new Float32Array(analyser.fftSize);
-      let sumSquares = 0;
-      analyser.getFloatTimeDomainData(pcmData);
-      for (const amplitude of pcmData) {
-        sumSquares += amplitude * amplitude;
-      }
-      return parseFloat(Math.sqrt(sumSquares / pcmData.length * 20).toFixed(1));
-    } else {
-      return parseFloat(Math.random().toFixed(1));
-    }
+    if (!analyser) return parseFloat(Math.random().toFixed(1));
+    const buffer = new Float32Array(analyser.fftSize);
+    analyser.getFloatTimeDomainData(buffer);
+    let sumSquares = 0;
+    for (let i = 0; i < buffer.length; i++) {
+      sumSquares += __pow(buffer[i], 2);
+    }
+    const rms = Math.sqrt(sumSquares / buffer.length);
+    const minDecibel = -100;
+    const db = 20 * Math.log10(rms || __pow(10, minDecibel / 20));
+    const scaledDb = Math.min(
+      Math.max((db - analyser.minDecibels) / (analyser.maxDecibels - analyser.minDecibels), 0),
+      1
+    );
+    return parseFloat(scaledDb.toFixed(1));
   }
   /**
    * Disposes an audio element and removes it from {@link audios}.
@@ -3791,7 +3793,6 @@ class SoundManager {
    */
   static dispose(audio) {
     audio.pause();
-    audio.removeAttribute("src");
     remove(this.audios, audio);
   }
   /**
@@ -3799,7 +3800,7 @@ class SoundManager {
    */
   static destroy() {
     for (let i = this.contexts.length - 1; i >= 0; i--) {
-      this.contexts[i].close();
+      setTimeout(() => this.contexts[i].close());
     }
     for (let i = this.audios.length - 1; i >= 0; i--) {
       this.dispose(this.audios[i]);
@@ -3851,7 +3852,7 @@ class MotionManager extends utils$1.EventEmitter {
     __publicField(this, "state", new MotionState());
     /**
      * Audio element of the current motion if a sound file is defined with it.
-     * @type {HTMLAudioElement | undefined}
+     * @type {Sound | undefined}
      */
     __publicField(this, "currentAudio");
     /**
@@ -3966,13 +3967,13 @@ class MotionManager extends utils$1.EventEmitter {
   }
   /**
    * Initializes audio playback and sets up audio analysis for lipsync.
-   * @param audio - The HTMLAudioElement to initialize.
+   * @param audio - The Sound to initialize.
    * @param volume - The playback volume (0-1).
    */
   initializeAudio(audio, volume) {
     this.currentAudio = audio;
     SoundManager.volume = volume;
-    this.currentContext = SoundManager.addContext(this.currentAudio);
+    this.currentContext = audio.context.audioContext;
     this.currentAnalyzer = SoundManager.addAnalyzer(this.currentAudio, this.currentContext);
   }
   /**
@@ -3991,7 +3992,6 @@ class MotionManager extends utils$1.EventEmitter {
       volume = VOLUME,
       expression,
       resetExpression = true,
-      crossOrigin,
       onFinish,
       onError
     } = {}) {
@@ -4000,7 +4000,7 @@ class MotionManager extends utils$1.EventEmitter {
       }
       let audio;
       if (this.currentAudio) {
-        if (!this.currentAudio.ended) {
+        if (this.currentAudio.isPlaying) {
           return false;
         }
       }
@@ -4017,7 +4017,7 @@ class MotionManager extends utils$1.EventEmitter {
       const file = sound;
       if (file) {
         try {
-          audio = SoundManager.add(
+          audio = yield SoundManager.add(
             file,
             (that = this) => {
               logger.warn(this.tag, "Audio finished playing");
@@ -4027,7 +4027,6 @@ class MotionManager extends utils$1.EventEmitter {
               }
               that.currentAudio = void 0;
             },
-            // reset expression when audio is done
             (e, that = this) => {
               logger.error(this.tag, "Error during audio playback:", e);
               onError == null ? void 0 : onError(e);
@@ -4035,9 +4034,7 @@ class MotionManager extends utils$1.EventEmitter {
                 that.expressionManager.resetExpression();
               }
               that.currentAudio = void 0;
-            },
-            // on error
-            crossOrigin
+            }
           );
           this.initializeAudio(audio, volume);
         } catch (e) {
@@ -4047,15 +4044,16 @@ class MotionManager extends utils$1.EventEmitter {
       }
       if (audio) {
         let playSuccess = true;
-        const readyToPlay = SoundManager.play(audio).catch((e) => {
-          logger.warn(this.tag, "Failed to play audio", audio.src, e);
-          playSuccess = false;
-        });
-        if (config.motionSync) {
-          yield readyToPlay;
-          if (!playSuccess) {
-            return false;
+        try {
+          if (config.motionSync) {
+            SoundManager.play(audio);
           }
+        } catch (e) {
+          logger.warn(this.tag, "Failed to play audio", audio.url, e);
+          playSuccess = false;
+        }
+        if (!playSuccess) {
+          return false;
         }
       }
       if (this.state.shouldOverrideExpression()) {
@@ -4089,7 +4087,6 @@ class MotionManager extends utils$1.EventEmitter {
       volume = VOLUME,
       expression = void 0,
       resetExpression = true,
-      crossOrigin,
       onFinish,
       onError,
       ignoreParamIds = []
@@ -4099,7 +4096,7 @@ class MotionManager extends utils$1.EventEmitter {
         return false;
       }
       if (this.currentAudio) {
-        if (!this.currentAudio.ended && priority != MotionPriority.FORCE) {
+        if (this.currentAudio.isPlaying && priority != MotionPriority.FORCE) {
           return false;
         }
       }
@@ -4127,7 +4124,7 @@ class MotionManager extends utils$1.EventEmitter {
       const file = soundURL;
       if (file) {
         try {
-          audio = SoundManager.add(
+          audio = yield SoundManager.add(
             file,
             (that = this) => {
               onFinish == null ? void 0 : onFinish();
@@ -4136,7 +4133,6 @@ class MotionManager extends utils$1.EventEmitter {
               }
               that.currentAudio = void 0;
             },
-            // reset expression when audio is done
             (e, that = this) => {
               logger.error(this.tag, "Error during audio playback:", e);
               onError == null ? void 0 : onError(e);
@@ -4144,9 +4140,7 @@ class MotionManager extends utils$1.EventEmitter {
                 that.expressionManager.resetExpression();
               }
               that.currentAudio = void 0;
-            },
-            // on error
-            crossOrigin
+            }
           );
           this.initializeAudio(audio, volume);
         } catch (e) {
@@ -4155,11 +4149,12 @@ class MotionManager extends utils$1.EventEmitter {
       }
       const motion = yield this.loadMotion(group, index);
       if (audio) {
-        const readyToPlay = SoundManager.play(audio).catch(
-          (e) => logger.warn(this.tag, "Failed to play audio", audio.src, e)
-        );
         if (config.motionSync) {
-          yield readyToPlay;
+          try {
+            SoundManager.play(audio);
+          } catch (e) {
+            logger.warn(this.tag, "Failed to play audio", audio.url, e);
+          }
         }
       }
       if (!this.state.start(motion, group, index, priority)) {
@@ -4201,7 +4196,6 @@ class MotionManager extends utils$1.EventEmitter {
       volume = VOLUME,
       expression,
       resetExpression = true,
-      crossOrigin,
       onFinish,
       onError
     } = {}) {
@@ -4220,7 +4214,6 @@ class MotionManager extends utils$1.EventEmitter {
             volume,
             expression,
             resetExpression,
-            crossOrigin,
             onFinish,
             onError
           });
@@ -5532,7 +5525,6 @@ class Live2DModel extends Container {
    * @param [options.volume=0.5] - Volume of the sound (0-1).
    * @param [options.expression] - In case you want to mix up an expression while playing sound (bind with Model.expression()).
    * @param [options.resetExpression=true] - Reset the expression to default after the motion is finished.
-   * @param [options.crossOrigin] - CORS settings for audio resources.
    * @param [options.onFinish] - Callback function when speaking completes.
    * @param [options.onError] - Callback function when an error occurs.
    * @return Promise that resolves with true if the motion is successfully started, with false otherwise.
@@ -5543,7 +5535,6 @@ class Live2DModel extends Container {
       volume = VOLUME,
       expression = void 0,
       resetExpression = true,
-      crossOrigin,
       onFinish,
       onError
     } = {}) {
@@ -5553,7 +5544,6 @@ class Live2DModel extends Container {
           volume,
           expression,
           resetExpression,
-          crossOrigin,
           onFinish,
           onError
         });
@@ -5563,7 +5553,6 @@ class Live2DModel extends Container {
           volume,
           expression,
           resetExpression,
-          crossOrigin,
           onFinish,
           onError
         });
@@ -5639,7 +5628,6 @@ class Live2DModel extends Container {
    * @param [options.volume] - Volume of the sound (0-1).
    * @param [options.expression] - In case you want to mix up an expression while playing sound (bind with Model.expression()).
    * @param [options.resetExpression=true] - Reset the expression to default after the motion is finished.
-   * @param {string} [options.crossOrigin] - CORS settings for audio resources.
    * @param [options.onFinish] - Callback function when speaking completes.
    * @param [options.onError] - Callback function when an error occurs.
    * @returns Promise that resolves with true if the sound is playing, false if it's not.
@@ -5648,7 +5636,6 @@ class Live2DModel extends Container {
     volume = VOLUME,
     expression,
     resetExpression = true,
-    crossOrigin,
     onFinish,
     onError
   } = {}) {
@@ -5656,7 +5643,6 @@ class Live2DModel extends Container {
       volume,
       expression,
       resetExpression,
-      crossOrigin,
       onFinish,
       onError
     });
@@ -6399,13 +6385,12 @@ class Cubism2InternalModel extends InternalModel {
       let value = this.motionManager.mouthSync();
       let min_ = 0;
       const max_ = 1;
-      const bias_weight = 1.2;
-      const bias_power = 0.7;
+      const bias_power = 0.4;
       if (value > 0) {
         min_ = 0.4;
       }
       value = Math.pow(value, bias_power);
-      value = clamp(value * bias_weight, min_, max_);
+      value = clamp(value, min_, max_);
       for (let i = 0; i < this.motionManager.lipSyncIds.length; ++i) {
         this.coreModel.setParamFloat(
           this.coreModel.getParamIndex(this.motionManager.lipSyncIds[i]),