[ts] Fix applying flipping for noScale/noScaleOrReflection transform …

…mode. See #951
EsotericSoftware · Jul 19, 2017 · d8874cb · d8874cb
1 parent 1013e31
commit d8874cb
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 34 deletions.
diff --git a/spine-ts/build/spine-all.js b/spine-ts/build/spine-all.js
diff --git a/spine-ts/build/spine-all.js.map b/spine-ts/build/spine-all.js.map
diff --git a/spine-ts/build/spine-canvas.js b/spine-ts/build/spine-canvas.js
diff --git a/spine-ts/build/spine-canvas.js.map b/spine-ts/build/spine-canvas.js.map
diff --git a/spine-ts/build/spine-core.js b/spine-ts/build/spine-core.js
diff --git a/spine-ts/build/spine-core.js.map b/spine-ts/build/spine-core.js.map
diff --git a/spine-ts/build/spine-threejs.js b/spine-ts/build/spine-threejs.js
diff --git a/spine-ts/build/spine-threejs.js.map b/spine-ts/build/spine-threejs.js.map
diff --git a/spine-ts/build/spine-webgl.js b/spine-ts/build/spine-webgl.js
diff --git a/spine-ts/build/spine-webgl.js.map b/spine-ts/build/spine-webgl.js.map
diff --git a/spine-ts/build/spine-widget.js b/spine-ts/build/spine-widget.js
diff --git a/spine-ts/build/spine-widget.js.map b/spine-ts/build/spine-widget.js.map
diff --git a/spine-ts/core/src/Bone.ts b/spine-ts/core/src/Bone.ts
@@ -169,14 +169,14 @@ module spine {
 				let lb = MathUtils.cosDeg(90 + shearY) * scaleY;
 				let lc = MathUtils.sinDeg(shearX) * scaleX;
 				let ld = MathUtils.sinDeg(90 + shearY) * scaleY;
+				if (this.data.transformMode != TransformMode.NoScaleOrReflection ? pa * pd - pb * pc < 0 : this.skeleton.flipX != this.skeleton.flipY) {
+					zb = -zb;
+					zd = -zd;
+				}
 				this.a = za * la + zb * lc;
 				this.b = za * lb + zb * ld;
 				this.c = zc * la + zd * lc;
 				this.d = zc * lb + zd * ld;
-				if (this.data.transformMode != TransformMode.NoScaleOrReflection ? pa * pd - pb * pc < 0 : this.skeleton.flipX != this.skeleton.flipY) {
-					this.b = -this.b;
-					this.d = -this.d;
-				}
 				return;
 			}
 			}