diff --git a/spine-as3/spine-as3-example/lib/spine-as3.swc b/spine-as3/spine-as3-example/lib/spine-as3.swc index a72697404..e2ab7d151 100644 Binary files a/spine-as3/spine-as3-example/lib/spine-as3.swc and b/spine-as3/spine-as3-example/lib/spine-as3.swc differ diff --git a/spine-as3/spine-as3/src/spine/Bone.as b/spine-as3/spine-as3/src/spine/Bone.as index 235f343a9..0fa62b73b 100644 --- a/spine-as3/spine-as3/src/spine/Bone.as +++ b/spine-as3/spine-as3/src/spine/Bone.as @@ -105,8 +105,8 @@ package spine { rotationY = rotation + 90 + shearY; var skeleton : Skeleton = _skeleton; this.a = MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = MathUtils.sinDeg(rotationY) * scaleY * sy; worldX = x * sx + skeleton.x; worldY = y * sy + skeleton.y; diff --git a/spine-c/spine-c/src/spine/Bone.c b/spine-c/spine-c/src/spine/Bone.c index e0daaeef1..bfe153fdc 100644 --- a/spine-c/spine-c/src/spine/Bone.c +++ b/spine-c/spine-c/src/spine/Bone.c @@ -79,8 +79,8 @@ void spBone_updateWorldTransformWith (spBone* self, float x, float y, float rota if (!parent) { /* Root bone. */ float rotationY = rotation + 90 + shearY; CONST_CAST(float, self->a) = COS_DEG(rotation + shearX) * scaleX * sx; - CONST_CAST(float, self->b) = COS_DEG(rotationY) * scaleY * sy; - CONST_CAST(float, self->c) = SIN_DEG(rotation + shearX) * scaleX * sx; + CONST_CAST(float, self->b) = COS_DEG(rotationY) * scaleY * sx; + CONST_CAST(float, self->c) = SIN_DEG(rotation + shearX) * scaleX * sy; CONST_CAST(float, self->d) = SIN_DEG(rotationY) * scaleY * sy; CONST_CAST(float, self->worldX) = x * sx + self->skeleton->x; CONST_CAST(float, self->worldY) = y * sy + self->skeleton->y; diff --git a/spine-cpp/spine-cpp/src/spine/Bone.cpp b/spine-cpp/spine-cpp/src/spine/Bone.cpp index 53ffa45e1..a4dfe2f67 100644 --- a/spine-cpp/spine-cpp/src/spine/Bone.cpp +++ b/spine-cpp/spine-cpp/src/spine/Bone.cpp @@ -108,8 +108,8 @@ Bone::updateWorldTransform(float x, float y, float rotation, float scaleX, float float sx = _skeleton.getScaleX(); float sy = _skeleton.getScaleY(); _a = MathUtil::cosDeg(rotation + shearX) * scaleX * sx; - _b = MathUtil::cosDeg(rotationY) * scaleY * sy; - _c = MathUtil::sinDeg(rotation + shearX) * scaleX * sx; + _b = MathUtil::cosDeg(rotationY) * scaleY * sx; + _c = MathUtil::sinDeg(rotation + shearX) * scaleX * sy; _d = MathUtil::sinDeg(rotationY) * scaleY * sy; _worldX = x * sx + _skeleton.getX(); _worldY = y * sy + _skeleton.getY(); diff --git a/spine-lua/Bone.lua b/spine-lua/Bone.lua index 67c6edd7f..fad5a7632 100644 --- a/spine-lua/Bone.lua +++ b/spine-lua/Bone.lua @@ -95,7 +95,7 @@ function Bone:updateWorldTransformWith (x, y, rotation, scaleX, scaleY, shearX, self.ashearX = shearX self.ashearY = shearY self.appliedValid = true - + local sx = self.skeleton.scaleX; local sy = self.skeleton.scaleY; @@ -103,11 +103,11 @@ function Bone:updateWorldTransformWith (x, y, rotation, scaleX, scaleY, shearX, if parent == nil then local rotationY = rotation + 90 + shearY local rotationRad = math_rad(rotation + shearX) - local rotationYRad = math_rad(rotationY) + local rotationYRad = math_rad(rotationY) local skeleton = self.skeleton self.a = math_cos(rotationRad) * scaleX * sx - self.b = math_cos(rotationYRad) * scaleY * sy - self.c = math_sin(rotationRad) * scaleX * sx + self.b = math_cos(rotationYRad) * scaleY * sx + self.c = math_sin(rotationRad) * scaleX * sy self.d = math_sin(rotationYRad) * scaleY * sy self.worldX = x * sx + skeleton.x self.worldY = y * sy + skeleton.y @@ -161,7 +161,7 @@ function Bone:updateWorldTransformWith (x, y, rotation, scaleX, scaleY, shearX, self.a = pa * la - pb * lc self.b = pa * lb - pb * ld self.c = pc * la + pd * lc - self.d = pc * lb + pd * ld + self.d = pc * lb + pd * ld elseif transformMode == TransformMode.noScale or transformMode == TransformMode.noScaleOrReflection then local cos = math_cos(math_rad(rotation)) local sin = math_sin(math_rad(rotation)) @@ -185,9 +185,9 @@ function Bone:updateWorldTransformWith (x, y, rotation, scaleX, scaleY, shearX, self.a = za * la + zb * lc self.b = za * lb + zb * ld self.c = zc * la + zd * lc - self.d = zc * lb + zd * ld + self.d = zc * lb + zd * ld end - + self.a = self.a * sx self.b = self.b * sx self.c = self.c * sy diff --git a/spine-starling/spine-starling-example/lib/spine-as3.swc b/spine-starling/spine-starling-example/lib/spine-as3.swc index a72697404..e2ab7d151 100644 Binary files a/spine-starling/spine-starling-example/lib/spine-as3.swc and b/spine-starling/spine-starling-example/lib/spine-as3.swc differ diff --git a/spine-starling/spine-starling/lib/spine-as3.swc b/spine-starling/spine-starling/lib/spine-as3.swc index a72697404..e2ab7d151 100644 Binary files a/spine-starling/spine-starling/lib/spine-as3.swc and b/spine-starling/spine-starling/lib/spine-as3.swc differ diff --git a/spine-ts/build/spine-all.js b/spine-ts/build/spine-all.js index 1087ada83..d2525f9e2 100644 --- a/spine-ts/build/spine-all.js +++ b/spine-ts/build/spine-all.js @@ -2508,8 +2508,8 @@ var spine; var sx = skeleton.scaleX; var sy = skeleton.scaleY; this.a = spine.MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = spine.MathUtils.sinDeg(rotationY) * scaleY * sy; this.worldX = x * sx + skeleton.x; this.worldY = y * sy + skeleton.y; diff --git a/spine-ts/build/spine-canvas.js b/spine-ts/build/spine-canvas.js index 1cb0235ea..77de33bec 100644 --- a/spine-ts/build/spine-canvas.js +++ b/spine-ts/build/spine-canvas.js @@ -2508,8 +2508,8 @@ var spine; var sx = skeleton.scaleX; var sy = skeleton.scaleY; this.a = spine.MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = spine.MathUtils.sinDeg(rotationY) * scaleY * sy; this.worldX = x * sx + skeleton.x; this.worldY = y * sy + skeleton.y; diff --git a/spine-ts/build/spine-core.js b/spine-ts/build/spine-core.js index f54dde78e..15ce26315 100644 --- a/spine-ts/build/spine-core.js +++ b/spine-ts/build/spine-core.js @@ -2508,8 +2508,8 @@ var spine; var sx = skeleton.scaleX; var sy = skeleton.scaleY; this.a = spine.MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = spine.MathUtils.sinDeg(rotationY) * scaleY * sy; this.worldX = x * sx + skeleton.x; this.worldY = y * sy + skeleton.y; diff --git a/spine-ts/build/spine-player.js b/spine-ts/build/spine-player.js index 3014b8daa..f7795cc09 100644 --- a/spine-ts/build/spine-player.js +++ b/spine-ts/build/spine-player.js @@ -2508,8 +2508,8 @@ var spine; var sx = skeleton.scaleX; var sy = skeleton.scaleY; this.a = spine.MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = spine.MathUtils.sinDeg(rotationY) * scaleY * sy; this.worldX = x * sx + skeleton.x; this.worldY = y * sy + skeleton.y; diff --git a/spine-ts/build/spine-threejs.js b/spine-ts/build/spine-threejs.js index 19483fc7a..7183f2822 100644 --- a/spine-ts/build/spine-threejs.js +++ b/spine-ts/build/spine-threejs.js @@ -2508,8 +2508,8 @@ var spine; var sx = skeleton.scaleX; var sy = skeleton.scaleY; this.a = spine.MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = spine.MathUtils.sinDeg(rotationY) * scaleY * sy; this.worldX = x * sx + skeleton.x; this.worldY = y * sy + skeleton.y; diff --git a/spine-ts/build/spine-webgl.js b/spine-ts/build/spine-webgl.js index d34aae497..c81dfca6b 100644 --- a/spine-ts/build/spine-webgl.js +++ b/spine-ts/build/spine-webgl.js @@ -2508,8 +2508,8 @@ var spine; var sx = skeleton.scaleX; var sy = skeleton.scaleY; this.a = spine.MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = spine.MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = spine.MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = spine.MathUtils.sinDeg(rotationY) * scaleY * sy; this.worldX = x * sx + skeleton.x; this.worldY = y * sy + skeleton.y; diff --git a/spine-ts/core/src/Bone.ts b/spine-ts/core/src/Bone.ts index b349776e4..c171deaff 100644 --- a/spine-ts/core/src/Bone.ts +++ b/spine-ts/core/src/Bone.ts @@ -85,8 +85,8 @@ module spine { let sx = skeleton.scaleX; let sy = skeleton.scaleY; this.a = MathUtils.cosDeg(rotation + shearX) * scaleX * sx; - this.b = MathUtils.cosDeg(rotationY) * scaleY * sy; - this.c = MathUtils.sinDeg(rotation + shearX) * scaleX * sx; + this.b = MathUtils.cosDeg(rotationY) * scaleY * sx; + this.c = MathUtils.sinDeg(rotation + shearX) * scaleX * sy; this.d = MathUtils.sinDeg(rotationY) * scaleY * sy; this.worldX = x * sx + skeleton.x; this.worldY = y * sy + skeleton.y;