From 6090d84a5e56c972e4a3a1e56590fce26f2b0878 Mon Sep 17 00:00:00 2001 From: badlogic Date: Thu, 13 Jun 2019 16:03:16 +0200 Subject: [PATCH] [ts] Port of commit ccc5b2f: Fixed root bone transform for skeleton. See #1379. --- spine-ts/build/spine-all.js | 4 ++-- spine-ts/build/spine-canvas.js | 4 ++-- spine-ts/build/spine-core.js | 4 ++-- spine-ts/build/spine-player.js | 4 ++-- spine-ts/build/spine-threejs.js | 4 ++-- spine-ts/build/spine-webgl.js | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spine-ts/build/spine-all.js b/spine-ts/build/spine-all.js index f41747249..027c6ab3c 100644 --- a/spine-ts/build/spine-all.js +++ b/spine-ts/build/spine-all.js @@ -2428,8 +2428,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 c87efe034..7288639de 100644 --- a/spine-ts/build/spine-canvas.js +++ b/spine-ts/build/spine-canvas.js @@ -2428,8 +2428,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 307176ddd..dca543f74 100644 --- a/spine-ts/build/spine-core.js +++ b/spine-ts/build/spine-core.js @@ -2428,8 +2428,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 ca76002fe..be656896b 100644 --- a/spine-ts/build/spine-player.js +++ b/spine-ts/build/spine-player.js @@ -2428,8 +2428,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 3f852c4b3..02103f90f 100644 --- a/spine-ts/build/spine-threejs.js +++ b/spine-ts/build/spine-threejs.js @@ -2428,8 +2428,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 444fd4042..bc3d946a5 100644 --- a/spine-ts/build/spine-webgl.js +++ b/spine-ts/build/spine-webgl.js @@ -2428,8 +2428,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;