@eva/plugin-renderer-spine 2.0.0-beta.1 → 2.0.0-beta.11

package/dist/plugin-renderer-spine.cjs.js

@@ -2,37 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var spineBase = require('@eva/spine-base');
 var pixi_js = require('pixi.js');
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-var extendStatics = function(d, b) {
-    extendStatics = Object.setPrototypeOf ||
-        ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-        function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
+var spineBase = require('@eva/spine-base');
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) =>
@@ -3724,14 +3695,17 @@ var _AnimationState = class {
     let finished = this.updateMixingFrom(from, delta);
     from.animationLast = from.nextAnimationLast;
     from.trackLast = from.nextTrackLast;
-    if (to.mixTime > 0 && to.mixTime >= to.mixDuration) {
-      if (from.totalAlpha == 0 || to.mixDuration == 0) {
-        to.mixingFrom = from.mixingFrom;
-        if (from.mixingFrom) from.mixingFrom.mixingTo = to;
-        to.interruptAlpha = from.interruptAlpha;
-        this.queue.end(from);
+    if (to.nextTrackLast != -1) {
+      const discard = to.mixTime == 0 && from.mixTime == 0;
+      if (to.mixTime >= to.mixDuration || discard) {
+        if (from.totalAlpha == 0 || to.mixDuration == 0 || discard) {
+          to.mixingFrom = from.mixingFrom;
+          if (from.mixingFrom != null) from.mixingFrom.mixingTo = to;
+          to.interruptAlpha = from.interruptAlpha;
+          this.queue.end(from);
+        }
+        return finished;
       }
-      return finished;
     }
     from.trackTime += delta * from.timeScale;
     to.mixTime += delta;
@@ -12427,7 +12401,7 @@ var vectorAux = new Vector2();
 Skeleton.yDown = true;
 var clipper = new SkeletonClipping();
 var maskPool = new Pool(() => new pixi_js.Graphics());
-var Spine$2 = class extends pixi_js.ViewContainer {
+var Spine$1 = class extends pixi_js.ViewContainer {
   // Pixi properties
   batched = true;
   buildId = 0;
@@ -12971,7 +12945,7 @@ var Spine$2 = class extends pixi_js.ViewContainer {
   static from({ skeleton, atlas, scale = 1, darkTint, autoUpdate = true }) {
     const cacheKey = `${skeleton}-${atlas}-${scale}`;
     if (pixi_js.Cache.has(cacheKey)) {
-      return new Spine$2(pixi_js.Cache.get(cacheKey));
+      return new Spine$1(pixi_js.Cache.get(cacheKey));
     }
     const skeletonAsset = pixi_js.Assets.get(skeleton);
     const atlasAsset = pixi_js.Assets.get(atlas);
@@ -12981,7 +12955,7 @@ var Spine$2 = class extends pixi_js.ViewContainer {
     parser.scale = scale;
     const skeletonData = parser.readSkeletonData(skeletonAsset);
     pixi_js.Cache.set(cacheKey, skeletonData);
-    return new Spine$2({
+    return new Spine$1({
       skeletonData,
       darkTint,
       autoUpdate,
@@ -13476,6 +13450,7 @@ var pixiSpine = {
   ShearXTimeline,
   ShearYTimeline,
   Skeleton,
+  SpineTexture,
   SkeletonBinary,
   SkeletonBounds,
   SkeletonClipping,
@@ -13486,7 +13461,7 @@ var pixiSpine = {
   Slot,
   SlotData,
   SpacingMode,
-  Spine: Spine$2,
+  Spine: Spine$1,
   SpineDebugRenderer,
   SpinePipe,
   SpineTexture,
@@ -13514,26 +13489,15 @@ var pixiSpine = {
   WindowedMean,
 };
 
-var SpineSystem = (function (_super) {
-    __extends(SpineSystem, _super);
-    function SpineSystem() {
-        return _super !== null && _super.apply(this, arguments) || this;
+class SpineSystem extends spineBase.SpineSystem {
+    init() {
+        super.init({ pixiSpine });
     }
-    SpineSystem.prototype.init = function () {
-        _super.prototype.init.call(this, { pixiSpine: pixiSpine });
-    };
-    return SpineSystem;
-}(spineBase.SpineSystem));
-var SpineSystem$1 = SpineSystem;
+}
 
-var Spine = (function (_super) {
-    __extends(Spine, _super);
-    function Spine() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return Spine;
-}(spineBase.Spine));
-var Spine$1 = Spine;
+class Spine extends spineBase.Spine {
+}
 
-exports.Spine = Spine$1;
-exports.SpineSystem = SpineSystem$1;
+exports.PixiSpine = pixiSpine;
+exports.Spine = Spine;
+exports.SpineSystem = SpineSystem;