@esotericsoftware/spine-canvaskit 4.2.54 → 4.2.56

package/dist/iife/spine-canvaskit.js

@@ -11760,7 +11760,7 @@ var spine = (() => {
       case 1 /* Additive */:
         return ck.BlendMode.Plus;
       case 2 /* Multiply */:
-        return ck.BlendMode.Modulate;
+        return ck.BlendMode.SrcOver;
       case 3 /* Screen */:
         return ck.BlendMode.Screen;
       default:
@@ -11804,9 +11804,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,15 +11830,24 @@ 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);
-    const skeletonData = loader.readSkeletonData(await readFile(skeletonFile));
+    loader.scale = scale;
+    let data = await readFile(skeletonFile);
+    if (skeletonFile.endsWith(".json")) {
+      data = bufferToUtf8String(data);
+    }
+    const skeletonData = loader.readSkeletonData(data);
     return skeletonData;
   }
   var SkeletonDrawable = class {
@@ -11839,7 +11858,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
@@ -11907,7 +11928,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;
@@ -11922,7 +11950,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;
@@ -11949,8 +11982,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);