@esotericsoftware/spine-canvas 4.2.38 → 4.2.40

package/dist/iife/spine-canvas.js

@@ -3929,7 +3929,7 @@ var spine = (() => {
           complete = true;
         else {
           const cycles = Math.floor(entry.trackTime / duration);
-          complete = cycles > 0 && cycles > Math.floor(entry.trackTime / duration);
+          complete = cycles > 0 && cycles > Math.floor(entry.trackLast / duration);
         }
       } else
         complete = animationTime >= animationEnd && entry.animationLast < animationEnd;
@@ -4385,8 +4385,11 @@ var spine = (() => {
     }
     set mixDuration(mixDuration) {
       this._mixDuration = mixDuration;
+    }
+    setMixDurationWithDelta(mixDuration, delay) {
+      this._mixDuration = mixDuration;
       if (this.previous != null && this.delay <= 0)
-        this.delay += this.previous.getTrackComplete() - mixDuration;
+        this.delay += this.previous.getTrackComplete() - delay;
       this.delay = this.delay;
     }
     /** Controls how properties keyed in the animation are mixed with lower tracks. Defaults to {@link MixBlend#replace}, which
@@ -6193,11 +6196,6 @@ var spine = (() => {
       if (!skeleton)
         throw new Error("skeleton cannot be null.");
       this.data = data;
-      this.mix = data.mix;
-      this.softness = data.softness;
-      this.bendDirection = data.bendDirection;
-      this.compress = data.compress;
-      this.stretch = data.stretch;
       this.bones = new Array();
       for (let i = 0; i < data.bones.length; i++) {
         let bone = skeleton.findBone(data.bones[i].name);
@@ -6209,6 +6207,11 @@ var spine = (() => {
       if (!target)
         throw new Error(`Couldn't find bone ${data.target.name}`);
       this.target = target;
+      this.mix = data.mix;
+      this.softness = data.softness;
+      this.bendDirection = data.bendDirection;
+      this.compress = data.compress;
+      this.stretch = data.stretch;
     }
     isActive() {
       return this.active;
@@ -7343,12 +7346,6 @@ var spine = (() => {
       if (!skeleton)
         throw new Error("skeleton cannot be null.");
       this.data = data;
-      this.mixRotate = data.mixRotate;
-      this.mixX = data.mixX;
-      this.mixY = data.mixY;
-      this.mixScaleX = data.mixScaleX;
-      this.mixScaleY = data.mixScaleY;
-      this.mixShearY = data.mixShearY;
       this.bones = new Array();
       for (let i = 0; i < data.bones.length; i++) {
         let bone = skeleton.findBone(data.bones[i].name);
@@ -7360,6 +7357,12 @@ var spine = (() => {
       if (!target)
         throw new Error(`Couldn't find target bone ${data.target.name}.`);
       this.target = target;
+      this.mixRotate = data.mixRotate;
+      this.mixX = data.mixX;
+      this.mixY = data.mixY;
+      this.mixScaleX = data.mixScaleX;
+      this.mixScaleY = data.mixScaleY;
+      this.mixShearY = data.mixShearY;
     }
     isActive() {
       return this.active;
@@ -8060,8 +8063,9 @@ var spine = (() => {
     /** Returns the axis aligned bounding box (AABB) of the region and mesh attachments for the current pose.
      * @param offset An output value, the distance from the skeleton origin to the bottom left corner of the AABB.
      * @param size An output value, the width and height of the AABB.
-     * @param temp Working memory to temporarily store attachments' computed world vertices. */
-    getBounds(offset, size, temp = new Array(2)) {
+     * @param temp Working memory to temporarily store attachments' computed world vertices.
+     * @param clipper {@link SkeletonClipping} to use. If <code>null</code>, no clipping is applied. */
+    getBounds(offset, size, temp = new Array(2), clipper = null) {
       if (!offset)
         throw new Error("offset cannot be null.");
       if (!size)
@@ -8074,18 +8078,29 @@ var spine = (() => {
           continue;
         let verticesLength = 0;
         let vertices = null;
+        let triangles = null;
         let attachment = slot.getAttachment();
         if (attachment instanceof RegionAttachment) {
           verticesLength = 8;
           vertices = Utils.setArraySize(temp, verticesLength, 0);
           attachment.computeWorldVertices(slot, vertices, 0, 2);
+          triangles = _Skeleton.quadTriangles;
         } else if (attachment instanceof MeshAttachment) {
           let mesh = attachment;
           verticesLength = mesh.worldVerticesLength;
           vertices = Utils.setArraySize(temp, verticesLength, 0);
           mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
+          triangles = mesh.triangles;
+        } else if (attachment instanceof ClippingAttachment && clipper != null) {
+          clipper.clipStart(slot, attachment);
+          continue;
         }
-        if (vertices) {
+        if (vertices && triangles) {
+          if (clipper != null && clipper.isClipping()) {
+            clipper.clipTriangles(vertices, verticesLength, triangles, triangles.length);
+            vertices = clipper.clippedVertices;
+            verticesLength = clipper.clippedVertices.length;
+          }
           for (let ii = 0, nn = vertices.length; ii < nn; ii += 2) {
             let x = vertices[ii], y = vertices[ii + 1];
             minX = Math.min(minX, x);
@@ -8094,7 +8109,11 @@ var spine = (() => {
             maxY = Math.max(maxY, y);
           }
         }
+        if (clipper != null)
+          clipper.clipEndWithSlot(slot);
       }
+      if (clipper != null)
+        clipper.clipEnd();
       offset.set(minX, minY);
       size.set(maxX - minX, maxY - minY);
     }
@@ -8115,6 +8134,7 @@ var spine = (() => {
     }
   };
   var Skeleton = _Skeleton;
+  __publicField(Skeleton, "quadTriangles", [0, 1, 2, 2, 3, 0]);
   __publicField(Skeleton, "yDown", false);
   var Physics = /* @__PURE__ */ ((Physics2) => {
     Physics2[Physics2["none"] = 0] = "none";
@@ -10295,6 +10315,73 @@ var spine = (() => {
       return this.clipAttachment != null;
     }
     clipTriangles(vertices, verticesLength, triangles, trianglesLength, uvs, light, dark, twoColor) {
+      if (uvs && light && dark && typeof twoColor === "boolean")
+        this.clipTrianglesRender(vertices, verticesLength, triangles, trianglesLength, uvs, light, dark, twoColor);
+      else
+        this.clipTrianglesNoRender(vertices, verticesLength, triangles, trianglesLength);
+    }
+    clipTrianglesNoRender(vertices, verticesLength, triangles, trianglesLength) {
+      let clipOutput = this.clipOutput, clippedVertices = this.clippedVertices;
+      let clippedTriangles = this.clippedTriangles;
+      let polygons = this.clippingPolygons;
+      let polygonsCount = polygons.length;
+      let vertexSize = 2;
+      let index = 0;
+      clippedVertices.length = 0;
+      clippedTriangles.length = 0;
+      outer:
+        for (let i = 0; i < trianglesLength; i += 3) {
+          let vertexOffset = triangles[i] << 1;
+          let x1 = vertices[vertexOffset], y1 = vertices[vertexOffset + 1];
+          vertexOffset = triangles[i + 1] << 1;
+          let x2 = vertices[vertexOffset], y2 = vertices[vertexOffset + 1];
+          vertexOffset = triangles[i + 2] << 1;
+          let x3 = vertices[vertexOffset], y3 = vertices[vertexOffset + 1];
+          for (let p = 0; p < polygonsCount; p++) {
+            let s = clippedVertices.length;
+            if (this.clip(x1, y1, x2, y2, x3, y3, polygons[p], clipOutput)) {
+              let clipOutputLength = clipOutput.length;
+              if (clipOutputLength == 0)
+                continue;
+              let clipOutputCount = clipOutputLength >> 1;
+              let clipOutputItems = this.clipOutput;
+              let clippedVerticesItems = Utils.setArraySize(clippedVertices, s + clipOutputCount * vertexSize);
+              for (let ii = 0; ii < clipOutputLength; ii += 2) {
+                let x = clipOutputItems[ii], y = clipOutputItems[ii + 1];
+                clippedVerticesItems[s] = x;
+                clippedVerticesItems[s + 1] = y;
+                s += 2;
+              }
+              s = clippedTriangles.length;
+              let clippedTrianglesItems = Utils.setArraySize(clippedTriangles, s + 3 * (clipOutputCount - 2));
+              clipOutputCount--;
+              for (let ii = 1; ii < clipOutputCount; ii++) {
+                clippedTrianglesItems[s] = index;
+                clippedTrianglesItems[s + 1] = index + ii;
+                clippedTrianglesItems[s + 2] = index + ii + 1;
+                s += 3;
+              }
+              index += clipOutputCount + 1;
+            } else {
+              let clippedVerticesItems = Utils.setArraySize(clippedVertices, s + 3 * vertexSize);
+              clippedVerticesItems[s] = x1;
+              clippedVerticesItems[s + 1] = y1;
+              clippedVerticesItems[s + 2] = x2;
+              clippedVerticesItems[s + 3] = y2;
+              clippedVerticesItems[s + 4] = x3;
+              clippedVerticesItems[s + 5] = y3;
+              s = clippedTriangles.length;
+              let clippedTrianglesItems = Utils.setArraySize(clippedTriangles, s + 3);
+              clippedTrianglesItems[s] = index;
+              clippedTrianglesItems[s + 1] = index + 1;
+              clippedTrianglesItems[s + 2] = index + 2;
+              index += 3;
+              continue outer;
+            }
+          }
+        }
+    }
+    clipTrianglesRender(vertices, verticesLength, triangles, trianglesLength, uvs, light, dark, twoColor) {
       let clipOutput = this.clipOutput, clippedVertices = this.clippedVertices;
       let clippedTriangles = this.clippedTriangles;
       let polygons = this.clippingPolygons;