@m2c2kit/core 0.3.25 → 0.3.26

package/dist/index.d.ts

@@ -1254,6 +1254,7 @@ interface M2Sound {
     soundName: string;
     data: ArrayBuffer | undefined;
     audioBuffer: AudioBuffer | undefined;
+    audioBufferSource: AudioBufferSourceNode | undefined;
     url: string;
     status: M2SoundStatus;
 }
@@ -4633,6 +4634,37 @@ declare class SoundPlayer extends M2Node implements SoundPlayerOptions {
      */
     constructor(options: SoundPlayerOptions);
     initialize(): void;
+    /**
+     * Remove an action from this node. If the action is running, it will be
+     * stopped.
+     *
+     * @privateRemarks This methods overrides the `removeAction` method from the
+     * `M2Node` class. It is necessary to override this method because the
+     * `SoundPlayer` class has a special case for removing actions that play
+     * sounds.
+     *
+     * @param key - key (string identifier) of the action to remove
+     */
+    removeAction(key: string): void;
+    /**
+     * Remove all actions from this node. If actions are running, they will be
+     * stopped.
+     *
+     * @privateRemarks This methods overrides the `removeAllActions` method from
+     * the `M2Node` class. It is necessary to override this method because the
+     * `SoundPlayer` class has a special case for removing actions that play
+     * sounds.
+     */
+    removeAllActions(): void;
+    /**
+     * Stops the audio source node for a sound play action.
+     *
+     * @remarks When a SoundPlayer play action is removed, the audio source node
+     * must be stopped and disconnected.
+     *
+     * @param playAction - the play action of the sound to stop
+     */
+    private stopSoundActionAudio;
     dispose(): void;
     /**
      * Duplicates a node using deep copy.

package/dist/index.js

@@ -1892,16 +1892,18 @@ class Action {
     if (!playAction.started) {
       const m2Sound = soundManager.getSound(soundPlayer.soundName);
       if (m2Sound.audioBuffer) {
-        const source = soundManager.audioContext.createBufferSource();
-        source.buffer = m2Sound.audioBuffer;
-        source.onended = () => {
+        m2Sound.audioBufferSource = soundManager.audioContext.createBufferSource();
+        m2Sound.audioBufferSource.buffer = m2Sound.audioBuffer;
+        m2Sound.audioBufferSource.onended = () => {
           playAction.running = false;
           playAction.completed = true;
           const knownDuration = performance.now() - (action.runStartTime + action.startOffset.value);
           action.duration.assign(knownDuration);
         };
-        source.connect(soundManager.audioContext.destination);
-        source.start();
+        m2Sound.audioBufferSource.connect(
+          soundManager.audioContext.destination
+        );
+        m2Sound.audioBufferSource.start();
         playAction.started = true;
       } else {
         if (m2Sound.status === M2SoundStatus.Error) {
@@ -8032,6 +8034,7 @@ class SoundManager {
         soundName: sound.soundName,
         data: void 0,
         audioBuffer: void 0,
+        audioBufferSource: void 0,
         url,
         status: sound.lazy ? M2SoundStatus.Deferred : M2SoundStatus.WillFetch
       };
@@ -10981,9 +10984,13 @@ class Game {
       this.raiseTapDownEvent(node, nodeEvent, domPointerEvent);
     }
     if (node.children) {
-      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort(
-        (a, b) => b.zPosition - a.zPosition
-      ).forEach(
+      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort((a, b) => {
+        const zDiff = b.zPosition - a.zPosition;
+        if (zDiff !== 0) {
+          return zDiff;
+        }
+        return node.children.indexOf(b) - node.children.indexOf(a);
+      }).forEach(
         (node2) => this.processDomPointerDown(node2, nodeEvent, domPointerEvent)
       );
     }
@@ -10997,7 +11004,6 @@ class Game {
       node.pressed = false;
       node.pressedAndWithinHitArea = false;
       this.raiseM2DragEndEvent(node, nodeEvent, domPointerEvent);
-      nodeEvent.handled = true;
       return;
     }
     if (node.isUserInteractionEnabled && node.pressed && node.pressedAndWithinHitArea) {
@@ -11020,9 +11026,13 @@ class Game {
       this.raiseM2PointerUpEvent(node, nodeEvent, domPointerEvent);
     }
     if (node.children) {
-      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort(
-        (a, b) => b.zPosition - a.zPosition
-      ).forEach(
+      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort((a, b) => {
+        const zDiff = b.zPosition - a.zPosition;
+        if (zDiff !== 0) {
+          return zDiff;
+        }
+        return node.children.indexOf(b) - node.children.indexOf(a);
+      }).forEach(
         (node2) => this.processDomPointerUp(node2, nodeEvent, domPointerEvent)
       );
     }
@@ -11050,7 +11060,6 @@ class Game {
         x: domPointerEvent.offsetX,
         y: domPointerEvent.offsetY
       };
-      nodeEvent.handled = true;
       if (firstMoveOfDrag) {
         this.raiseM2DragStartEvent(node, nodeEvent, domPointerEvent);
       } else {
@@ -11083,9 +11092,13 @@ class Game {
       this.raiseM2PointerLeaveEvent(node, nodeEvent, domPointerEvent);
     }
     if (node.children) {
-      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort(
-        (a, b) => b.zPosition - a.zPosition
-      ).forEach(
+      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort((a, b) => {
+        const zDiff = b.zPosition - a.zPosition;
+        if (zDiff !== 0) {
+          return zDiff;
+        }
+        return node.children.indexOf(b) - node.children.indexOf(a);
+      }).forEach(
         (node2) => this.processDomPointerMove(node2, nodeEvent, domPointerEvent)
       );
     }
@@ -11124,9 +11137,13 @@ class Game {
       this.raiseM2PointerLeaveEvent(node, nodeEvent, domPointerEvent);
     }
     if (node.children) {
-      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort(
-        (a, b) => b.zPosition - a.zPosition
-      ).forEach(
+      node.children.filter((node2) => !node2.hidden).filter((node2) => node2.isDrawable).sort((a, b) => {
+        const zDiff = b.zPosition - a.zPosition;
+        if (zDiff !== 0) {
+          return zDiff;
+        }
+        return node.children.indexOf(b) - node.children.indexOf(a);
+      }).forEach(
         (node2) => this.processDomPointerLeave(node2, nodeEvent, domPointerEvent)
       );
     }
@@ -11728,6 +11745,56 @@ class SoundPlayer extends M2Node {
   }
   initialize() {
   }
+  /**
+   * Remove an action from this node. If the action is running, it will be
+   * stopped.
+   *
+   * @privateRemarks This methods overrides the `removeAction` method from the
+   * `M2Node` class. It is necessary to override this method because the
+   * `SoundPlayer` class has a special case for removing actions that play
+   * sounds.
+   *
+   * @param key - key (string identifier) of the action to remove
+   */
+  removeAction(key) {
+    const actionToRemove = this.actions.find((action) => action.key === key);
+    if (actionToRemove?.type === ActionType.Play) {
+      this.stopSoundActionAudio(actionToRemove);
+    }
+    this.actions = this.actions.filter((action) => action.key !== key);
+  }
+  /**
+   * Remove all actions from this node. If actions are running, they will be
+   * stopped.
+   *
+   * @privateRemarks This methods overrides the `removeAllActions` method from
+   * the `M2Node` class. It is necessary to override this method because the
+   * `SoundPlayer` class has a special case for removing actions that play
+   * sounds.
+   */
+  removeAllActions() {
+    while (this.actions.length) {
+      const removedAction = this.actions.pop();
+      if (removedAction?.type === ActionType.Play) {
+        this.stopSoundActionAudio(removedAction);
+      }
+    }
+  }
+  /**
+   * Stops the audio source node for a sound play action.
+   *
+   * @remarks When a SoundPlayer play action is removed, the audio source node
+   * must be stopped and disconnected.
+   *
+   * @param playAction - the play action of the sound to stop
+   */
+  stopSoundActionAudio(playAction) {
+    if (playAction.running) {
+      const m2Sound = this.game.soundManager.getSound(this.soundName);
+      m2Sound.audioBufferSource?.stop();
+      m2Sound.audioBufferSource?.disconnect();
+    }
+  }
   dispose() {
   }
   /**
@@ -12045,7 +12112,7 @@ class Story {
   }
 }
 
-console.log("\u26AA @m2c2kit/core version 0.3.25 (af00d1f0)");
+console.log("\u26AA @m2c2kit/core version 0.3.26 (8bba62e1)");
 
 export { Action, ActivityType, CanvasKitHelpers, ColorfulMutablePath, Composite, Constants, ConstraintType, CustomAction, Dimensions, Easings, Equal, Equals, EventStore, EventStoreMode, FadeAlphaAction, FontManager, Game, GroupAction, I18n, ImageManager, Label, LabelHorizontalAlignmentMode, LayoutConstraint, LegacyTimer, M2EventType, M2ImageStatus, M2Node, M2NodeFactory, M2NodeType, M2SoundStatus, M2c2KitHelpers, MoveAction, MutablePath, NoneTransition, PlayAction, RandomDraws, RepeatAction, RepeatForeverAction, RotateAction, ScaleAction, Scene, SceneTransition, SequenceAction, Shape, ShapeType, SlideTransition, SoundManager, SoundPlayer, SoundRecorder, Sprite, Story, TextLine, Timer, Transition, TransitionDirection, TransitionType, Uuid, WaitAction, WebColors, WebGlInfo, handleInterfaceOptions };
 //# sourceMappingURL=index.js.map