Browse Source

[libgdx] Fixed skeleton data loader scale for IK constraint timelines.

Nathan Sweet 4 years ago
parent
commit
3ab0b72033

+ 2 - 2
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java

@@ -677,14 +677,14 @@ public class SkeletonBinary extends SkeletonLoader {
 			for (int frame = 0, bezier = 0;; frame++) {
 			for (int frame = 0, bezier = 0;; frame++) {
 				timeline.setFrame(frame, time, mix, softness, input.readByte(), input.readBoolean(), input.readBoolean());
 				timeline.setFrame(frame, time, mix, softness, input.readByte(), input.readBoolean(), input.readBoolean());
 				if (frame == frameLast) break;
 				if (frame == frameLast) break;
-				float time2 = input.readFloat(), mix2 = input.readFloat() * scale, softness2 = input.readFloat() * scale;
+				float time2 = input.readFloat(), mix2 = input.readFloat(), softness2 = input.readFloat() * scale;
 				switch (input.readByte()) {
 				switch (input.readByte()) {
 				case CURVE_STEPPED:
 				case CURVE_STEPPED:
 					timeline.setStepped(frame);
 					timeline.setStepped(frame);
 					break;
 					break;
 				case CURVE_BEZIER:
 				case CURVE_BEZIER:
 					setBezier(input, timeline, bezier++, frame, 0, time, time2, mix, mix2, 1);
 					setBezier(input, timeline, bezier++, frame, 0, time, time2, mix, mix2, 1);
-					setBezier(input, timeline, bezier++, frame, 1, time, time2, softness, softness2, 1);
+					setBezier(input, timeline, bezier++, frame, 1, time, time2, softness, softness2, scale);
 				}
 				}
 				time = time2;
 				time = time2;
 				mix = mix2;
 				mix = mix2;

+ 1 - 1
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java

@@ -642,7 +642,7 @@ public class SkeletonJson extends SkeletonLoader {
 				JsonValue curve = keyMap.get("curve");
 				JsonValue curve = keyMap.get("curve");
 				if (curve != null) {
 				if (curve != null) {
 					bezier = readCurve(curve, timeline, bezier, frame, 0, time, time2, mix, mix2, 1);
 					bezier = readCurve(curve, timeline, bezier, frame, 0, time, time2, mix, mix2, 1);
-					bezier = readCurve(curve, timeline, bezier, frame, 1, time, time2, softness, softness2, 1);
+					bezier = readCurve(curve, timeline, bezier, frame, 1, time, time2, softness, softness2, scale);
 				}
 				}
 				time = time2;
 				time = time2;
 				mix = mix2;
 				mix = mix2;