@esotericsoftware/spine-webgl 4.3.4 → 4.3.5

package/dist/esm/spine-webgl.mjs

@@ -4217,16 +4217,16 @@ var AnimationState = class _AnimationState {
     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)
@@ -4778,7 +4778,7 @@ var TrackEntry = class {
    * 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.
@@ -8110,7 +8110,7 @@ var PhysicsConstraintData = class extends ConstraintData {
   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() {
@@ -8240,6 +8240,9 @@ var SliderData = class extends ConstraintData {
   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());
   }
@@ -8922,7 +8925,7 @@ var ToShearY = class extends ToProperty {
       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)
@@ -8930,8 +8933,8 @@ var ToShearY = class extends ToProperty {
       }
       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;
     }
   }
 };
@@ -9211,7 +9214,13 @@ var SkeletonBinary = class {
           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;
@@ -11636,7 +11645,6 @@ var SkeletonJson = class {
             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) {
@@ -11648,8 +11656,10 @@ var SkeletonJson = class {
               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;
           }
@@ -12226,7 +12236,7 @@ var SkeletonJson = class {
         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];
@@ -12254,7 +12264,7 @@ var SkeletonJson = class {
           mixY = mixY2;
           mixScaleX = mixScaleX2;
           mixScaleY = mixScaleY2;
-          mixScaleX = mixScaleX2;
+          mixShearY = mixShearY2;
           keyMap = nextMap;
         }
         timelines.push(timeline);