@esotericsoftware/spine-canvas 4.2.56 → 4.2.58

package/dist/iife/spine-canvas.js

@@ -1553,6 +1553,11 @@ var spine = (() => {
       let bone = skeleton.bones[this.boneIndex];
       if (!bone.active)
         return;
+      if (direction == 1 /* mixOut */) {
+        if (blend == 0 /* setup */)
+          bone.inherit = bone.data.inherit;
+        return;
+      }
       let frames = this.frames;
       if (time < frames[0]) {
         if (blend == 0 /* setup */ || blend == 1 /* first */)
@@ -6414,8 +6419,9 @@ var spine = (() => {
             q = -(c1 + q) * 0.5;
             let r0 = q / c2, r1 = c / q;
             let r = Math.abs(r0) < Math.abs(r1) ? r0 : r1;
-            if (r * r <= dd) {
-              y = Math.sqrt(dd - r * r) * bendDir;
+            r0 = dd - r * r;
+            if (r0 >= 0) {
+              y = Math.sqrt(r0) * bendDir;
               a1 = ta - Math.atan2(y, r);
               a2 = Math.atan2(y / psy, (r - l1) / psx);
               break outer;
@@ -7098,25 +7104,28 @@ var spine = (() => {
         case 1 /* reset */:
           this.reset();
         case 2 /* update */:
+          const skeleton = this.skeleton;
           const delta = Math.max(this.skeleton.time - this.lastTime, 0);
           this.remaining += delta;
-          this.lastTime = this.skeleton.time;
+          this.lastTime = skeleton.time;
           const bx = bone.worldX, by = bone.worldY;
           if (this._reset) {
             this._reset = false;
             this.ux = bx;
             this.uy = by;
           } else {
-            let a = this.remaining, i = this.inertia, q = this.data.limit * delta, t = this.data.step, f = this.skeleton.data.referenceScale, d = -1;
+            let a = this.remaining, i = this.inertia, t = this.data.step, f = this.skeleton.data.referenceScale, d = -1;
+            let qx = this.data.limit * delta, qy = qx * Math.abs(skeleton.scaleY);
+            qx *= Math.abs(skeleton.scaleX);
             if (x || y) {
               if (x) {
                 const u = (this.ux - bx) * i;
-                this.xOffset += u > q ? q : u < -q ? -q : u;
+                this.xOffset += u > qx ? qx : u < -qx ? -qx : u;
                 this.ux = bx;
               }
               if (y) {
                 const u = (this.uy - by) * i;
-                this.yOffset += u > q ? q : u < -q ? -q : u;
+                this.yOffset += u > qy ? qy : u < -qy ? -qy : u;
                 this.uy = by;
               }
               if (a >= t) {
@@ -7144,14 +7153,14 @@ var spine = (() => {
             if (rotateOrShearX || scaleX) {
               let ca = Math.atan2(bone.c, bone.a), c = 0, s = 0, mr = 0;
               let dx = this.cx - bone.worldX, dy = this.cy - bone.worldY;
-              if (dx > q)
-                dx = q;
-              else if (dx < -q)
-                dx = -q;
-              if (dy > q)
-                dy = q;
-              else if (dy < -q)
-                dy = -q;
+              if (dx > qx)
+                dx = qx;
+              else if (dx < -qx)
+                dx = -qx;
+              if (dy > qy)
+                dy = qy;
+              else if (dy < -qy)
+                dy = -qy;
               if (rotateOrShearX) {
                 mr = (this.data.rotate + this.data.shearX) * mix;
                 let r = Math.atan2(dy + this.ty, dx + this.tx) - ca - this.rotateOffset * mr;
@@ -10312,7 +10321,28 @@ var spine = (() => {
     isClipping() {
       return this.clipAttachment != null;
     }
-    clipTriangles(vertices, triangles, trianglesLength, uvs, light, dark, twoColor) {
+    clipTriangles(vertices, verticesLengthOrTriangles, trianglesOrTrianglesLength, trianglesLengthOrUvs, uvsOrLight, lightOrDark, darkOrTwoColor, twoColorParam) {
+      let triangles;
+      let trianglesLength;
+      let uvs;
+      let light;
+      let dark;
+      let twoColor;
+      if (typeof verticesLengthOrTriangles === "number") {
+        triangles = trianglesOrTrianglesLength;
+        trianglesLength = trianglesLengthOrUvs;
+        uvs = uvsOrLight;
+        light = lightOrDark;
+        dark = darkOrTwoColor;
+        twoColor = twoColorParam;
+      } else {
+        triangles = verticesLengthOrTriangles;
+        trianglesLength = trianglesOrTrianglesLength;
+        uvs = trianglesLengthOrUvs;
+        light = uvsOrLight;
+        dark = lightOrDark;
+        twoColor = darkOrTwoColor;
+      }
       if (uvs && light && dark && typeof twoColor === "boolean")
         this.clipTrianglesRender(vertices, triangles, trianglesLength, uvs, light, dark, twoColor);
       else