@esotericsoftware/spine-core 4.2.7 → 4.2.8
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/Bone.js
CHANGED
|
@@ -268,23 +268,63 @@ export class Bone {
|
|
|
268
268
|
}
|
|
269
269
|
let pa = parent.a, pb = parent.b, pc = parent.c, pd = parent.d;
|
|
270
270
|
let pid = 1 / (pa * pd - pb * pc);
|
|
271
|
+
let ia = pd * pid, ib = pb * pid, ic = pc * pid, id = pa * pid;
|
|
271
272
|
let dx = this.worldX - parent.worldX, dy = this.worldY - parent.worldY;
|
|
272
|
-
this.ax = (dx *
|
|
273
|
-
this.ay = (dy *
|
|
274
|
-
let
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
273
|
+
this.ax = (dx * ia - dy * ib);
|
|
274
|
+
this.ay = (dy * id - dx * ic);
|
|
275
|
+
let ra, rb, rc, rd;
|
|
276
|
+
if (this.data.transformMode == TransformMode.OnlyTranslation) {
|
|
277
|
+
ra = this.a;
|
|
278
|
+
rb = this.b;
|
|
279
|
+
rc = this.c;
|
|
280
|
+
rd = this.d;
|
|
281
|
+
}
|
|
282
|
+
else {
|
|
283
|
+
switch (this.data.transformMode) {
|
|
284
|
+
case TransformMode.NoRotationOrReflection: {
|
|
285
|
+
let s = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
|
|
286
|
+
let sa = pa / this.skeleton.scaleX;
|
|
287
|
+
let sc = pc / this.skeleton.scaleY;
|
|
288
|
+
pb = -sc * s * this.skeleton.scaleX;
|
|
289
|
+
pd = sa * s * this.skeleton.scaleY;
|
|
290
|
+
pid = 1 / (pa * pd - pb * pc);
|
|
291
|
+
ia = pd * pid;
|
|
292
|
+
ib = pb * pid;
|
|
293
|
+
break;
|
|
294
|
+
}
|
|
295
|
+
case TransformMode.NoScale:
|
|
296
|
+
case TransformMode.NoScaleOrReflection:
|
|
297
|
+
let cos = MathUtils.cosDeg(this.rotation), sin = MathUtils.sinDeg(this.rotation);
|
|
298
|
+
pa = (pa * cos + pb * sin) / this.skeleton.scaleX;
|
|
299
|
+
pc = (pc * cos + pd * sin) / this.skeleton.scaleY;
|
|
300
|
+
let s = Math.sqrt(pa * pa + pc * pc);
|
|
301
|
+
if (s > 0.00001)
|
|
302
|
+
s = 1 / s;
|
|
303
|
+
pa *= s;
|
|
304
|
+
pc *= s;
|
|
305
|
+
s = Math.sqrt(pa * pa + pc * pc);
|
|
306
|
+
if (this.data.transformMode == TransformMode.NoScale && pid < 0 != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
|
307
|
+
s = -s;
|
|
308
|
+
let r = MathUtils.PI / 2 + Math.atan2(pc, pa);
|
|
309
|
+
pb = Math.cos(r) * s;
|
|
310
|
+
pd = Math.sin(r) * s;
|
|
311
|
+
pid = 1 / (pa * pd - pb * pc);
|
|
312
|
+
ia = pd * pid;
|
|
313
|
+
ib = pb * pid;
|
|
314
|
+
ic = pc * pid;
|
|
315
|
+
id = pa * pid;
|
|
316
|
+
}
|
|
317
|
+
ra = ia * this.a - ib * this.c;
|
|
318
|
+
rb = ia * this.b - ib * this.d;
|
|
319
|
+
rc = id * this.c - ic * this.a;
|
|
320
|
+
rd = id * this.d - ic * this.b;
|
|
321
|
+
}
|
|
282
322
|
this.ashearX = 0;
|
|
283
323
|
this.ascaleX = Math.sqrt(ra * ra + rc * rc);
|
|
284
324
|
if (this.ascaleX > 0.0001) {
|
|
285
325
|
let det = ra * rd - rb * rc;
|
|
286
326
|
this.ascaleY = det / this.ascaleX;
|
|
287
|
-
this.ashearY = Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
|
|
327
|
+
this.ashearY = -Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
|
|
288
328
|
this.arotation = Math.atan2(rc, ra) * MathUtils.radDeg;
|
|
289
329
|
}
|
|
290
330
|
else {
|
|
@@ -333,4 +373,4 @@ export class Bone {
|
|
|
333
373
|
this.d = sin * b + cos * d;
|
|
334
374
|
}
|
|
335
375
|
}
|
|
336
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Bone.js","sourceRoot":"","sources":["../src/Bone.ts"],"names":[],"mappings":"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"}
|
|
376
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Bone.js","sourceRoot":"","sources":["../src/Bone.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;+EA2B+E;AAE/E,OAAO,EAAY,aAAa,EAAE,MAAM,YAAY,CAAC;AAGrD,OAAO,EAAE,SAAS,EAAW,MAAM,SAAS,CAAC;AAE7C;;;;iHAIiH;AACjH,MAAM,OAAO,IAAI;IA4EhB,iCAAiC;IACjC,YAAa,IAAc,EAAE,QAAkB,EAAE,MAAmB;QAtEpE,yDAAyD;QACzD,WAAM,GAAgB,IAAI,CAAC;QAE3B,2CAA2C;QAC3C,aAAQ,GAAG,IAAI,KAAK,EAAQ,CAAC;QAE7B,+BAA+B;QAC/B,MAAC,GAAG,CAAC,CAAC;QAEN,+BAA+B;QAC/B,MAAC,GAAG,CAAC,CAAC;QAEN,wDAAwD;QACxD,aAAQ,GAAG,CAAC,CAAC;QAEb,wBAAwB;QACxB,WAAM,GAAG,CAAC,CAAC;QAEX,wBAAwB;QACxB,WAAM,GAAG,CAAC,CAAC;QAEX,wBAAwB;QACxB,WAAM,GAAG,CAAC,CAAC;QAEX,wBAAwB;QACxB,WAAM,GAAG,CAAC,CAAC;QAEX,uCAAuC;QACvC,OAAE,GAAG,CAAC,CAAC;QAEP,uCAAuC;QACvC,OAAE,GAAG,CAAC,CAAC;QAEP,gEAAgE;QAChE,cAAS,GAAG,CAAC,CAAC;QAEd,gCAAgC;QAChC,YAAO,GAAG,CAAC,CAAC;QAEZ,gCAAgC;QAChC,YAAO,GAAG,CAAC,CAAC;QAEZ,gCAAgC;QAChC,YAAO,GAAG,CAAC,CAAC;QAEZ,gCAAgC;QAChC,YAAO,GAAG,CAAC,CAAC;QAEZ,yHAAyH;QACzH,MAAC,GAAG,CAAC,CAAC;QAEN,yHAAyH;QACzH,MAAC,GAAG,CAAC,CAAC;QAEN,yHAAyH;QACzH,MAAC,GAAG,CAAC,CAAC;QAEN,yHAAyH;QACzH,MAAC,GAAG,CAAC,CAAC;QAEN,4FAA4F;QAC5F,WAAM,GAAG,CAAC,CAAC;QAEX,4FAA4F;QAC5F,WAAM,GAAG,CAAC,CAAC;QAEX,WAAM,GAAG,KAAK,CAAC;QACf,WAAM,GAAG,KAAK,CAAC;QAId,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACnD,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,cAAc,EAAE,CAAC;IACvB,CAAC;IAED;2FACuF;IACvF,QAAQ;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAED,kGAAkG;IAClG,MAAM;QACL,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACzH,CAAC;IAED;;kDAE8C;IAC9C,oBAAoB;QACnB,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAClH,CAAC;IAED;;;;yBAIqB;IACrB,wBAAwB,CAAE,CAAS,EAAE,CAAS,EAAE,QAAgB,EAAE,MAAc,EAAE,MAAc,EAAE,MAAc,EAAE,MAAc;QAC/H,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;QACZ,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QAEtB,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa;YAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC7B,IAAI,SAAS,GAAG,QAAQ,GAAG,EAAE,GAAG,MAAM,CAAC;YACvC,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC;YACzB,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC;YACzB,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,MAAM,GAAG,EAAE,CAAC;YAC3D,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,EAAE,CAAC;YACnD,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,MAAM,GAAG,EAAE,CAAC;YAC3D,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,GAAG,EAAE,CAAC;YACnD,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;YAClC,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,CAAC,CAAC;YAClC,OAAO;SACP;QAED,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QAC/D,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QAC9C,IAAI,CAAC,MAAM,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QAE9C,QAAQ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YAChC,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC;gBAC1B,IAAI,SAAS,GAAG,QAAQ,GAAG,EAAE,GAAG,MAAM,CAAC;gBACvC,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;gBACtD,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;gBAC9C,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;gBACtD,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;gBAC9C,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,OAAO;aACP;YACD,KAAK,aAAa,CAAC,eAAe,CAAC,CAAC;gBACnC,IAAI,SAAS,GAAG,QAAQ,GAAG,EAAE,GAAG,MAAM,CAAC;gBACvC,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;gBACtD,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;gBAC9C,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;gBACtD,IAAI,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;gBAC9C,MAAM;aACN;YACD,KAAK,aAAa,CAAC,sBAAsB,CAAC,CAAC;gBAC1C,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC1B,IAAI,GAAG,GAAG,CAAC,CAAC;gBACZ,IAAI,CAAC,GAAG,MAAM,EAAE;oBACf,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;oBACpC,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC3B,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAC3B,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;oBACZ,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;oBACZ,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;iBAC5C;qBAAM;oBACN,EAAE,GAAG,CAAC,CAAC;oBACP,EAAE,GAAG,CAAC,CAAC;oBACP,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;iBACjD;gBACD,IAAI,EAAE,GAAG,QAAQ,GAAG,MAAM,GAAG,GAAG,CAAC;gBACjC,IAAI,EAAE,GAAG,QAAQ,GAAG,MAAM,GAAG,GAAG,GAAG,EAAE,CAAC;gBACtC,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;gBACvC,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;gBACvC,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;gBACvC,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;gBACvC,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,MAAM;aACN;YACD,KAAK,aAAa,CAAC,OAAO,CAAC;YAC3B,KAAK,aAAa,CAAC,mBAAmB,CAAC,CAAC;gBACvC,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrC,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACrC,IAAI,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACtD,IAAI,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACtD,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;gBACrC,IAAI,CAAC,GAAG,OAAO;oBAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC3B,EAAE,IAAI,CAAC,CAAC;gBACR,EAAE,IAAI,CAAC,CAAC;gBACR,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;gBACjC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,OAAO;uBAChD,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;oBAAE,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9F,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACzC,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACzB,IAAI,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBACzB,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;gBAC3C,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;gBAChD,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;gBAC3C,IAAI,EAAE,GAAG,SAAS,CAAC,MAAM,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,MAAM,CAAC;gBAChD,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;gBAC3B,MAAM;aACN;SACD;QACD,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC/B,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC/B,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAC/B,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;IAChC,CAAC;IAED,0DAA0D;IAC1D,cAAc;QACb,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAChB,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,qFAAqF;IACrF,iBAAiB;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;IACtD,CAAC;IAED,qFAAqF;IACrF,iBAAiB;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;IACtD,CAAC;IAED,wGAAwG;IACxG,cAAc;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,wGAAwG;IACxG,cAAc;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;;iIAO6H;IAC7H,sBAAsB;QACrB,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,MAAM,EAAE;YACZ,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;YAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YAC5D,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;YACnH,OAAO;SACP;QACD,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;QAC/D,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAClC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;QAC/D,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QACvE,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAE9B,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,eAAe,EAAE;YAC7D,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YACZ,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YACZ,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YACZ,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;SACZ;aAAM;YACN,QAAQ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;gBAChC,KAAK,aAAa,CAAC,sBAAsB,CAAC,CAAC;oBAC1C,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBAC1D,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACnC,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACnC,EAAE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACpC,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBACnC,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBAC9B,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;oBACd,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;oBACd,MAAM;iBACN;gBACD,KAAK,aAAa,CAAC,OAAO,CAAC;gBAC3B,KAAK,aAAa,CAAC,mBAAmB;oBACrC,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;oBACjF,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAClD,EAAE,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAClD,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBACrC,IAAI,CAAC,GAAG,OAAO;wBAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAC3B,EAAE,IAAI,CAAC,CAAC;oBACR,EAAE,IAAI,CAAC,CAAC;oBACR,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBACjC,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,OAAO,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;wBAAE,CAAC,GAAG,CAAC,CAAC,CAAC;oBAClI,IAAI,CAAC,GAAG,SAAS,CAAC,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC9C,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBACrB,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;oBACrB,GAAG,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;oBAC9B,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;oBACd,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;oBACd,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;oBACd,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;aACf;YACD,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YAC/B,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YAC/B,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YAC/B,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;SAC/B;QAED,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,OAAO,GAAG,MAAM,EAAE;YAC1B,IAAI,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;YAC5B,IAAI,CAAC,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;YAClC,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;YACtE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;SACvD;aAAM;YACN,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAC5C,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YACjB,IAAI,CAAC,SAAS,GAAG,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;SAC5D;IACF,CAAC;IAED,iFAAiF;IACjF,YAAY,CAAE,KAAc;QAC3B,IAAI,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACzD,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC;QACpD,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,MAAM,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC;QACpD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,iFAAiF;IACjF,YAAY,CAAE,KAAc;QAC3B,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;QAC7B,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAChD,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAChD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,uDAAuD;IACvD,oBAAoB,CAAE,aAAqB;QAC1C,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;IAC9H,CAAC;IAED,uDAAuD;IACvD,oBAAoB,CAAE,aAAqB;QAC1C,aAAa,IAAI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;QAC7C,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjF,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC;IAChG,CAAC;IAED;;;4DAGwD;IACxD,WAAW,CAAE,OAAe;QAC3B,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACnD,IAAI,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;IAC5B,CAAC;CACD"}
|
|
@@ -66,6 +66,18 @@ export class RegionAttachment extends Attachment {
|
|
|
66
66
|
if (!this.region)
|
|
67
67
|
throw new Error("Region not set.");
|
|
68
68
|
let region = this.region;
|
|
69
|
+
let uvs = this.uvs;
|
|
70
|
+
if (region == null) {
|
|
71
|
+
uvs[0] = 0;
|
|
72
|
+
uvs[1] = 0;
|
|
73
|
+
uvs[2] = 0;
|
|
74
|
+
uvs[3] = 1;
|
|
75
|
+
uvs[4] = 1;
|
|
76
|
+
uvs[5] = 1;
|
|
77
|
+
uvs[6] = 1;
|
|
78
|
+
uvs[7] = 0;
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
69
81
|
let regionScaleX = this.width / this.region.originalWidth * this.scaleX;
|
|
70
82
|
let regionScaleY = this.height / this.region.originalHeight * this.scaleY;
|
|
71
83
|
let localX = -this.width / 2 * this.scaleX + this.region.offsetX * regionScaleX;
|
|
@@ -93,16 +105,15 @@ export class RegionAttachment extends Attachment {
|
|
|
93
105
|
offset[5] = localY2Cos + localX2Sin;
|
|
94
106
|
offset[6] = localX2Cos - localYSin;
|
|
95
107
|
offset[7] = localYCos + localX2Sin;
|
|
96
|
-
let uvs = this.uvs;
|
|
97
108
|
if (region.degrees == 90) {
|
|
109
|
+
uvs[0] = region.u2;
|
|
110
|
+
uvs[1] = region.v2;
|
|
98
111
|
uvs[2] = region.u;
|
|
99
112
|
uvs[3] = region.v2;
|
|
100
113
|
uvs[4] = region.u;
|
|
101
114
|
uvs[5] = region.v;
|
|
102
115
|
uvs[6] = region.u2;
|
|
103
116
|
uvs[7] = region.v;
|
|
104
|
-
uvs[0] = region.u2;
|
|
105
|
-
uvs[1] = region.v2;
|
|
106
117
|
}
|
|
107
118
|
else {
|
|
108
119
|
uvs[0] = region.u;
|
|
@@ -201,4 +212,4 @@ RegionAttachment.C4B = 28;
|
|
|
201
212
|
RegionAttachment.C4A = 29;
|
|
202
213
|
RegionAttachment.U4 = 30;
|
|
203
214
|
RegionAttachment.V4 = 31;
|
|
204
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RegionAttachment.js","sourceRoot":"","sources":["../../src/attachments/RegionAttachment.ts"],"names":[],"mappings":"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"}
|
|
215
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RegionAttachment.js","sourceRoot":"","sources":["../../src/attachments/RegionAttachment.ts"],"names":[],"mappings":"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"}
|
package/dist/iife/spine-core.js
CHANGED
|
@@ -3872,6 +3872,18 @@ var spine = (() => {
|
|
|
3872
3872
|
if (!this.region)
|
|
3873
3873
|
throw new Error("Region not set.");
|
|
3874
3874
|
let region = this.region;
|
|
3875
|
+
let uvs = this.uvs;
|
|
3876
|
+
if (region == null) {
|
|
3877
|
+
uvs[0] = 0;
|
|
3878
|
+
uvs[1] = 0;
|
|
3879
|
+
uvs[2] = 0;
|
|
3880
|
+
uvs[3] = 1;
|
|
3881
|
+
uvs[4] = 1;
|
|
3882
|
+
uvs[5] = 1;
|
|
3883
|
+
uvs[6] = 1;
|
|
3884
|
+
uvs[7] = 0;
|
|
3885
|
+
return;
|
|
3886
|
+
}
|
|
3875
3887
|
let regionScaleX = this.width / this.region.originalWidth * this.scaleX;
|
|
3876
3888
|
let regionScaleY = this.height / this.region.originalHeight * this.scaleY;
|
|
3877
3889
|
let localX = -this.width / 2 * this.scaleX + this.region.offsetX * regionScaleX;
|
|
@@ -3899,16 +3911,15 @@ var spine = (() => {
|
|
|
3899
3911
|
offset[5] = localY2Cos + localX2Sin;
|
|
3900
3912
|
offset[6] = localX2Cos - localYSin;
|
|
3901
3913
|
offset[7] = localYCos + localX2Sin;
|
|
3902
|
-
let uvs = this.uvs;
|
|
3903
3914
|
if (region.degrees == 90) {
|
|
3915
|
+
uvs[0] = region.u2;
|
|
3916
|
+
uvs[1] = region.v2;
|
|
3904
3917
|
uvs[2] = region.u;
|
|
3905
3918
|
uvs[3] = region.v2;
|
|
3906
3919
|
uvs[4] = region.u;
|
|
3907
3920
|
uvs[5] = region.v;
|
|
3908
3921
|
uvs[6] = region.u2;
|
|
3909
3922
|
uvs[7] = region.v;
|
|
3910
|
-
uvs[0] = region.u2;
|
|
3911
|
-
uvs[1] = region.v2;
|
|
3912
3923
|
} else {
|
|
3913
3924
|
uvs[0] = region.u;
|
|
3914
3925
|
uvs[1] = region.v2;
|
|
@@ -4277,23 +4288,62 @@ var spine = (() => {
|
|
|
4277
4288
|
}
|
|
4278
4289
|
let pa = parent.a, pb = parent.b, pc = parent.c, pd = parent.d;
|
|
4279
4290
|
let pid = 1 / (pa * pd - pb * pc);
|
|
4291
|
+
let ia = pd * pid, ib = pb * pid, ic = pc * pid, id = pa * pid;
|
|
4280
4292
|
let dx = this.worldX - parent.worldX, dy = this.worldY - parent.worldY;
|
|
4281
|
-
this.ax = dx *
|
|
4282
|
-
this.ay = dy *
|
|
4283
|
-
let
|
|
4284
|
-
|
|
4285
|
-
|
|
4286
|
-
|
|
4287
|
-
|
|
4288
|
-
|
|
4289
|
-
|
|
4290
|
-
|
|
4293
|
+
this.ax = dx * ia - dy * ib;
|
|
4294
|
+
this.ay = dy * id - dx * ic;
|
|
4295
|
+
let ra, rb, rc, rd;
|
|
4296
|
+
if (this.data.transformMode == TransformMode.OnlyTranslation) {
|
|
4297
|
+
ra = this.a;
|
|
4298
|
+
rb = this.b;
|
|
4299
|
+
rc = this.c;
|
|
4300
|
+
rd = this.d;
|
|
4301
|
+
} else {
|
|
4302
|
+
switch (this.data.transformMode) {
|
|
4303
|
+
case TransformMode.NoRotationOrReflection: {
|
|
4304
|
+
let s2 = Math.abs(pa * pd - pb * pc) / (pa * pa + pc * pc);
|
|
4305
|
+
let sa = pa / this.skeleton.scaleX;
|
|
4306
|
+
let sc = pc / this.skeleton.scaleY;
|
|
4307
|
+
pb = -sc * s2 * this.skeleton.scaleX;
|
|
4308
|
+
pd = sa * s2 * this.skeleton.scaleY;
|
|
4309
|
+
pid = 1 / (pa * pd - pb * pc);
|
|
4310
|
+
ia = pd * pid;
|
|
4311
|
+
ib = pb * pid;
|
|
4312
|
+
break;
|
|
4313
|
+
}
|
|
4314
|
+
case TransformMode.NoScale:
|
|
4315
|
+
case TransformMode.NoScaleOrReflection:
|
|
4316
|
+
let cos = MathUtils.cosDeg(this.rotation), sin = MathUtils.sinDeg(this.rotation);
|
|
4317
|
+
pa = (pa * cos + pb * sin) / this.skeleton.scaleX;
|
|
4318
|
+
pc = (pc * cos + pd * sin) / this.skeleton.scaleY;
|
|
4319
|
+
let s = Math.sqrt(pa * pa + pc * pc);
|
|
4320
|
+
if (s > 1e-5)
|
|
4321
|
+
s = 1 / s;
|
|
4322
|
+
pa *= s;
|
|
4323
|
+
pc *= s;
|
|
4324
|
+
s = Math.sqrt(pa * pa + pc * pc);
|
|
4325
|
+
if (this.data.transformMode == TransformMode.NoScale && pid < 0 != (this.skeleton.scaleX < 0 != this.skeleton.scaleY < 0))
|
|
4326
|
+
s = -s;
|
|
4327
|
+
let r = MathUtils.PI / 2 + Math.atan2(pc, pa);
|
|
4328
|
+
pb = Math.cos(r) * s;
|
|
4329
|
+
pd = Math.sin(r) * s;
|
|
4330
|
+
pid = 1 / (pa * pd - pb * pc);
|
|
4331
|
+
ia = pd * pid;
|
|
4332
|
+
ib = pb * pid;
|
|
4333
|
+
ic = pc * pid;
|
|
4334
|
+
id = pa * pid;
|
|
4335
|
+
}
|
|
4336
|
+
ra = ia * this.a - ib * this.c;
|
|
4337
|
+
rb = ia * this.b - ib * this.d;
|
|
4338
|
+
rc = id * this.c - ic * this.a;
|
|
4339
|
+
rd = id * this.d - ic * this.b;
|
|
4340
|
+
}
|
|
4291
4341
|
this.ashearX = 0;
|
|
4292
4342
|
this.ascaleX = Math.sqrt(ra * ra + rc * rc);
|
|
4293
4343
|
if (this.ascaleX > 1e-4) {
|
|
4294
4344
|
let det = ra * rd - rb * rc;
|
|
4295
4345
|
this.ascaleY = det / this.ascaleX;
|
|
4296
|
-
this.ashearY = Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
|
|
4346
|
+
this.ashearY = -Math.atan2(ra * rb + rc * rd, det) * MathUtils.radDeg;
|
|
4297
4347
|
this.arotation = Math.atan2(rc, ra) * MathUtils.radDeg;
|
|
4298
4348
|
} else {
|
|
4299
4349
|
this.ascaleX = 0;
|