@esotericsoftware/spine-canvas 4.0.7 → 4.0.11

package/dist/AssetManager.js

@@ -26,31 +26,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 import { AssetManagerBase } from "@esotericsoftware/spine-core";
 import { CanvasTexture } from "./CanvasTexture";
-var AssetManager = /** @class */ (function (_super) {
-    __extends(AssetManager, _super);
-    function AssetManager(pathPrefix, downloader) {
-        if (pathPrefix === void 0) { pathPrefix = ""; }
-        if (downloader === void 0) { downloader = null; }
-        return _super.call(this, function (image) { return new CanvasTexture(image); }, pathPrefix, downloader) || this;
+export class AssetManager extends AssetManagerBase {
+    constructor(pathPrefix = "", downloader = null) {
+        super((image) => { return new CanvasTexture(image); }, pathPrefix, downloader);
     }
-    return AssetManager;
-}(AssetManagerBase));
-export { AssetManager };
-//# sourceMappingURL=AssetManager.js.map
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXNzZXRNYW5hZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0Fzc2V0TWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OytFQTJCK0U7QUFFL0UsT0FBTyxFQUFFLGdCQUFnQixFQUFjLE1BQU0sOEJBQThCLENBQUE7QUFDM0UsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBRWhELE1BQU0sT0FBTyxZQUFhLFNBQVEsZ0JBQWdCO0lBQ2pELFlBQWEsYUFBcUIsRUFBRSxFQUFFLGFBQXlCLElBQUk7UUFDbEUsS0FBSyxDQUFDLENBQUMsS0FBdUIsRUFBRSxFQUFFLEdBQUcsT0FBTyxJQUFJLGFBQWEsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxVQUFVLEVBQUUsVUFBVSxDQUFDLENBQUM7SUFDbEcsQ0FBQztDQUNEIn0=

package/dist/CanvasTexture.js

@@ -26,31 +26,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 import { Texture } from "@esotericsoftware/spine-core";
-var CanvasTexture = /** @class */ (function (_super) {
-    __extends(CanvasTexture, _super);
-    function CanvasTexture(image) {
-        return _super.call(this, image) || this;
+export class CanvasTexture extends Texture {
+    constructor(image) {
+        super(image);
     }
-    CanvasTexture.prototype.setFilters = function (minFilter, magFilter) { };
-    CanvasTexture.prototype.setWraps = function (uWrap, vWrap) { };
-    CanvasTexture.prototype.dispose = function () { };
-    return CanvasTexture;
-}(Texture));
-export { CanvasTexture };
-//# sourceMappingURL=CanvasTexture.js.map
+    setFilters(minFilter, magFilter) { }
+    setWraps(uWrap, vWrap) { }
+    dispose() { }
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2FudmFzVGV4dHVyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9DYW52YXNUZXh0dXJlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7K0VBMkIrRTtBQUUvRSxPQUFPLEVBQUUsT0FBTyxFQUE4QixNQUFNLDhCQUE4QixDQUFDO0FBRW5GLE1BQU0sT0FBTyxhQUFjLFNBQVEsT0FBTztJQUN6QyxZQUFhLEtBQXVCO1FBQ25DLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNkLENBQUM7SUFFRCxVQUFVLENBQUUsU0FBd0IsRUFBRSxTQUF3QixJQUFJLENBQUM7SUFDbkUsUUFBUSxDQUFFLEtBQWtCLEVBQUUsS0FBa0IsSUFBSSxDQUFDO0lBQ3JELE9BQU8sS0FBTSxDQUFDO0NBQ2QifQ==

package/dist/SkeletonRenderer.js

@@ -27,50 +27,50 @@
  * THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
 import { Utils, Color, RegionAttachment, MeshAttachment } from "@esotericsoftware/spine-core";
-var SkeletonRenderer = /** @class */ (function () {
-    function SkeletonRenderer(context) {
+export class SkeletonRenderer {
+    constructor(context) {
         this.triangleRendering = false;
         this.debugRendering = false;
         this.vertices = Utils.newFloatArray(8 * 1024);
         this.tempColor = new Color();
         this.ctx = context;
     }
-    SkeletonRenderer.prototype.draw = function (skeleton) {
+    draw(skeleton) {
         if (this.triangleRendering)
             this.drawTriangles(skeleton);
         else
             this.drawImages(skeleton);
-    };
-    SkeletonRenderer.prototype.drawImages = function (skeleton) {
-        var ctx = this.ctx;
-        var color = this.tempColor;
-        var skeletonColor = skeleton.color;
-        var drawOrder = skeleton.drawOrder;
+    }
+    drawImages(skeleton) {
+        let ctx = this.ctx;
+        let color = this.tempColor;
+        let skeletonColor = skeleton.color;
+        let drawOrder = skeleton.drawOrder;
         if (this.debugRendering)
             ctx.strokeStyle = "green";
-        for (var i = 0, n = drawOrder.length; i < n; i++) {
-            var slot = drawOrder[i];
-            var bone = slot.bone;
+        for (let i = 0, n = drawOrder.length; i < n; i++) {
+            let slot = drawOrder[i];
+            let bone = slot.bone;
             if (!bone.active)
                 continue;
-            var attachment = slot.getAttachment();
+            let attachment = slot.getAttachment();
             if (!(attachment instanceof RegionAttachment))
                 continue;
-            var region = attachment.region;
-            var image = region.page.texture.getImage();
-            var slotColor = slot.color;
-            var regionColor = attachment.color;
+            let region = attachment.region;
+            let image = region.page.texture.getImage();
+            let slotColor = slot.color;
+            let regionColor = attachment.color;
             color.set(skeletonColor.r * slotColor.r * regionColor.r, skeletonColor.g * slotColor.g * regionColor.g, skeletonColor.b * slotColor.b * regionColor.b, skeletonColor.a * slotColor.a * regionColor.a);
             ctx.save();
             ctx.transform(bone.a, bone.c, bone.b, bone.d, bone.worldX, bone.worldY);
             ctx.translate(attachment.offset[0], attachment.offset[1]);
             ctx.rotate(attachment.rotation * Math.PI / 180);
-            var atlasScale = attachment.width / region.originalWidth;
+            let atlasScale = attachment.width / region.originalWidth;
             ctx.scale(atlasScale * attachment.scaleX, atlasScale * attachment.scaleY);
-            var w = region.width, h = region.height;
+            let w = region.width, h = region.height;
             ctx.translate(w / 2, h / 2);
             if (attachment.region.degrees == 90) {
-                var t = w;
+                let t = w;
                 w = h;
                 h = t;
                 ctx.rotate(-Math.PI / 2);
@@ -89,29 +89,29 @@ var SkeletonRenderer = /** @class */ (function () {
                 ctx.strokeRect(0, 0, w, h);
             ctx.restore();
         }
-    };
-    SkeletonRenderer.prototype.drawTriangles = function (skeleton) {
-        var ctx = this.ctx;
-        var color = this.tempColor;
-        var skeletonColor = skeleton.color;
-        var drawOrder = skeleton.drawOrder;
-        var blendMode = null;
-        var vertices = this.vertices;
-        var triangles = null;
-        for (var i = 0, n = drawOrder.length; i < n; i++) {
-            var slot = drawOrder[i];
-            var attachment = slot.getAttachment();
-            var texture = void 0;
-            var region = void 0;
+    }
+    drawTriangles(skeleton) {
+        let ctx = this.ctx;
+        let color = this.tempColor;
+        let skeletonColor = skeleton.color;
+        let drawOrder = skeleton.drawOrder;
+        let blendMode = null;
+        let vertices = this.vertices;
+        let triangles = null;
+        for (let i = 0, n = drawOrder.length; i < n; i++) {
+            let slot = drawOrder[i];
+            let attachment = slot.getAttachment();
+            let texture;
+            let region;
             if (attachment instanceof RegionAttachment) {
-                var regionAttachment = attachment;
+                let regionAttachment = attachment;
                 vertices = this.computeRegionVertices(slot, regionAttachment, false);
                 triangles = SkeletonRenderer.QUAD_TRIANGLES;
                 region = regionAttachment.region;
                 texture = region.page.texture.getImage();
             }
             else if (attachment instanceof MeshAttachment) {
-                var mesh = attachment;
+                let mesh = attachment;
                 vertices = this.computeMeshVertices(slot, mesh, false);
                 triangles = mesh.triangles;
                 texture = mesh.region.renderObject.page.texture.getImage();
@@ -121,8 +121,8 @@ var SkeletonRenderer = /** @class */ (function () {
             if (texture) {
                 if (slot.data.blendMode != blendMode)
                     blendMode = slot.data.blendMode;
-                var slotColor = slot.color;
-                var attachmentColor = attachment.color;
+                let slotColor = slot.color;
+                let attachmentColor = attachment.color;
                 color.set(skeletonColor.r * slotColor.r * attachmentColor.r, skeletonColor.g * slotColor.g * attachmentColor.g, skeletonColor.b * slotColor.b * attachmentColor.b, skeletonColor.a * slotColor.a * attachmentColor.a);
                 if (color.r != 1 || color.g != 1 || color.b != 1 || color.a != 1) {
                     ctx.globalAlpha = color.a;
@@ -132,10 +132,10 @@ var SkeletonRenderer = /** @class */ (function () {
                     // ctx.fillRect(0, 0, w, h);
                 }
                 for (var j = 0; j < triangles.length; j += 3) {
-                    var t1 = triangles[j] * 8, t2 = triangles[j + 1] * 8, t3 = triangles[j + 2] * 8;
-                    var x0 = vertices[t1], y0 = vertices[t1 + 1], u0 = vertices[t1 + 6], v0 = vertices[t1 + 7];
-                    var x1 = vertices[t2], y1 = vertices[t2 + 1], u1 = vertices[t2 + 6], v1 = vertices[t2 + 7];
-                    var x2 = vertices[t3], y2 = vertices[t3 + 1], u2 = vertices[t3 + 6], v2 = vertices[t3 + 7];
+                    let t1 = triangles[j] * 8, t2 = triangles[j + 1] * 8, t3 = triangles[j + 2] * 8;
+                    let x0 = vertices[t1], y0 = vertices[t1 + 1], u0 = vertices[t1 + 6], v0 = vertices[t1 + 7];
+                    let x1 = vertices[t2], y1 = vertices[t2 + 1], u1 = vertices[t2 + 6], v1 = vertices[t2 + 7];
+                    let x2 = vertices[t3], y2 = vertices[t3 + 1], u2 = vertices[t3 + 6], v2 = vertices[t3 + 7];
                     this.drawTriangle(texture, x0, y0, u0, v0, x1, y1, u1, v1, x2, y2, u2, v2);
                     if (this.debugRendering) {
                         ctx.strokeStyle = "green";
@@ -150,11 +150,11 @@ var SkeletonRenderer = /** @class */ (function () {
             }
         }
         this.ctx.globalAlpha = 1;
-    };
+    }
     // Adapted from http://extremelysatisfactorytotalitarianism.com/blog/?p=2120
     // Apache 2 licensed
-    SkeletonRenderer.prototype.drawTriangle = function (img, x0, y0, u0, v0, x1, y1, u1, v1, x2, y2, u2, v2) {
-        var ctx = this.ctx;
+    drawTriangle(img, x0, y0, u0, v0, x1, y1, u1, v1, x2, y2, u2, v2) {
+        let ctx = this.ctx;
         u0 *= img.width;
         v0 *= img.height;
         u1 *= img.width;
@@ -184,18 +184,18 @@ var SkeletonRenderer = /** @class */ (function () {
         ctx.clip();
         ctx.drawImage(img, 0, 0);
         ctx.restore();
-    };
-    SkeletonRenderer.prototype.computeRegionVertices = function (slot, region, pma) {
-        var skeletonColor = slot.bone.skeleton.color;
-        var slotColor = slot.color;
-        var regionColor = region.color;
-        var alpha = skeletonColor.a * slotColor.a * regionColor.a;
-        var multiplier = pma ? alpha : 1;
-        var color = this.tempColor;
+    }
+    computeRegionVertices(slot, region, pma) {
+        let skeletonColor = slot.bone.skeleton.color;
+        let slotColor = slot.color;
+        let regionColor = region.color;
+        let alpha = skeletonColor.a * slotColor.a * regionColor.a;
+        let multiplier = pma ? alpha : 1;
+        let color = this.tempColor;
         color.set(skeletonColor.r * slotColor.r * regionColor.r * multiplier, skeletonColor.g * slotColor.g * regionColor.g * multiplier, skeletonColor.b * slotColor.b * regionColor.b * multiplier, alpha);
         region.computeWorldVertices(slot.bone, this.vertices, 0, SkeletonRenderer.VERTEX_SIZE);
-        var vertices = this.vertices;
-        var uvs = region.uvs;
+        let vertices = this.vertices;
+        let uvs = region.uvs;
         vertices[RegionAttachment.C1R] = color.r;
         vertices[RegionAttachment.C1G] = color.g;
         vertices[RegionAttachment.C1B] = color.b;
@@ -221,22 +221,22 @@ var SkeletonRenderer = /** @class */ (function () {
         vertices[RegionAttachment.U4] = uvs[6];
         vertices[RegionAttachment.V4] = uvs[7];
         return vertices;
-    };
-    SkeletonRenderer.prototype.computeMeshVertices = function (slot, mesh, pma) {
-        var skeletonColor = slot.bone.skeleton.color;
-        var slotColor = slot.color;
-        var regionColor = mesh.color;
-        var alpha = skeletonColor.a * slotColor.a * regionColor.a;
-        var multiplier = pma ? alpha : 1;
-        var color = this.tempColor;
+    }
+    computeMeshVertices(slot, mesh, pma) {
+        let skeletonColor = slot.bone.skeleton.color;
+        let slotColor = slot.color;
+        let regionColor = mesh.color;
+        let alpha = skeletonColor.a * slotColor.a * regionColor.a;
+        let multiplier = pma ? alpha : 1;
+        let color = this.tempColor;
         color.set(skeletonColor.r * slotColor.r * regionColor.r * multiplier, skeletonColor.g * slotColor.g * regionColor.g * multiplier, skeletonColor.b * slotColor.b * regionColor.b * multiplier, alpha);
-        var vertexCount = mesh.worldVerticesLength / 2;
-        var vertices = this.vertices;
+        let vertexCount = mesh.worldVerticesLength / 2;
+        let vertices = this.vertices;
         if (vertices.length < mesh.worldVerticesLength)
             this.vertices = vertices = Utils.newFloatArray(mesh.worldVerticesLength);
         mesh.computeWorldVertices(slot, 0, mesh.worldVerticesLength, vertices, 0, SkeletonRenderer.VERTEX_SIZE);
-        var uvs = mesh.uvs;
-        for (var i = 0, u = 0, v = 2; i < vertexCount; i++) {
+        let uvs = mesh.uvs;
+        for (let i = 0, u = 0, v = 2; i < vertexCount; i++) {
             vertices[v++] = color.r;
             vertices[v++] = color.g;
             vertices[v++] = color.b;
@@ -246,10 +246,8 @@ var SkeletonRenderer = /** @class */ (function () {
             v += 2;
         }
         return vertices;
-    };
-    SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
-    SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4;
-    return SkeletonRenderer;
-}());
-export { SkeletonRenderer };
-//# sourceMappingURL=SkeletonRenderer.js.map
+    }
+}
+SkeletonRenderer.QUAD_TRIANGLES = [0, 1, 2, 2, 3, 0];
+SkeletonRenderer.VERTEX_SIZE = 2 + 2 + 4;
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SkeletonRenderer.js","sourceRoot":"","sources":["../src/SkeletonRenderer.ts"],"names":[],"mappings":"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"}

package/dist/iife/spine-canvas.js

@@ -1031,10 +1031,8 @@ var spine = (() => {
               bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
               break;
             case 3:
-              bx = bone.scaleX;
-              by = bone.scaleY;
-              bone.scaleX = bx + (Math.abs(x) * MathUtils.signum(bx) - bone.data.scaleX) * alpha;
-              bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - bone.data.scaleY) * alpha;
+              bone.scaleX = (x - bone.data.scaleX) * alpha;
+              bone.scaleY = (y - bone.data.scaleY) * alpha;
           }
         } else {
           switch (blend) {
@@ -1052,10 +1050,8 @@ var spine = (() => {
               bone.scaleY = by + (y - by) * alpha;
               break;
             case 3:
-              bx = MathUtils.signum(x);
-              by = MathUtils.signum(y);
-              bone.scaleX = Math.abs(bone.scaleX) * bx + (x - Math.abs(bone.data.scaleX) * bx) * alpha;
-              bone.scaleY = Math.abs(bone.scaleY) * by + (y - Math.abs(bone.data.scaleY) * by) * alpha;
+              bone.scaleX += (x - bone.data.scaleX) * alpha;
+              bone.scaleY += (y - bone.data.scaleY) * alpha;
           }
         }
       }
@@ -1102,8 +1098,7 @@ var spine = (() => {
               bone.scaleX = bx + (Math.abs(x) * MathUtils.signum(bx) - bx) * alpha;
               break;
             case 3:
-              bx = bone.scaleX;
-              bone.scaleX = bx + (Math.abs(x) * MathUtils.signum(bx) - bone.data.scaleX) * alpha;
+              bone.scaleX = (x - bone.data.scaleX) * alpha;
           }
         } else {
           switch (blend) {
@@ -1117,8 +1112,7 @@ var spine = (() => {
               bone.scaleX = bx + (x - bx) * alpha;
               break;
             case 3:
-              bx = MathUtils.signum(x);
-              bone.scaleX = Math.abs(bone.scaleX) * bx + (x - Math.abs(bone.data.scaleX) * bx) * alpha;
+              bone.scaleX += (x - bone.data.scaleX) * alpha;
           }
         }
       }
@@ -1165,8 +1159,7 @@ var spine = (() => {
               bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - by) * alpha;
               break;
             case 3:
-              by = bone.scaleY;
-              bone.scaleY = by + (Math.abs(y) * MathUtils.signum(by) - bone.data.scaleY) * alpha;
+              bone.scaleY = (y - bone.data.scaleY) * alpha;
           }
         } else {
           switch (blend) {
@@ -1180,8 +1173,7 @@ var spine = (() => {
               bone.scaleY = by + (y - by) * alpha;
               break;
             case 3:
-              by = MathUtils.signum(y);
-              bone.scaleY = Math.abs(bone.scaleY) * by + (y - Math.abs(bone.data.scaleY) * by) * alpha;
+              bone.scaleY += (y - bone.data.scaleY) * alpha;
           }
         }
       }
@@ -4005,8 +3997,8 @@ var spine = (() => {
     updateAppliedTransform() {
       let parent = this.parent;
       if (!parent) {
-        this.ax = this.worldX;
-        this.ay = this.worldY;
+        this.ax = this.worldX - this.skeleton.x;
+        this.ay = this.worldY - this.skeleton.y;
         this.arotation = Math.atan2(this.c, this.a) * MathUtils.radDeg;
         this.ascaleX = Math.sqrt(this.a * this.a + this.c * this.c);
         this.ascaleY = Math.sqrt(this.b * this.b + this.d * this.d);
@@ -4247,11 +4239,49 @@ var spine = (() => {
       this.callbacks = {};
       this.rawDataUris = {};
     }
+    dataUriToString(dataUri) {
+      if (!dataUri.startsWith("data:")) {
+        throw new Error("Not a data URI.");
+      }
+      let base64Idx = dataUri.indexOf("base64,");
+      if (base64Idx != -1) {
+        base64Idx += "base64,".length;
+        return atob(dataUri.substr(base64Idx));
+      } else {
+        return dataUri.substr(dataUri.indexOf(",") + 1);
+      }
+    }
+    base64ToArrayBuffer(base64) {
+      var binary_string = window.atob(base64);
+      var len = binary_string.length;
+      var bytes = new Uint8Array(len);
+      for (var i = 0; i < len; i++) {
+        bytes[i] = binary_string.charCodeAt(i);
+      }
+      return bytes.buffer;
+    }
+    dataUriToUint8Array(dataUri) {
+      if (!dataUri.startsWith("data:")) {
+        throw new Error("Not a data URI.");
+      }
+      let base64Idx = dataUri.indexOf("base64,");
+      if (base64Idx == -1)
+        throw new Error("Not a binary data URI.");
+      base64Idx += "base64,".length;
+      return this.base64ToArrayBuffer(dataUri.substr(base64Idx));
+    }
     downloadText(url, success, error) {
-      if (this.rawDataUris[url])
-        url = this.rawDataUris[url];
       if (this.start(url, success, error))
         return;
+      if (this.rawDataUris[url]) {
+        try {
+          let dataUri = this.rawDataUris[url];
+          this.finish(url, 200, this.dataUriToString(dataUri));
+        } catch (e) {
+          this.finish(url, 400, JSON.stringify(e));
+        }
+        return;
+      }
       let request = new XMLHttpRequest();
       request.overrideMimeType("text/html");
       request.open("GET", url, true);
@@ -4268,10 +4298,17 @@ var spine = (() => {
       }, error);
     }
     downloadBinary(url, success, error) {
-      if (this.rawDataUris[url])
-        url = this.rawDataUris[url];
       if (this.start(url, success, error))
         return;
+      if (this.rawDataUris[url]) {
+        try {
+          let dataUri = this.rawDataUris[url];
+          this.finish(url, 200, this.dataUriToUint8Array(dataUri));
+        } catch (e) {
+          this.finish(url, 400, JSON.stringify(e));
+        }
+        return;
+      }
       let request = new XMLHttpRequest();
       request.open("GET", url, true);
       request.responseType = "arraybuffer";
@@ -5591,15 +5628,6 @@ var spine = (() => {
       }
       return null;
     }
-    findBoneIndex(boneName) {
-      if (!boneName)
-        throw new Error("boneName cannot be null.");
-      let bones = this.bones;
-      for (let i = 0, n = bones.length; i < n; i++)
-        if (bones[i].data.name == boneName)
-          return i;
-      return -1;
-    }
     findSlot(slotName) {
       if (!slotName)
         throw new Error("slotName cannot be null.");
@@ -5611,15 +5639,6 @@ var spine = (() => {
       }
       return null;
     }
-    findSlotIndex(slotName) {
-      if (!slotName)
-        throw new Error("slotName cannot be null.");
-      let slots = this.slots;
-      for (let i = 0, n = slots.length; i < n; i++)
-        if (slots[i].data.name == slotName)
-          return i;
-      return -1;
-    }
     setSkinByName(skinName) {
       let skin = this.data.findSkin(skinName);
       if (!skin)
@@ -5649,7 +5668,7 @@ var spine = (() => {
       this.updateCache();
     }
     getAttachmentByName(slotName, attachmentName) {
-      return this.getAttachment(this.data.findSlotIndex(slotName), attachmentName);
+      return this.getAttachment(this.data.findSlot(slotName).index, attachmentName);
     }
     getAttachment(slotIndex, attachmentName) {
       if (!attachmentName)
@@ -5781,15 +5800,6 @@ var spine = (() => {
       }
       return null;
     }
-    findBoneIndex(boneName) {
-      if (!boneName)
-        throw new Error("boneName cannot be null.");
-      let bones = this.bones;
-      for (let i = 0, n = bones.length; i < n; i++)
-        if (bones[i].name == boneName)
-          return i;
-      return -1;
-    }
     findSlot(slotName) {
       if (!slotName)
         throw new Error("slotName cannot be null.");
@@ -5801,15 +5811,6 @@ var spine = (() => {
       }
       return null;
     }
-    findSlotIndex(slotName) {
-      if (!slotName)
-        throw new Error("slotName cannot be null.");
-      let slots = this.slots;
-      for (let i = 0, n = slots.length; i < n; i++)
-        if (slots[i].name == slotName)
-          return i;
-      return -1;
-    }
     findSkin(skinName) {
       if (!skinName)
         throw new Error("skinName cannot be null.");
@@ -8094,20 +8095,21 @@ var spine = (() => {
       if (map.slots) {
         for (let slotName in map.slots) {
           let slotMap = map.slots[slotName];
-          let slotIndex = skeletonData.findSlotIndex(slotName);
+          let slotIndex = skeletonData.findSlot(slotName).index;
           for (let timelineName in slotMap) {
             let timelineMap = slotMap[timelineName];
             if (!timelineMap)
               continue;
+            let frames = timelineMap.length;
             if (timelineName == "attachment") {
-              let timeline = new AttachmentTimeline(timelineMap.length, slotIndex);
-              for (let frame = 0; frame < timelineMap.length; frame++) {
+              let timeline = new AttachmentTimeline(frames, slotIndex);
+              for (let frame = 0; frame < frames; frame++) {
                 let keyMap = timelineMap[frame];
                 timeline.setFrame(frame, getValue(keyMap, "time", 0), keyMap.name);
               }
               timelines.push(timeline);
             } else if (timelineName == "rgba") {
-              let timeline = new RGBATimeline(timelineMap.length, timelineMap.length << 2, slotIndex);
+              let timeline = new RGBATimeline(frames, frames << 2, slotIndex);
               let keyMap = timelineMap[0];
               let time = getValue(keyMap, "time", 0);
               let color = Color.fromString(keyMap.color);
@@ -8133,7 +8135,7 @@ var spine = (() => {
               }
               timelines.push(timeline);
             } else if (timelineName == "rgb") {
-              let timeline = new RGBTimeline(timelineMap.length, timelineMap.length * 3, slotIndex);
+              let timeline = new RGBTimeline(frames, frames * 3, slotIndex);
               let keyMap = timelineMap[0];
               let time = getValue(keyMap, "time", 0);
               let color = Color.fromString(keyMap.color);
@@ -8158,9 +8160,9 @@ var spine = (() => {
               }
               timelines.push(timeline);
             } else if (timelineName == "alpha") {
-              timelines.push(readTimeline12(timelineMap, new AlphaTimeline(timelineMap.length, timelineMap.length, slotIndex), 0, 1));
+              timelines.push(readTimeline12(timelineMap, new AlphaTimeline(frames, frames, slotIndex), 0, 1));
             } else if (timelineName == "rgba2") {
-              let timeline = new RGBA2Timeline(timelineMap.length, timelineMap.length * 7, slotIndex);
+              let timeline = new RGBA2Timeline(frames, frames * 7, slotIndex);
               let keyMap = timelineMap[0];
               let time = getValue(keyMap, "time", 0);
               let color = Color.fromString(keyMap.light);
@@ -8192,7 +8194,7 @@ var spine = (() => {
               }
               timelines.push(timeline);
             } else if (timelineName == "rgb2") {
-              let timeline = new RGB2Timeline(timelineMap.length, timelineMap.length * 6, slotIndex);
+              let timeline = new RGB2Timeline(frames, frames * 6, slotIndex);
               let keyMap = timelineMap[0];
               let time = getValue(keyMap, "time", 0);
               let color = Color.fromString(keyMap.light);
@@ -8229,39 +8231,40 @@ var spine = (() => {
       if (map.bones) {
         for (let boneName in map.bones) {
           let boneMap = map.bones[boneName];
-          let boneIndex = skeletonData.findBoneIndex(boneName);
+          let boneIndex = skeletonData.findBone(boneName).index;
           for (let timelineName in boneMap) {
             let timelineMap = boneMap[timelineName];
-            if (timelineMap.length == 0)
+            let frames = timelineMap.length;
+            if (frames == 0)
               continue;
             if (timelineName === "rotate") {
-              timelines.push(readTimeline12(timelineMap, new RotateTimeline(timelineMap.length, timelineMap.length, boneIndex), 0, 1));
+              timelines.push(readTimeline12(timelineMap, new RotateTimeline(frames, frames, boneIndex), 0, 1));
             } else if (timelineName === "translate") {
-              let timeline = new TranslateTimeline(timelineMap.length, timelineMap.length << 1, boneIndex);
+              let timeline = new TranslateTimeline(frames, frames << 1, boneIndex);
               timelines.push(readTimeline22(timelineMap, timeline, "x", "y", 0, scale));
             } else if (timelineName === "translatex") {
-              let timeline = new TranslateXTimeline(timelineMap.length, timelineMap.length, boneIndex);
+              let timeline = new TranslateXTimeline(frames, frames, boneIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 0, scale));
             } else if (timelineName === "translatey") {
-              let timeline = new TranslateYTimeline(timelineMap.length, timelineMap.length, boneIndex);
+              let timeline = new TranslateYTimeline(frames, frames, boneIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 0, scale));
             } else if (timelineName === "scale") {
-              let timeline = new ScaleTimeline(timelineMap.length, timelineMap.length << 1, boneIndex);
+              let timeline = new ScaleTimeline(frames, frames << 1, boneIndex);
               timelines.push(readTimeline22(timelineMap, timeline, "x", "y", 1, 1));
             } else if (timelineName === "scalex") {
-              let timeline = new ScaleXTimeline(timelineMap.length, timelineMap.length, boneIndex);
+              let timeline = new ScaleXTimeline(frames, frames, boneIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 1, 1));
             } else if (timelineName === "scaley") {
-              let timeline = new ScaleYTimeline(timelineMap.length, timelineMap.length, boneIndex);
+              let timeline = new ScaleYTimeline(frames, frames, boneIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 1, 1));
             } else if (timelineName === "shear") {
-              let timeline = new ShearTimeline(timelineMap.length, timelineMap.length << 1, boneIndex);
+              let timeline = new ShearTimeline(frames, frames << 1, boneIndex);
               timelines.push(readTimeline22(timelineMap, timeline, "x", "y", 0, 1));
             } else if (timelineName === "shearx") {
-              let timeline = new ShearXTimeline(timelineMap.length, timelineMap.length, boneIndex);
+              let timeline = new ShearXTimeline(frames, frames, boneIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 0, 1));
             } else if (timelineName === "sheary") {
-              let timeline = new ShearYTimeline(timelineMap.length, timelineMap.length, boneIndex);
+              let timeline = new ShearYTimeline(frames, frames, boneIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 0, 1));
             }
           }
@@ -8310,7 +8313,7 @@ var spine = (() => {
             continue;
           let constraint = skeletonData.findTransformConstraint(constraintName);
           let constraintIndex = skeletonData.transformConstraints.indexOf(constraint);
-          let timeline = new TransformConstraintTimeline(timelineMap.length, timelineMap.length << 2, constraintIndex);
+          let timeline = new TransformConstraintTimeline(timelineMap.length, timelineMap.length * 6, constraintIndex);
           let time = getValue(keyMap, "time", 0);
           let mixRotate = getValue(keyMap, "mixRotate", 1);
           let mixX = getValue(keyMap, "mixX", 1);
@@ -8363,14 +8366,15 @@ var spine = (() => {
             let keyMap = timelineMap[0];
             if (!keyMap)
               continue;
+            let frames = timelineMap.length;
             if (timelineName === "position") {
-              let timeline = new PathConstraintPositionTimeline(timelineMap.length, timelineMap.length, constraintIndex);
+              let timeline = new PathConstraintPositionTimeline(frames, frames, constraintIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 0, constraint.positionMode == PositionMode.Fixed ? scale : 1));
             } else if (timelineName === "spacing") {
-              let timeline = new PathConstraintSpacingTimeline(timelineMap.length, timelineMap.length, constraintIndex);
+              let timeline = new PathConstraintSpacingTimeline(frames, frames, constraintIndex);
               timelines.push(readTimeline12(timelineMap, timeline, 0, constraint.spacingMode == SpacingMode.Length || constraint.spacingMode == SpacingMode.Fixed ? scale : 1));
             } else if (timelineName === "mix") {
-              let timeline = new PathConstraintMixTimeline(timelineMap.size, timelineMap.size * 3, constraintIndex);
+              let timeline = new PathConstraintMixTimeline(frames, frames * 3, constraintIndex);
               let time = getValue(keyMap, "time", 0);
               let mixRotate = getValue(keyMap, "mixRotate", 1);
               let mixX = getValue(keyMap, "mixX", 1);
@@ -8409,7 +8413,7 @@ var spine = (() => {
           let skin = skeletonData.findSkin(deformName);
           for (let slotName in deformMap) {
             let slotMap = deformMap[slotName];
-            let slotIndex = skeletonData.findSlotIndex(slotName);
+            let slotIndex = skeletonData.findSlot(slotName).index;
             for (let timelineName in slotMap) {
               let timelineMap = slotMap[timelineName];
               let keyMap = timelineMap[0];
@@ -8471,7 +8475,7 @@ var spine = (() => {
             let originalIndex = 0, unchangedIndex = 0;
             for (let ii = 0; ii < offsets.length; ii++) {
               let offsetMap = offsets[ii];
-              let slotIndex = skeletonData.findSlotIndex(offsetMap.slot);
+              let slotIndex = skeletonData.findSlot(offsetMap.slot).index;
               while (originalIndex != slotIndex)
                 unchanged[unchangedIndex++] = originalIndex++;
               drawOrder[originalIndex + offsetMap.offset] = originalIndex++;