@eva/plugin-renderer-spine 2.0.0-beta.5 → 2.0.0-beta.7

package/dist/plugin-renderer-spine.d.ts

@@ -1,6 +1,8 @@
+import PixiSpine from 'pixi-spine';
 import { Spine as Spine_2 } from '@eva/spine-base';
 import { SpineParams } from '@eva/spine-base';
 import { SpineSystem as SpineSystem_2 } from '@eva/spine-base';
+export { PixiSpine }
 
 export declare class Spine extends Spine_2 {
 }

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

@@ -1,5 +1,5 @@
-import { SpineSystem as SpineSystem$1, Spine as Spine$2 } from '@eva/spine-base';
 import { ExtensionType, checkExtension, Resolver, LoaderParserPriority, DOMAdapter, path, TextureSource, extensions, collectAllRenderables, Graphics, ViewContainer, Ticker, fastCopy, Texture as Texture$1, DEG_TO_RAD, Container, Cache, Assets, Text, Batcher, Color as Color$1, Geometry, Buffer, BufferUsage, Shader, compileHighShaderGlProgram, colorBitGl, generateTextureBatchBitGl, roundPixelsBitGl, compileHighShaderGpuProgram, colorBit, generateTextureBatchBit, roundPixelsBit, getBatchSamplersUniformGroup } from 'pixi.js';
+import { SpineSystem as SpineSystem$1, Spine as Spine$2 } from '@eva/spine-base';
 
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) =>
@@ -3691,14 +3691,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;
@@ -13443,6 +13446,7 @@ var pixiSpine = {
   ShearXTimeline,
   ShearYTimeline,
   Skeleton,
+  SpineTexture,
   SkeletonBinary,
   SkeletonBounds,
   SkeletonClipping,
@@ -13490,4 +13494,4 @@ class SpineSystem extends SpineSystem$1 {
 class Spine extends Spine$2 {
 }
 
-export { Spine, SpineSystem };
+export { pixiSpine as PixiSpine, Spine, SpineSystem };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-renderer-spine",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "description": "@eva/plugin-renderer-spine",
   "main": "index.js",
   "module": "dist/plugin-renderer-spine.esm.js",
@@ -19,9 +19,9 @@
   "homepage": "https://eva.js.org",
   "dependencies": {
     "@eva/inspector-decorator": "^0.0.5",
-    "@eva/plugin-renderer": "2.0.0-beta.5",
-    "@eva/eva.js": "2.0.0-beta.5",
-    "@eva/spine-base": "2.0.0-beta.5",
-    "pixi.js": "^8.6.3"
+    "@eva/plugin-renderer": "2.0.0-beta.7",
+    "@eva/eva.js": "2.0.0-beta.7",
+    "@eva/spine-base": "2.0.0-beta.7",
+    "pixi.js": "^8.6.5"
   }
 }