@esotericsoftware/spine-canvas 4.3.4 → 4.3.5

package/dist/iife/spine-canvas.js

@@ -4404,16 +4404,16 @@ var spine = (() => {
       for (let i = 0; i < timelineCount; i++) {
         const timeline = timelines[i];
         const mode = timelineMode[i];
+        const fromSetup = (mode & FIRST) !== 0;
         let alpha = 0;
         if ((mode & HOLD) !== 0) {
           const holdMix = timelineHoldMix[i];
           alpha = holdMix == null ? alphaHold : alphaHold * (1 - holdMix.mix());
         } else {
-          if (!drawOrder && timeline instanceof DrawOrderTimeline) continue;
+          if (!drawOrder && timeline instanceof DrawOrderTimeline && !fromSetup) continue;
           alpha = alphaMix;
         }
         from.totalAlpha += alpha;
-        const fromSetup = (mode & FIRST) !== 0;
         if (!shortestRotation && timeline instanceof RotateTimeline) {
           this.applyRotateTimeline(timeline, skeleton, applyTime, alpha, fromSetup, timelinesRotation, i << 1, firstFrame);
         } else if (timeline instanceof AttachmentTimeline)
@@ -4965,7 +4965,7 @@ var spine = (() => {
      * properties keyed by the animation are set to the setup pose and the track is cleared.
      *
      * Usually you want to use {@link AnimationState.addEmptyAnimation} rather than have the animation
-     * abruptly cease being applied. */
+     * abruptly cease being applied, leaving the current pose. */
     trackEnd = 0;
     /** Multiplier for the delta time when this track entry is updated, causing time for this animation to pass slower or
      * faster. Defaults to 1.
@@ -8297,7 +8297,7 @@ ${error}` : ""}`);
     gravityGlobal = false;
     /** True when this constraint's mix is controlled by global slider timelines. */
     mixGlobal = false;
-    /** Determines how the {@link BonePose.scaleY} changes when {@link PhysicsConstraintData.scaleX} sets
+    /** Determines how the {@link BonePose.scaleY} changes when {@link BonePose.scaleX} sets
      * {@link BonePose.scaleX}. */
     _scaleYMode = 0 /* None */;
     get scaleYMode() {
@@ -8427,6 +8427,9 @@ ${error}` : ""}`);
     offset = 0;
     /** When true and a bone is set, the bone's local transform property is read instead of its world transform. */
     local = false;
+    // Nonessential.
+    /** When a bone is set, the maximum slider time for the bone property range, or 0 if nonessential data was not exported. */
+    max = 0;
     constructor(name) {
       super(name, new SliderPose());
     }
@@ -9109,7 +9112,7 @@ ${error}` : ""}`);
         if (additive)
           value -= MathUtils.PI / 2;
         else {
-          value -= by - Math.atan2(bone.c / sx, bone.a / sy);
+          value -= by - Math.atan2(bone.c / sy, bone.a / sx);
           if (value > MathUtils.PI)
             value -= MathUtils.PI2;
           else if (value < -MathUtils.PI)
@@ -9117,8 +9120,8 @@ ${error}` : ""}`);
         }
         value = by + value * pose.mixShearY;
         const s = Math.sqrt(b * b + d * d);
-        bone.b = Math.cos(value) * s * sy;
-        bone.d = Math.sin(value) * s * sx;
+        bone.b = Math.cos(value) * s * sx;
+        bone.d = Math.sin(value) * s * sy;
       }
     }
   };
@@ -9398,7 +9401,13 @@ ${error}` : ""}`);
             data.skinRequired = (flags & 1) !== 0;
             data.loop = (flags & 2) !== 0;
             data.additive = (flags & 4) !== 0;
-            if ((flags & 8) !== 0) data.setupPose.time = input.readFloat();
+            if ((flags & 8) !== 0) {
+              const value = input.readFloat();
+              if (nonessential && (flags & 64) !== 0)
+                data.max = value;
+              else
+                data.setupPose.time = value;
+            }
             if ((flags & 16) !== 0) data.setupPose.mix = (flags & 32) !== 0 ? input.readFloat() : 1;
             if ((flags & 64) !== 0) {
               data.local = (flags & 128) !== 0;
@@ -11823,7 +11832,6 @@ ${error}` : ""}`);
               data.skinRequired = skinRequired;
               data.additive = getValue(constraintMap, "additive", false);
               data.loop = getValue(constraintMap, "loop", false);
-              data.setupPose.time = getValue(constraintMap, "time", 0);
               data.setupPose.mix = getValue(constraintMap, "mix", 1);
               const boneName = constraintMap.bone;
               if (boneName) {
@@ -11835,8 +11843,10 @@ ${error}` : ""}`);
                 data.property.offset = getValue(constraintMap, "from", 0) * propertyScale;
                 data.offset = getValue(constraintMap, "to", 0);
                 data.scale = getValue(constraintMap, "scale", 1) / propertyScale;
+                data.max = getValue(constraintMap, "max", 0);
                 data.local = getValue(constraintMap, "local", false);
-              }
+              } else
+                data.setupPose.time = getValue(constraintMap, "time", 0);
               skeletonData.constraints.push(data);
               break;
             }
@@ -12413,7 +12423,7 @@ ${error}` : ""}`);
           let mixRotate = getValue(keyMap, "mixRotate", 1);
           let mixX = getValue(keyMap, "mixX", 1), mixY = getValue(keyMap, "mixY", mixX);
           let mixScaleX = getValue(keyMap, "mixScaleX", 1), mixScaleY = getValue(keyMap, "mixScaleY", 1);
-          const mixShearY = getValue(keyMap, "mixShearY", 1);
+          let mixShearY = getValue(keyMap, "mixShearY", 1);
           for (let frame = 0, bezier = 0; ; frame++) {
             timeline.setFrame(frame, time, mixRotate, mixX, mixY, mixScaleX, mixScaleY, mixShearY);
             const nextMap = timelineMap[frame + 1];
@@ -12441,7 +12451,7 @@ ${error}` : ""}`);
             mixY = mixY2;
             mixScaleX = mixScaleX2;
             mixScaleY = mixScaleY2;
-            mixScaleX = mixScaleX2;
+            mixShearY = mixShearY2;
             keyMap = nextMap;
           }
           timelines.push(timeline);