@esotericsoftware/spine-core 4.2.7 → 4.2.9

package/dist/iife/spine-core.js

@@ -2820,13 +2820,18 @@ var spine = (() => {
           lastTotal = timelinesRotation[i];
           lastDiff = timelinesRotation[i + 1];
         }
-        let current = diff > 0, dir = lastTotal >= 0;
-        if (MathUtils.signum(lastDiff) != MathUtils.signum(diff) && Math.abs(lastDiff) <= 90) {
-          if (Math.abs(lastTotal) > 180)
-            lastTotal += 360 * MathUtils.signum(lastTotal);
-          dir = current;
+        let loops = lastTotal - lastTotal % 360;
+        total = diff + loops;
+        let current = diff >= 0, dir = lastTotal >= 0;
+        if (Math.abs(lastDiff) <= 90 && MathUtils.signum(lastDiff) != MathUtils.signum(diff)) {
+          if (Math.abs(lastTotal - loops) > 180) {
+            total += 360 * MathUtils.signum(lastTotal);
+            dir = current;
+          } else if (loops != 0)
+            total -= 360 * MathUtils.signum(lastTotal);
+          else
+            dir = current;
         }
-        total = diff + lastTotal - lastTotal % 360;
         if (dir != current)
           total += 360 * MathUtils.signum(lastTotal);
         timelinesRotation[i] = total;
@@ -3872,6 +3877,18 @@ var spine = (() => {
       if (!this.region)
         throw new Error("Region not set.");
       let region = this.region;
+      let uvs = this.uvs;
+      if (region == null) {
+        uvs[0] = 0;
+        uvs[1] = 0;
+        uvs[2] = 0;
+        uvs[3] = 1;
+        uvs[4] = 1;
+        uvs[5] = 1;
+        uvs[6] = 1;
+        uvs[7] = 0;
+        return;
+      }
       let regionScaleX = this.width / this.region.originalWidth * this.scaleX;
       let regionScaleY = this.height / this.region.originalHeight * this.scaleY;
       let localX = -this.width / 2 * this.scaleX + this.region.offsetX * regionScaleX;
@@ -3899,16 +3916,15 @@ var spine = (() => {
       offset[5] = localY2Cos + localX2Sin;
       offset[6] = localX2Cos - localYSin;
       offset[7] = localYCos + localX2Sin;
-      let uvs = this.uvs;
       if (region.degrees == 90) {
+        uvs[0] = region.u2;
+        uvs[1] = region.v2;
         uvs[2] = region.u;
         uvs[3] = region.v2;
         uvs[4] = region.u;
         uvs[5] = region.v;
         uvs[6] = region.u2;
         uvs[7] = region.v;
-        uvs[0] = region.u2;
-        uvs[1] = region.v2;
       } else {
         uvs[0] = region.u;
         uvs[1] = region.v2;
@@ -4277,23 +4293,62 @@ var spine = (() => {
       }
       let pa = parent.a, pb = parent.b, pc = parent.c, pd = parent.d;
       let pid = 1 / (pa * pd - pb * pc);
+      let ia = pd * pid, ib = pb * pid, ic = pc * pid, id = pa * pid;
       let dx = this.worldX - parent.worldX, dy = this.worldY - parent.worldY;
-      this.ax = dx * pd * pid - dy * pb * pid;
-      this.ay = dy * pa * pid - dx * pc * pid;
-      let ia = pid * pd;
-      let id = pid * pa;
-      let ib = pid * pb;
-      let ic = pid * pc;
-      let ra = ia * this.a - ib * this.c;
-      let rb = ia * this.b - ib * this.d;
-      let rc = id * this.c - ic * this.a;
-      let rd = id * this.d - ic * this.b;
+      this.ax = dx * ia - dy * ib;
+      this.ay = dy * id - dx * ic;
+      let ra, rb, rc, rd;
+      if (this.data.transformMode == TransformMode.OnlyTranslation) {
+        ra = this.a;
+        rb = this.b;
+        rc = this.c;
+        rd = this.d;
+      } else {
+        switch (this.data.transformMode) {
+          case TransformMode.NoRotationOrReflection: {
+            let s2 = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
+            let sa = pa / this.skeleton.scaleX;
+            let sc = pc / this.skeleton.scaleY;
+            pb = -sc * s2 * this.skeleton.scaleX;
+            pd = sa * s2 * this.skeleton.scaleY;
+            pid = 1 / (pa * pd - pb * pc);
+            ia = pd * pid;
+            ib = pb * pid;
+            break;
+          }
+          case TransformMode.NoScale:
+          case TransformMode.NoScaleOrReflection:
+            let cos = MathUtils.cosDeg(this.rotation), sin = MathUtils.sinDeg(this.rotation);
+            pa = (pa * cos + pb * sin) / this.skeleton.scaleX;
+            pc = (pc * cos + pd * sin) / this.skeleton.scaleY;
+            let s = Math.sqrt(pa * pa + pc * pc);
+            if (s > 1e-5)
+              s = 1 / s;
+            pa *= s;
+            pc *= s;
+            s = Math.sqrt(pa * pa + pc * pc);
+            if (this.data.transformMode == TransformMode.NoScale && pid < 0 != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
+              s = -s;
+            let r = MathUtils.PI / 2 + Math.atan2(pc, pa);
+            pb = Math.cos(r) * s;
+            pd = Math.sin(r) * s;
+            pid = 1 / (pa * pd - pb * pc);
+            ia = pd * pid;
+            ib = pb * pid;
+            ic = pc * pid;
+            id = pa * pid;
+        }
+        ra = ia * this.a - ib * this.c;
+        rb = ia * this.b - ib * this.d;
+        rc = id * this.c - ic * this.a;
+        rd = id * this.d - ic * this.b;
+      }
       this.ashearX = 0;
       this.ascaleX = Math.sqrt(ra * ra + rc * rc);
       if (this.ascaleX > 1e-4) {
         let det = ra * rd - rb * rc;
         this.ascaleY = det / this.ascaleX;
-        this.ashearY = Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
+        this.ashearY = -Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
         this.arotation = Math.atan2(rc, ra) * MathUtils.radDeg;
       } else {
         this.ascaleX = 0;