|
@@ -168,7 +168,7 @@ namespace Spine {
|
|
if (rotateOrShearX || scaleX) {
|
|
if (rotateOrShearX || scaleX) {
|
|
float ca = (float)Math.Atan2(bone.c, bone.a), c, s, mr = 0;
|
|
float ca = (float)Math.Atan2(bone.c, bone.a), c, s, mr = 0;
|
|
if (rotateOrShearX) {
|
|
if (rotateOrShearX) {
|
|
- mr = mix * data.rotate;
|
|
|
|
|
|
+ mr = (data.rotate + data.shearX) * mix;
|
|
float dx = cx - bone.worldX, dy = cy - bone.worldY, r = (float)Math.Atan2(dy + ty, dx + tx) - ca - rotateOffset * mr;
|
|
float dx = cx - bone.worldX, dy = cy - bone.worldY, r = (float)Math.Atan2(dy + ty, dx + tx) - ca - rotateOffset * mr;
|
|
rotateOffset += (r - (float)Math.Ceiling(r * MathUtils.InvPI2 - 0.5f) * MathUtils.PI2) * i;
|
|
rotateOffset += (r - (float)Math.Ceiling(r * MathUtils.InvPI2 - 0.5f) * MathUtils.PI2) * i;
|
|
r = rotateOffset * mr + ca;
|
|
r = rotateOffset * mr + ca;
|