@esotericsoftware/spine-canvas 4.1.6 → 4.1.7

package/dist/iife/spine-canvas.js

@@ -1103,8 +1103,8 @@ var spine = (() => {
               bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
               break;
             case 3:
-              bone.scaleX = (x - bone.data.scaleX) * alpha;
-              bone.scaleY = (y - bone.data.scaleY) * alpha;
+              bone.scaleX += (x - bone.data.scaleX) * alpha;
+              bone.scaleY += (y - bone.data.scaleY) * alpha;
           }
         } else {
           switch (blend) {
@@ -1170,7 +1170,7 @@ var spine = (() => {
               bone.scaleX = bx + (Math.abs(x) * MathUtils.signum(bx) - bx) * alpha;
               break;
             case 3:
-              bone.scaleX = (x - bone.data.scaleX) * alpha;
+              bone.scaleX += (x - bone.data.scaleX) * alpha;
           }
         } else {
           switch (blend) {
@@ -1231,7 +1231,7 @@ var spine = (() => {
               bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
               break;
             case 3:
-              bone.scaleY = (y - bone.data.scaleY) * alpha;
+              bone.scaleY += (y - bone.data.scaleY) * alpha;
           }
         } else {
           switch (blend) {
@@ -2653,13 +2653,14 @@ var spine = (() => {
           }
         } else {
           let timelineMode = current.timelineMode;
-          let firstFrame = current.timelinesRotation.length != timelineCount << 1;
+          let shortestRotation = current.shortestRotation;
+          let firstFrame = !shortestRotation && current.timelinesRotation.length != timelineCount << 1;
           if (firstFrame)
             current.timelinesRotation.length = timelineCount << 1;
           for (let ii = 0; ii < timelineCount; ii++) {
             let timeline2 = timelines[ii];
             let timelineBlend = timelineMode[ii] == SUBSEQUENT ? blend : MixBlend.setup;
-            if (timeline2 instanceof RotateTimeline) {
+            if (!shortestRotation && timeline2 instanceof RotateTimeline) {
               this.applyRotateTimeline(timeline2, skeleton, applyTime, mix, timelineBlend, current.timelinesRotation, ii << 1, firstFrame);
             } else if (timeline2 instanceof AttachmentTimeline) {
               this.applyAttachmentTimeline(timeline2, skeleton, applyTime, blend, true);
@@ -2719,7 +2720,8 @@ var spine = (() => {
       } else {
         let timelineMode = from.timelineMode;
         let timelineHoldMix = from.timelineHoldMix;
-        let firstFrame = from.timelinesRotation.length != timelineCount << 1;
+        let shortestRotation = from.shortestRotation;
+        let firstFrame = !shortestRotation && from.timelinesRotation.length != timelineCount << 1;
         if (firstFrame)
           from.timelinesRotation.length = timelineCount << 1;
         from.totalAlpha = 0;
@@ -2754,7 +2756,7 @@ var spine = (() => {
               break;
           }
           from.totalAlpha += alpha;
-          if (timeline instanceof RotateTimeline)
+          if (!shortestRotation && timeline instanceof RotateTimeline)
             this.applyRotateTimeline(timeline, skeleton, applyTime, alpha, timelineBlend, from.timelinesRotation, i << 1, firstFrame);
           else if (timeline instanceof AttachmentTimeline)
             this.applyAttachmentTimeline(timeline, skeleton, applyTime, timelineBlend, attachments);
@@ -3010,6 +3012,8 @@ var spine = (() => {
       entry.animation = animation;
       entry.loop = loop;
       entry.holdPrevious = false;
+      entry.reverse = false;
+      entry.shortestRotation = false;
       entry.eventThreshold = 0;
       entry.attachmentThreshold = 0;
       entry.drawOrderThreshold = 0;
@@ -3024,9 +3028,10 @@ var spine = (() => {
       entry.trackEnd = Number.MAX_VALUE;
       entry.timeScale = 1;
       entry.alpha = 1;
-      entry.interruptAlpha = 1;
       entry.mixTime = 0;
       entry.mixDuration = !last ? 0 : this.data.getMix(last.animation, animation);
+      entry.interruptAlpha = 1;
+      entry.totalAlpha = 0;
       entry.mixBlend = MixBlend.replace;
       return entry;
     }
@@ -3126,6 +3131,7 @@ var spine = (() => {
       this.loop = false;
       this.holdPrevious = false;
       this.reverse = false;
+      this.shortestRotation = false;
       this.eventThreshold = 0;
       this.attachmentThreshold = 0;
       this.drawOrderThreshold = 0;