@esotericsoftware/spine-canvaskit 4.2.55 → 4.2.57

package/dist/iife/spine-canvaskit.js

@@ -1554,6 +1554,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 */)
@@ -6415,8 +6420,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;
@@ -7099,25 +7105,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) {
@@ -7145,14 +7154,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;
@@ -10313,7 +10322,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
@@ -11804,9 +11834,19 @@ var spine = (() => {
         throw new Error(`Could not load image ${path}`);
       const paintPerBlendMode = /* @__PURE__ */ new Map();
       const shaders = [];
-      for (const blendMode of [0 /* Normal */, 1 /* Additive */, 2 /* Multiply */, 3 /* Screen */]) {
+      for (const blendMode of [
+        0 /* Normal */,
+        1 /* Additive */,
+        2 /* Multiply */,
+        3 /* Screen */
+      ]) {
         const paint = new ck.Paint();
-        const shader = image.makeShaderOptions(ck.TileMode.Clamp, ck.TileMode.Clamp, ck.FilterMode.Linear, ck.MipmapMode.Linear);
+        const shader = image.makeShaderOptions(
+          ck.TileMode.Clamp,
+          ck.TileMode.Clamp,
+          ck.FilterMode.Linear,
+          ck.MipmapMode.Linear
+        );
         paint.setShader(shader);
         paint.setBlendMode(toCkBlendMode(ck, blendMode));
         paintPerBlendMode.set(blendMode, paint);
@@ -11820,14 +11860,19 @@ var spine = (() => {
     const slashIndex = atlasFile.lastIndexOf("/");
     const parentDir = slashIndex >= 0 ? atlasFile.substring(0, slashIndex + 1) + "/" : "";
     for (const page of atlas.pages) {
-      const texture = await CanvasKitTexture.fromFile(ck, parentDir + page.name, readFile);
+      const texture = await CanvasKitTexture.fromFile(
+        ck,
+        parentDir + page.name,
+        readFile
+      );
       page.setTexture(texture);
     }
     return atlas;
   }
-  async function loadSkeletonData(skeletonFile, atlas, readFile) {
+  async function loadSkeletonData(skeletonFile, atlas, readFile, scale = 1) {
     const attachmentLoader = new AtlasAttachmentLoader(atlas);
     const loader = skeletonFile.endsWith(".json") ? new SkeletonJson(attachmentLoader) : new SkeletonBinary(attachmentLoader);
+    loader.scale = scale;
     let data = await readFile(skeletonFile);
     if (skeletonFile.endsWith(".json")) {
       data = bufferToUtf8String(data);
@@ -11843,7 +11888,9 @@ var spine = (() => {
      */
     constructor(skeletonData) {
       this.skeleton = new Skeleton(skeletonData);
-      this.animationState = new AnimationState(new AnimationStateData(skeletonData));
+      this.animationState = new AnimationState(
+        new AnimationStateData(skeletonData)
+      );
     }
     /**
      * Updates the animation state and skeleton time by the delta time. Applies the
@@ -11911,7 +11958,14 @@ var spine = (() => {
           let mesh = attachment;
           positions = positions.length < mesh.worldVerticesLength ? Utils.newFloatArray(mesh.worldVerticesLength) : positions;
           numVertices = mesh.worldVerticesLength >> 1;
-          mesh.computeWorldVertices(slot, 0, mesh.worldVerticesLength, positions, 0, 2);
+          mesh.computeWorldVertices(
+            slot,
+            0,
+            mesh.worldVerticesLength,
+            positions,
+            0,
+            2
+          );
           triangles = mesh.triangles;
           texture = mesh.region?.texture;
           uvs = mesh.uvs;
@@ -11926,7 +11980,12 @@ var spine = (() => {
         }
         if (texture) {
           if (clipper.isClipping()) {
-            clipper.clipTrianglesUnpacked(positions, triangles, triangles.length, uvs);
+            clipper.clipTrianglesUnpacked(
+              positions,
+              triangles,
+              triangles.length,
+              uvs
+            );
             positions = clipper.clippedVertices;
             uvs = clipper.clippedUVs;
             triangles = clipper.clippedTriangles;
@@ -11953,8 +12012,19 @@ var spine = (() => {
             scaledUvs[i2 + 1] = uvs[i2 + 1] * height;
           }
           const blendMode = slot.data.blendMode;
-          const vertices = this.ck.MakeVertices(this.ck.VertexMode.Triangles, positions, scaledUvs, colors, triangles, false);
-          canvas.drawVertices(vertices, this.ck.BlendMode.Modulate, texture.getImage().paintPerBlendMode.get(blendMode));
+          const vertices = this.ck.MakeVertices(
+            this.ck.VertexMode.Triangles,
+            positions,
+            scaledUvs,
+            colors,
+            triangles,
+            false
+          );
+          canvas.drawVertices(
+            vertices,
+            this.ck.BlendMode.Modulate,
+            texture.getImage().paintPerBlendMode.get(blendMode)
+          );
           vertices.delete();
         }
         clipper.clipEndWithSlot(slot);