From b2e151f3e7bbd9dc4dcd9dc79b2c7886855a6d78 Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 13 Jun 2019 16:08:04 +0200 Subject: [PATCH] [c][cpp] Port of commit ccc5b2f: Fixed root bone transform for skeleton. See #1379. --- spine-c/spine-c/src/spine/Bone.c | 4 ++-- spine-cpp/spine-cpp/src/spine/Bone.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 8f9118e06..6e0bdcbc0 100644 --- a/spine-cpp/spine-cpp/src/spine/Bone.cpp +++ b/spine-cpp/spine-cpp/src/spine/Bone.cpp @@ -107,8 +107,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();