Spine Runtime update to latest version.

Author: bladecoder

blade-engine-spine-plugin/src/main/java/com/esotericsoftware/spine/Animation.java

@@ -31,17 +31,17 @@
 
 package com.esotericsoftware.spine;
 
+import static com.badlogic.gdx.math.MathUtils.*;
 import static com.badlogic.gdx.math.Matrix3.*;
 
-import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Matrix3;
 import com.badlogic.gdx.math.Vector2;
 
 public class Bone implements Updatable {
 	final BoneData data;
 	final Skeleton skeleton;
 	final Bone parent;
-	float x, y, rotation, scaleX, scaleY;
+	float x, y, rotation, scaleX, scaleY, shearX, shearY;
 	float appliedRotation, appliedScaleX, appliedScaleY;
 
 	float a, b, worldX;
@@ -76,26 +76,30 @@ public Bone (Bone bone, Skeleton skeleton, Bone parent) {
 		rotation = bone.rotation;
 		scaleX = bone.scaleX;
 		scaleY = bone.scaleY;
+		shearX = bone.shearX;
+		shearY = bone.shearY;
 	}
 
 	/** Same as {@link #updateWorldTransform()}. This method exists for Bone to implement {@link Updatable}. */
 	public void update () {
-		updateWorldTransform(x, y, rotation, scaleX, scaleY);
+		updateWorldTransform(x, y, rotation, scaleX, scaleY, shearX, shearY);
 	}
 
 	/** Computes the world SRT using the parent bone and this bone's local SRT. */
 	public void updateWorldTransform () {
-		updateWorldTransform(x, y, rotation, scaleX, scaleY);
+		updateWorldTransform(x, y, rotation, scaleX, scaleY, shearX, shearY);
 	}
 
 	/** Computes the world SRT using the parent bone and the specified local SRT. */
-	public void updateWorldTransform (float x, float y, float rotation, float scaleX, float scaleY) {
+	public void updateWorldTransform (float x, float y, float rotation, float scaleX, float scaleY, float shearX, float shearY) {
 		appliedRotation = rotation;
 		appliedScaleX = scaleX;
 		appliedScaleY = scaleY;
 
-		float cos = MathUtils.cosDeg(rotation), sin = MathUtils.sinDeg(rotation);
-		float la = cos * scaleX, lb = -sin * scaleY, lc = sin * scaleX, ld = cos * scaleY;
+		float rotationY = rotation + 90 + shearY;
+		float la = cosDeg(rotation + shearX) * scaleX, lb = cosDeg(rotationY) * scaleY;
+		float lc = sinDeg(rotation + shearX) * scaleX, ld = sinDeg(rotationY) * scaleY;
+
 		Bone parent = this.parent;
 		if (parent == null) { // Root bone.
 			Skeleton skeleton = this.skeleton;
@@ -131,68 +135,67 @@ public void updateWorldTransform (float x, float y, float rotation, float scaleX
 			b = pa * lb + pb * ld;
 			c = pc * la + pd * lc;
 			d = pc * lb + pd * ld;
-		} else if (data.inheritRotation) { // No scale inheritance.
-			pa = 1;
-			pb = 0;
-			pc = 0;
-			pd = 1;
-			do {
-				cos = MathUtils.cosDeg(parent.appliedRotation);
-				sin = MathUtils.sinDeg(parent.appliedRotation);
-				float temp = pa * cos + pb * sin;
-				pb = pa * -sin + pb * cos;
-				pa = temp;
-				temp = pc * cos + pd * sin;
-				pd = pc * -sin + pd * cos;
-				pc = temp;
-				parent = parent.parent;
-			} while (parent != null);
-			a = pa * la + pb * lc;
-			b = pa * lb + pb * ld;
-			c = pc * la + pd * lc;
-			d = pc * lb + pd * ld;
-			if (skeleton.flipX) {
-				a = -a;
-				b = -b;
-			}
-			if (skeleton.flipY) {
-				c = -c;
-				d = -d;
+		} else {
+			if (data.inheritRotation) { // No scale inheritance.
+				pa = 1;
+				pb = 0;
+				pc = 0;
+				pd = 1;
+				do {
+					float cos = cosDeg(parent.appliedRotation), sin = sinDeg(parent.appliedRotation);
+					float temp = pa * cos + pb * sin;
+					pb = pa * -sin + pb * cos;
+					pa = temp;
+					temp = pc * cos + pd * sin;
+					pd = pc * -sin + pd * cos;
+					pc = temp;
+
+					if (!parent.data.inheritRotation) break;
+					parent = parent.parent;
+				} while (parent != null);
+				a = pa * la + pb * lc;
+				b = pa * lb + pb * ld;
+				c = pc * la + pd * lc;
+				d = pc * lb + pd * ld;
+			} else if (data.inheritScale) { // No rotation inheritance.
+				pa = 1;
+				pb = 0;
+				pc = 0;
+				pd = 1;
+				do {
+					float r = parent.appliedRotation, cos = cosDeg(r), sin = sinDeg(r);
+					float psx = parent.appliedScaleX, psy = parent.appliedScaleY;
+					float za = cos * psx, zb = -sin * psy, zc = sin * psx, zd = cos * psy;
+					float temp = pa * za + pb * zc;
+					pb = pa * zb + pb * zd;
+					pa = temp;
+					temp = pc * za + pd * zc;
+					pd = pc * zb + pd * zd;
+					pc = temp;
+
+					if (psx < 0) r = -r;
+					cos = cosDeg(-r);
+					sin = sinDeg(-r);
+					temp = pa * cos + pb * sin;
+					pb = pa * -sin + pb * cos;
+					pa = temp;
+					temp = pc * cos + pd * sin;
+					pd = pc * -sin + pd * cos;
+					pc = temp;
+
+					if (!parent.data.inheritScale) break;
+					parent = parent.parent;
+				} while (parent != null);
+				a = pa * la + pb * lc;
+				b = pa * lb + pb * ld;
+				c = pc * la + pd * lc;
+				d = pc * lb + pd * ld;
+			} else {
+				a = la;
+				b = lb;
+				c = lc;
+				d = ld;
 			}
-		} else if (data.inheritScale) { // No rotation inheritance.
-			pa = 1;
-			pb = 0;
-			pc = 0;
-			pd = 1;
-			do {
-				float r = parent.rotation;
-				cos = MathUtils.cosDeg(r);
-				sin = MathUtils.sinDeg(r);
-				float psx = parent.appliedScaleX, psy = parent.appliedScaleY;
-				float za = cos * psx, zb = -sin * psy, zc = sin * psx, zd = cos * psy;
-				float temp = pa * za + pb * zc;
-				pb = pa * zb + pb * zd;
-				pa = temp;
-				temp = pc * za + pd * zc;
-				pd = pc * zb + pd * zd;
-				pc = temp;
-
-				if (psx < 0) r = -r;
-				cos = MathUtils.cosDeg(-r);
-				sin = MathUtils.sinDeg(-r);
-				temp = pa * cos + pb * sin;
-				pb = pa * -sin + pb * cos;
-				pa = temp;
-				temp = pc * cos + pd * sin;
-				pd = pc * -sin + pd * cos;
-				pc = temp;
-
-				parent = parent.parent;
-			} while (parent != null);
-			a = pa * la + pb * lc;
-			b = pa * lb + pb * ld;
-			c = pc * la + pd * lc;
-			d = pc * lb + pd * ld;
 			if (skeleton.flipX) {
 				a = -a;
 				b = -b;
@@ -201,11 +204,6 @@ public void updateWorldTransform (float x, float y, float rotation, float scaleX
 				c = -c;
 				d = -d;
 			}
-		} else {
-			a = la;
-			b = lb;
-			c = lc;
-			d = ld;
 		}
 	}
 
@@ -216,6 +214,8 @@ public void setToSetupPose () {
 		rotation = data.rotation;
 		scaleX = data.scaleX;
 		scaleY = data.scaleY;
+		shearX = data.shearX;
+		shearY = data.shearY;
 	}
 
 	public BoneData getData () {
@@ -251,7 +251,6 @@ public void setPosition (float x, float y) {
 		this.y = y;
 	}
 
-	/** Returns the forward kinetics rotation. */
 	public float getRotation () {
 		return rotation;
 	}
@@ -286,6 +285,22 @@ public void setScale (float scale) {
 		scaleY = scale;
 	}
 
+	public float getShearX () {
+		return shearX;
+	}
+
+	public void setShearX (float shearX) {
+		this.shearX = shearX;
+	}
+
+	public float getShearY () {
+		return shearY;
+	}
+
+	public void setShearY (float shearY) {
+		this.shearY = shearY;
+	}
+
 	public float getA () {
 		return a;
 	}
@@ -319,11 +334,11 @@ public float getWorldSignY () {
 	}
 
 	public float getWorldRotationX () {
-		return MathUtils.atan2(c, a) * MathUtils.radDeg;
+		return atan2(c, a) * radDeg;
 	}
 
 	public float getWorldRotationY () {
-		return MathUtils.atan2(d, b) * MathUtils.radDeg;
+		return atan2(d, b) * radDeg;
 	}
 
 	public float getWorldScaleX () {
@@ -353,8 +368,8 @@ public Vector2 worldToLocal (Vector2 world) {
 		float x = world.x - worldX, y = world.y - worldY;
 		float a = this.a, b = this.b, c = this.c, d = this.d;
 		float invDet = 1 / (a * d - b * c);
-		world.x = (x * a * invDet - y * b * invDet);
-		world.y = (y * d * invDet - x * c * invDet);
+		world.x = (x * d * invDet - y * b * invDet);
+		world.y = (y * a * invDet - x * c * invDet);
 		return world;
 	}
 

blade-engine-spine-plugin/src/main/java/com/esotericsoftware/spine/Bone.java

@@ -37,9 +37,7 @@ public class BoneData {
 	final BoneData parent;
 	final String name;
 	float length;
-	float x, y;
-	float rotation;
-	float scaleX = 1, scaleY = 1;
+	float x, y, rotation, scaleX = 1, scaleY = 1, shearX, shearY;
 	boolean inheritScale = true, inheritRotation = true;
 
 	// Nonessential.
@@ -64,6 +62,8 @@ public BoneData (BoneData bone, BoneData parent) {
 		rotation = bone.rotation;
 		scaleX = bone.scaleX;
 		scaleY = bone.scaleY;
+		shearX = bone.shearX;
+		shearY = bone.shearY;
 	}
 
 	/** @return May be null. */
@@ -133,6 +133,22 @@ public void setScale (float scaleX, float scaleY) {
 		this.scaleY = scaleY;
 	}
 
+	public float getShearX () {
+		return shearX;
+	}
+
+	public void setShearX (float shearX) {
+		this.shearX = shearX;
+	}
+
+	public float getShearY () {
+		return shearY;
+	}
+
+	public void setShearY (float shearY) {
+		this.shearY = shearY;
+	}
+
 	public boolean getInheritScale () {
 		return inheritScale;
 	}