pixi-live2d-display-advanced 0.5.2 → 0.5.4

package/dist/cubism2.es.js

@@ -23,7 +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 { sound, Sound, webaudio } from "@pixi/sound";
 import { Container } from "@pixi/display";
 const LOGICAL_WIDTH = 2;
 const LOGICAL_HEIGHT = 2;
@@ -78,7 +78,7 @@ const config = {
   preserveExpressionOnMotion: true,
   cubism4: CubismConfig
 };
-const VERSION = "v0.5.2";
+const VERSION = "v0.5.4";
 const logger = {
   log(tag, ...messages) {
     if (config.logLevel <= config.LOG_LEVEL_VERBOSE) {
@@ -3695,6 +3695,7 @@ class MotionState {
 }
 const TAG$2 = "SoundManager";
 const VOLUME = 0.5;
+sound.disableAutoPause = true;
 class SoundManager {
   /**
    * Global volume that applies to all the sounds.
@@ -3710,11 +3711,10 @@ class SoundManager {
   /**
    * Creates an audio element and adds it to the {@link audios}.
    * @param file - URL of the sound file.
-   * @param onFinish - Callback invoked when the playback has finished.
    * @param onError - Callback invoked when error occurs.
    * @return Created audio element.
    */
-  static add(file, onFinish, onError) {
+  static add(file, onError) {
     return __async(this, null, function* () {
       try {
         const task = new Promise((resolve, reject) => {
@@ -3722,10 +3722,6 @@ class SoundManager {
             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`));
@@ -3745,9 +3741,16 @@ class SoundManager {
   /**
    * Plays the sound.
    * @param audio - An audio element.
+   * @param onFinish - Callback invoked when the playback has finished.
    */
-  static play(audio) {
-    audio.play();
+  static play(audio, onFinish) {
+    audio.play({
+      singleInstance: true,
+      complete: () => {
+        onFinish == null ? void 0 : onFinish();
+        audio.destroy();
+      }
+    });
   }
   static addAnalyzer(audio, context) {
     const media = audio.media;
@@ -3760,7 +3763,6 @@ class SoundManager {
     analyser.smoothingTimeConstant = 0.85;
     source.connect(analyser);
     source.start(0);
-    analyser.connect(context.destination);
     this.analysers.push(analyser);
     return analyser;
   }
@@ -3987,7 +3989,7 @@ class MotionManager extends utils$1.EventEmitter {
    * @returns Promise that resolves with true if the sound is playing, false otherwise.
    */
   speak(_0) {
-    return __async(this, arguments, function* (sound, {
+    return __async(this, arguments, function* (sound2, {
       volume = VOLUME,
       expression,
       resetExpression = true,
@@ -4004,37 +4006,26 @@ class MotionManager extends utils$1.EventEmitter {
         }
       }
       let soundURL;
-      const isBase64Content = sound && sound.startsWith("data:");
-      if (sound && !isBase64Content) {
+      const isBase64Content = sound2 && sound2.startsWith("data:");
+      if (sound2 && !isBase64Content) {
         const A = document.createElement("a");
-        A.href = sound;
-        sound = A.href;
-        soundURL = sound;
+        A.href = sound2;
+        sound2 = A.href;
+        soundURL = sound2;
       } else {
         soundURL = "data:audio/";
       }
-      const file = sound;
+      const file = sound2;
       if (file) {
         try {
-          audio = yield SoundManager.add(
-            file,
-            (that = this) => {
-              logger.warn(this.tag, "Audio finished playing");
-              onFinish == null ? void 0 : onFinish();
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
-            },
-            (e, that = this) => {
-              logger.error(this.tag, "Error during audio playback:", e);
-              onError == null ? void 0 : onError(e);
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
+          audio = yield SoundManager.add(file, (e, that = this) => {
+            logger.error(this.tag, "Error during audio playback:", e);
+            onError == null ? void 0 : onError(e);
+            if (resetExpression && expression && that.expressionManager) {
+              that.expressionManager.resetExpression();
             }
-          );
+            that.currentAudio = void 0;
+          });
           this.initializeAudio(audio, volume);
         } catch (e) {
           logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4045,7 +4036,13 @@ class MotionManager extends utils$1.EventEmitter {
         let playSuccess = true;
         try {
           if (config.motionSync) {
-            SoundManager.play(audio);
+            SoundManager.play(audio, () => {
+              onFinish == null ? void 0 : onFinish();
+              if (resetExpression && expression && this.expressionManager) {
+                this.expressionManager.resetExpression();
+              }
+              this.currentAudio = void 0;
+            });
           }
         } catch (e) {
           logger.warn(this.tag, "Failed to play audio", audio.url, e);
@@ -4082,7 +4079,7 @@ class MotionManager extends utils$1.EventEmitter {
    */
   startMotion(_0, _1) {
     return __async(this, arguments, function* (group, index, priority = MotionPriority.NORMAL, {
-      sound = void 0,
+      sound: sound2 = void 0,
       volume = VOLUME,
       expression = void 0,
       resetExpression = true,
@@ -4108,12 +4105,12 @@ class MotionManager extends utils$1.EventEmitter {
       }
       let audio;
       let soundURL;
-      const isBase64Content = sound && sound.startsWith("data:");
-      if (sound && !isBase64Content) {
+      const isBase64Content = sound2 && sound2.startsWith("data:");
+      if (sound2 && !isBase64Content) {
         const A = document.createElement("a");
-        A.href = sound;
-        sound = A.href;
-        soundURL = sound;
+        A.href = sound2;
+        sound2 = A.href;
+        soundURL = sound2;
       } else {
         soundURL = this.getSoundFile(definition);
         if (soundURL) {
@@ -4123,24 +4120,14 @@ class MotionManager extends utils$1.EventEmitter {
       const file = soundURL;
       if (file) {
         try {
-          audio = yield SoundManager.add(
-            file,
-            (that = this) => {
-              onFinish == null ? void 0 : onFinish();
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
-            },
-            (e, that = this) => {
-              logger.error(this.tag, "Error during audio playback:", e);
-              onError == null ? void 0 : onError(e);
-              if (resetExpression && expression && that.expressionManager) {
-                that.expressionManager.resetExpression();
-              }
-              that.currentAudio = void 0;
+          audio = yield SoundManager.add(file, (e, that = this) => {
+            logger.error(this.tag, "Error during audio playback:", e);
+            onError == null ? void 0 : onError(e);
+            if (resetExpression && expression && that.expressionManager) {
+              that.expressionManager.resetExpression();
             }
-          );
+            that.currentAudio = void 0;
+          });
           this.initializeAudio(audio, volume);
         } catch (e) {
           logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4150,7 +4137,13 @@ class MotionManager extends utils$1.EventEmitter {
       if (audio) {
         if (config.motionSync) {
           try {
-            SoundManager.play(audio);
+            SoundManager.play(audio, (that = this) => {
+              onFinish == null ? void 0 : onFinish();
+              if (resetExpression && expression && that.expressionManager) {
+                that.expressionManager.resetExpression();
+              }
+              that.currentAudio = void 0;
+            });
           } catch (e) {
             logger.warn(this.tag, "Failed to play audio", audio.url, e);
           }
@@ -4191,7 +4184,7 @@ class MotionManager extends utils$1.EventEmitter {
    */
   startRandomMotion(_0, _1) {
     return __async(this, arguments, function* (group, priority, {
-      sound,
+      sound: sound2,
       volume = VOLUME,
       expression,
       resetExpression = true,
@@ -4209,7 +4202,7 @@ class MotionManager extends utils$1.EventEmitter {
         if (availableIndices.length) {
           const index = availableIndices[Math.floor(Math.random() * availableIndices.length)];
           return this.startMotion(group, index, priority, {
-            sound,
+            sound: sound2,
             volume,
             expression,
             resetExpression,
@@ -5530,7 +5523,7 @@ class Live2DModel extends Container {
    */
   motion(_0, _1, _2) {
     return __async(this, arguments, function* (group, index, priority, {
-      sound = void 0,
+      sound: sound2 = void 0,
       volume = VOLUME,
       expression = void 0,
       resetExpression = true,
@@ -5539,7 +5532,7 @@ class Live2DModel extends Container {
     } = {}) {
       if (index === void 0) {
         return this.internalModel.motionManager.startRandomMotion(group, priority, {
-          sound,
+          sound: sound2,
           volume,
           expression,
           resetExpression,
@@ -5548,7 +5541,7 @@ class Live2DModel extends Container {
         });
       } else {
         return this.internalModel.motionManager.startMotion(group, index, priority, {
-          sound,
+          sound: sound2,
           volume,
           expression,
           resetExpression,
@@ -5631,14 +5624,14 @@ class Live2DModel extends Container {
    * @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.
    */
-  speak(sound, {
+  speak(sound2, {
     volume = VOLUME,
     expression,
     resetExpression = true,
     onFinish,
     onError
   } = {}) {
-    return this.internalModel.motionManager.speak(sound, {
+    return this.internalModel.motionManager.speak(sound2, {
       volume,
       expression,
       resetExpression,

package/dist/cubism2.js

@@ -79,7 +79,7 @@ var __async = (__this, __arguments, generator) => {
     preserveExpressionOnMotion: true,
     cubism4: CubismConfig
   };
-  const VERSION = "v0.5.2";
+  const VERSION = "v0.5.4";
   const logger = {
     log(tag, ...messages) {
       if (config.logLevel <= config.LOG_LEVEL_VERBOSE) {
@@ -3696,6 +3696,7 @@ var __async = (__this, __arguments, generator) => {
   }
   const TAG$2 = "SoundManager";
   const VOLUME = 0.5;
+  sound.sound.disableAutoPause = true;
   class SoundManager {
     /**
      * Global volume that applies to all the sounds.
@@ -3711,11 +3712,10 @@ var __async = (__this, __arguments, generator) => {
     /**
      * Creates an audio element and adds it to the {@link audios}.
      * @param file - URL of the sound file.
-     * @param onFinish - Callback invoked when the playback has finished.
      * @param onError - Callback invoked when error occurs.
      * @return Created audio element.
      */
-    static add(file, onFinish, onError) {
+    static add(file, onError) {
       return __async(this, null, function* () {
         try {
           const task = new Promise((resolve, reject) => {
@@ -3723,10 +3723,6 @@ var __async = (__this, __arguments, generator) => {
               url: file,
               volume: this._volume,
               preload: true,
-              complete: () => {
-                this.dispose(audio);
-                onFinish == null ? void 0 : onFinish();
-              },
               loaded: () => {
                 if (!(audio.media instanceof sound.webaudio.WebAudioMedia)) {
                   reject(new Error(`Error: ${file} is not WebAudioMedia`));
@@ -3746,9 +3742,16 @@ var __async = (__this, __arguments, generator) => {
     /**
      * Plays the sound.
      * @param audio - An audio element.
+     * @param onFinish - Callback invoked when the playback has finished.
      */
-    static play(audio) {
-      audio.play();
+    static play(audio, onFinish) {
+      audio.play({
+        singleInstance: true,
+        complete: () => {
+          onFinish == null ? void 0 : onFinish();
+          audio.destroy();
+        }
+      });
     }
     static addAnalyzer(audio, context) {
       const media = audio.media;
@@ -3761,7 +3764,6 @@ var __async = (__this, __arguments, generator) => {
       analyser.smoothingTimeConstant = 0.85;
       source.connect(analyser);
       source.start(0);
-      analyser.connect(context.destination);
       this.analysers.push(analyser);
       return analyser;
     }
@@ -4017,25 +4019,14 @@ var __async = (__this, __arguments, generator) => {
         const file = sound2;
         if (file) {
           try {
-            audio = yield SoundManager.add(
-              file,
-              (that = this) => {
-                logger.warn(this.tag, "Audio finished playing");
-                onFinish == null ? void 0 : onFinish();
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
-              },
-              (e, that = this) => {
-                logger.error(this.tag, "Error during audio playback:", e);
-                onError == null ? void 0 : onError(e);
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
+            audio = yield SoundManager.add(file, (e, that = this) => {
+              logger.error(this.tag, "Error during audio playback:", e);
+              onError == null ? void 0 : onError(e);
+              if (resetExpression && expression && that.expressionManager) {
+                that.expressionManager.resetExpression();
               }
-            );
+              that.currentAudio = void 0;
+            });
             this.initializeAudio(audio, volume);
           } catch (e) {
             logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4046,7 +4037,13 @@ var __async = (__this, __arguments, generator) => {
           let playSuccess = true;
           try {
             if (config.motionSync) {
-              SoundManager.play(audio);
+              SoundManager.play(audio, () => {
+                onFinish == null ? void 0 : onFinish();
+                if (resetExpression && expression && this.expressionManager) {
+                  this.expressionManager.resetExpression();
+                }
+                this.currentAudio = void 0;
+              });
             }
           } catch (e) {
             logger.warn(this.tag, "Failed to play audio", audio.url, e);
@@ -4124,24 +4121,14 @@ var __async = (__this, __arguments, generator) => {
         const file = soundURL;
         if (file) {
           try {
-            audio = yield SoundManager.add(
-              file,
-              (that = this) => {
-                onFinish == null ? void 0 : onFinish();
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
-              },
-              (e, that = this) => {
-                logger.error(this.tag, "Error during audio playback:", e);
-                onError == null ? void 0 : onError(e);
-                if (resetExpression && expression && that.expressionManager) {
-                  that.expressionManager.resetExpression();
-                }
-                that.currentAudio = void 0;
+            audio = yield SoundManager.add(file, (e, that = this) => {
+              logger.error(this.tag, "Error during audio playback:", e);
+              onError == null ? void 0 : onError(e);
+              if (resetExpression && expression && that.expressionManager) {
+                that.expressionManager.resetExpression();
               }
-            );
+              that.currentAudio = void 0;
+            });
             this.initializeAudio(audio, volume);
           } catch (e) {
             logger.warn(this.tag, "Failed to create audio", soundURL, e);
@@ -4151,7 +4138,13 @@ var __async = (__this, __arguments, generator) => {
         if (audio) {
           if (config.motionSync) {
             try {
-              SoundManager.play(audio);
+              SoundManager.play(audio, (that = this) => {
+                onFinish == null ? void 0 : onFinish();
+                if (resetExpression && expression && that.expressionManager) {
+                  that.expressionManager.resetExpression();
+                }
+                that.currentAudio = void 0;
+              });
             } catch (e) {
               logger.warn(this.tag, "Failed to play audio", audio.url, e);
             }