[runtimes] Port of fix for TransformMode.noRotationOrReflection apply…

…ing skeleton scale twice. See #1668.
EsotericSoftware · May 6, 2020 · 6a317a1 · 6a317a1
1 parent c73f8c1
commit 6a317a1
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 22 deletions.
diff --git a/spine-as3/spine-as3/lib/spine-as3.swc b/spine-as3/spine-as3/lib/spine-as3.swc
diff --git a/spine-as3/spine-as3/src/spine/Bone.as b/spine-as3/spine-as3/src/spine/Bone.as
@@ -57,7 +57,7 @@ package spine {
 		public var worldY : Number;
 		internal var _sorted : Boolean;
 		public var active : Boolean;
-		
+
 
 		/** @param parent May be null. */
 		public function Bone(data : BoneData, skeleton : Skeleton, parent : Bone) {
@@ -68,7 +68,7 @@ package spine {
 			_parent = parent;
 			setToSetupPose();
 		}
-		
+
 		public function isActive() : Boolean {
 			return active;
 		}
@@ -102,8 +102,8 @@ package spine {
 
 			var parent : Bone = _parent;
 			if (!parent) { // Root bone.
-				rotationY = rotation + 90 + shearY;				
-				var skeleton : Skeleton = _skeleton;								
+				rotationY = rotation + 90 + shearY;
+				var skeleton : Skeleton = _skeleton;
 				this.a = MathUtils.cosDeg(rotation + shearX) * scaleX * sx;
 				this.b = MathUtils.cosDeg(rotationY) * scaleY * sx;
 				this.c = MathUtils.sinDeg(rotation + shearX) * scaleX * sy;
@@ -161,7 +161,7 @@ package spine {
 					this.b = pa * lb - pb * ld;
 					this.c = pc * la + pd * lc;
 					this.d = pc * lb + pd * ld;
-					break;
+					return;
 				}
 				case TransformMode.noScale:
 				case TransformMode.noScaleOrReflection: {
@@ -182,11 +182,11 @@ package spine {
 					la = MathUtils.cosDeg(shearX) * scaleX;
 					lb = MathUtils.cosDeg(90 + shearY) * scaleY;
 					lc = MathUtils.sinDeg(shearX) * scaleX;
-					ld = MathUtils.sinDeg(90 + shearY) * scaleY;					
+					ld = MathUtils.sinDeg(90 + shearY) * scaleY;
 					this.a = za * la + zb * lc;
 					this.b = za * lb + zb * ld;
 					this.c = zc * la + zd * lc;
-					this.d = zc * lb + zd * ld;					
+					this.d = zc * lb + zd * ld;
 					break;
 				}
 			}

diff --git a/spine-c/spine-c/src/spine/Bone.c b/spine-c/spine-c/src/spine/Bone.c
@@ -139,7 +139,7 @@ void spBone_updateWorldTransformWith (spBone* self, float x, float y, float rota
 		CONST_CAST(float, self->b) = pa * lb - pb * ld;
 		CONST_CAST(float, self->c) = pc * la + pd * lc;
 		CONST_CAST(float, self->d) = pc * lb + pd * ld;
-		break;
+		return;
 	}
 	case SP_TRANSFORMMODE_NOSCALE:
 	case SP_TRANSFORMMODE_NOSCALEORREFLECTION: {

diff --git a/spine-cpp/spine-cpp/src/spine/Bone.cpp b/spine-cpp/spine-cpp/src/spine/Bone.cpp
@@ -168,7 +168,7 @@ void Bone::updateWorldTransform(float x, float y, float rotation, float scaleX,
 		_b = pa * lb - pb * ld;
 		_c = pc * la + pd * lc;
 		_d = pc * lb + pd * ld;
-		break;
+		return;
 	}
 	case TransformMode_NoScale:
 	case TransformMode_NoScaleOrReflection: {

diff --git a/spine-lua/Bone.lua b/spine-lua/Bone.lua
@@ -162,6 +162,7 @@ function Bone:updateWorldTransformWith (x, y, rotation, scaleX, scaleY, shearX,
 		self.b = pa * lb - pb * ld
 		self.c = pc * la + pd * lc
 		self.d = pc * lb + pd * ld
+		return
 	elseif transformMode == TransformMode.noScale or transformMode == TransformMode.noScaleOrReflection then
 		local cos = math_cos(math_rad(rotation))
 		local sin = math_sin(math_rad(rotation))

diff --git a/spine-starling/spine-starling/lib/spine-starling.swc b/spine-starling/spine-starling/lib/spine-starling.swc
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-player.js b/spine-ts/build/spine-player.js
diff --git a/spine-ts/build/spine-player.js.map b/spine-ts/build/spine-player.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/core/src/Bone.ts b/spine-ts/core/src/Bone.ts
@@ -219,7 +219,7 @@ module spine {
 				this.b = pa * lb - pb * ld;
 				this.c = pc * la + pd * lc;
 				this.d = pc * lb + pd * ld;
-				break;
+				return;
 			}
 			case TransformMode.NoScale:
 			case TransformMode.NoScaleOrReflection: {