@esotericsoftware/spine-webgl 4.2.7 → 4.2.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/GLTexture.js
CHANGED
|
@@ -115,4 +115,4 @@ export class GLTexture extends Texture {
|
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
117
|
GLTexture.DISABLE_UNPACK_PREMULTIPLIED_ALPHA_WEBGL = false;
|
|
118
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiR0xUZXh0dXJlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0dMVGV4dHVyZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OytFQTJCK0U7QUFFL0UsT0FBTyxFQUFFLE9BQU8sRUFBMEIsYUFBYSxFQUFlLE1BQU0sOEJBQThCLENBQUM7QUFDM0csT0FBTyxFQUFFLDRCQUE0QixFQUFFLE1BQU0sU0FBUyxDQUFDO0FBRXZELE1BQU0sT0FBTyxTQUFVLFNBQVEsT0FBTztJQVFyQyxZQUFhLE9BQTZELEVBQUUsS0FBcUMsRUFBRSxhQUFzQixLQUFLO1FBQzdJLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztRQVBOLFlBQU8sR0FBd0IsSUFBSSxDQUFDO1FBQ3BDLGNBQVMsR0FBRyxDQUFDLENBQUM7UUFDZCxlQUFVLEdBQUcsS0FBSyxDQUFDO1FBTTFCLElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxZQUFZLDRCQUE0QixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLElBQUksNEJBQTRCLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDckgsSUFBSSxDQUFDLFVBQVUsR0FBRyxVQUFVLENBQUM7UUFDN0IsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2YsSUFBSSxDQUFDLE9BQU8sQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDbEMsQ0FBQztJQUVELFVBQVUsQ0FBRSxTQUF3QixFQUFFLFNBQXdCO1FBQzdELElBQUksRUFBRSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1FBQ3pCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztRQUNaLEVBQUUsQ0FBQyxhQUFhLENBQUMsRUFBRSxDQUFDLFVBQVUsRUFBRSxFQUFFLENBQUMsa0JBQWtCLEVBQUUsU0FBUyxDQUFDLENBQUM7UUFDbEUsRUFBRSxDQUFDLGFBQWEsQ0FBQyxFQUFFLENBQUMsVUFB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
|
package/dist/iife/spine-webgl.js
CHANGED
|
@@ -2864,13 +2864,18 @@ var spine = (() => {
|
|
|
2864
2864
|
lastTotal = timelinesRotation[i];
|
|
2865
2865
|
lastDiff = timelinesRotation[i + 1];
|
|
2866
2866
|
}
|
|
2867
|
-
let
|
|
2868
|
-
|
|
2869
|
-
|
|
2870
|
-
|
|
2871
|
-
|
|
2867
|
+
let loops = lastTotal - lastTotal % 360;
|
|
2868
|
+
total = diff + loops;
|
|
2869
|
+
let current = diff >= 0, dir = lastTotal >= 0;
|
|
2870
|
+
if (Math.abs(lastDiff) <= 90 && MathUtils.signum(lastDiff) != MathUtils.signum(diff)) {
|
|
2871
|
+
if (Math.abs(lastTotal - loops) > 180) {
|
|
2872
|
+
total += 360 * MathUtils.signum(lastTotal);
|
|
2873
|
+
dir = current;
|
|
2874
|
+
} else if (loops != 0)
|
|
2875
|
+
total -= 360 * MathUtils.signum(lastTotal);
|
|
2876
|
+
else
|
|
2877
|
+
dir = current;
|
|
2872
2878
|
}
|
|
2873
|
-
total = diff + lastTotal - lastTotal % 360;
|
|
2874
2879
|
if (dir != current)
|
|
2875
2880
|
total += 360 * MathUtils.signum(lastTotal);
|
|
2876
2881
|
timelinesRotation[i] = total;
|
|
@@ -3916,6 +3921,18 @@ var spine = (() => {
|
|
|
3916
3921
|
if (!this.region)
|
|
3917
3922
|
throw new Error("Region not set.");
|
|
3918
3923
|
let region = this.region;
|
|
3924
|
+
let uvs = this.uvs;
|
|
3925
|
+
if (region == null) {
|
|
3926
|
+
uvs[0] = 0;
|
|
3927
|
+
uvs[1] = 0;
|
|
3928
|
+
uvs[2] = 0;
|
|
3929
|
+
uvs[3] = 1;
|
|
3930
|
+
uvs[4] = 1;
|
|
3931
|
+
uvs[5] = 1;
|
|
3932
|
+
uvs[6] = 1;
|
|
3933
|
+
uvs[7] = 0;
|
|
3934
|
+
return;
|
|
3935
|
+
}
|
|
3919
3936
|
let regionScaleX = this.width / this.region.originalWidth * this.scaleX;
|
|
3920
3937
|
let regionScaleY = this.height / this.region.originalHeight * this.scaleY;
|
|
3921
3938
|
let localX = -this.width / 2 * this.scaleX + this.region.offsetX * regionScaleX;
|
|
@@ -3943,16 +3960,15 @@ var spine = (() => {
|
|
|
3943
3960
|
offset[5] = localY2Cos + localX2Sin;
|
|
3944
3961
|
offset[6] = localX2Cos - localYSin;
|
|
3945
3962
|
offset[7] = localYCos + localX2Sin;
|
|
3946
|
-
let uvs = this.uvs;
|
|
3947
3963
|
if (region.degrees == 90) {
|
|
3964
|
+
uvs[0] = region.u2;
|
|
3965
|
+
uvs[1] = region.v2;
|
|
3948
3966
|
uvs[2] = region.u;
|
|
3949
3967
|
uvs[3] = region.v2;
|
|
3950
3968
|
uvs[4] = region.u;
|
|
3951
3969
|
uvs[5] = region.v;
|
|
3952
3970
|
uvs[6] = region.u2;
|
|
3953
3971
|
uvs[7] = region.v;
|
|
3954
|
-
uvs[0] = region.u2;
|
|
3955
|
-
uvs[1] = region.v2;
|
|
3956
3972
|
} else {
|
|
3957
3973
|
uvs[0] = region.u;
|
|
3958
3974
|
uvs[1] = region.v2;
|
|
@@ -4321,23 +4337,62 @@ var spine = (() => {
|
|
|
4321
4337
|
}
|
|
4322
4338
|
let pa = parent.a, pb = parent.b, pc = parent.c, pd = parent.d;
|
|
4323
4339
|
let pid = 1 / (pa * pd - pb * pc);
|
|
4340
|
+
let ia = pd * pid, ib = pb * pid, ic = pc * pid, id = pa * pid;
|
|
4324
4341
|
let dx = this.worldX - parent.worldX, dy = this.worldY - parent.worldY;
|
|
4325
|
-
this.ax = dx *
|
|
4326
|
-
this.ay = dy *
|
|
4327
|
-
let
|
|
4328
|
-
|
|
4329
|
-
|
|
4330
|
-
|
|
4331
|
-
|
|
4332
|
-
|
|
4333
|
-
|
|
4334
|
-
|
|
4342
|
+
this.ax = dx * ia - dy * ib;
|
|
4343
|
+
this.ay = dy * id - dx * ic;
|
|
4344
|
+
let ra, rb, rc, rd;
|
|
4345
|
+
if (this.data.transformMode == TransformMode.OnlyTranslation) {
|
|
4346
|
+
ra = this.a;
|
|
4347
|
+
rb = this.b;
|
|
4348
|
+
rc = this.c;
|
|
4349
|
+
rd = this.d;
|
|
4350
|
+
} else {
|
|
4351
|
+
switch (this.data.transformMode) {
|
|
4352
|
+
case TransformMode.NoRotationOrReflection: {
|
|
4353
|
+
let s2 = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
|
|
4354
|
+
let sa = pa / this.skeleton.scaleX;
|
|
4355
|
+
let sc = pc / this.skeleton.scaleY;
|
|
4356
|
+
pb = -sc * s2 * this.skeleton.scaleX;
|
|
4357
|
+
pd = sa * s2 * this.skeleton.scaleY;
|
|
4358
|
+
pid = 1 / (pa * pd - pb * pc);
|
|
4359
|
+
ia = pd * pid;
|
|
4360
|
+
ib = pb * pid;
|
|
4361
|
+
break;
|
|
4362
|
+
}
|
|
4363
|
+
case TransformMode.NoScale:
|
|
4364
|
+
case TransformMode.NoScaleOrReflection:
|
|
4365
|
+
let cos = MathUtils.cosDeg(this.rotation), sin = MathUtils.sinDeg(this.rotation);
|
|
4366
|
+
pa = (pa * cos + pb * sin) / this.skeleton.scaleX;
|
|
4367
|
+
pc = (pc * cos + pd * sin) / this.skeleton.scaleY;
|
|
4368
|
+
let s = Math.sqrt(pa * pa + pc * pc);
|
|
4369
|
+
if (s > 1e-5)
|
|
4370
|
+
s = 1 / s;
|
|
4371
|
+
pa *= s;
|
|
4372
|
+
pc *= s;
|
|
4373
|
+
s = Math.sqrt(pa * pa + pc * pc);
|
|
4374
|
+
if (this.data.transformMode == TransformMode.NoScale && pid < 0 != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
|
4375
|
+
s = -s;
|
|
4376
|
+
let r = MathUtils.PI / 2 + Math.atan2(pc, pa);
|
|
4377
|
+
pb = Math.cos(r) * s;
|
|
4378
|
+
pd = Math.sin(r) * s;
|
|
4379
|
+
pid = 1 / (pa * pd - pb * pc);
|
|
4380
|
+
ia = pd * pid;
|
|
4381
|
+
ib = pb * pid;
|
|
4382
|
+
ic = pc * pid;
|
|
4383
|
+
id = pa * pid;
|
|
4384
|
+
}
|
|
4385
|
+
ra = ia * this.a - ib * this.c;
|
|
4386
|
+
rb = ia * this.b - ib * this.d;
|
|
4387
|
+
rc = id * this.c - ic * this.a;
|
|
4388
|
+
rd = id * this.d - ic * this.b;
|
|
4389
|
+
}
|
|
4335
4390
|
this.ashearX = 0;
|
|
4336
4391
|
this.ascaleX = Math.sqrt(ra * ra + rc * rc);
|
|
4337
4392
|
if (this.ascaleX > 1e-4) {
|
|
4338
4393
|
let det = ra * rd - rb * rc;
|
|
4339
4394
|
this.ascaleY = det / this.ascaleX;
|
|
4340
|
-
this.ashearY = Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
|
|
4395
|
+
this.ashearY = -Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
|
|
4341
4396
|
this.arotation = Math.atan2(rc, ra) * MathUtils.radDeg;
|
|
4342
4397
|
} else {
|
|
4343
4398
|
this.ascaleX = 0;
|