From 3ab0b7203304d56e88be6b060faaee2106f3509b Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Wed, 21 Oct 2020 21:31:47 -0700 Subject: [PATCH] [libgdx] Fixed skeleton data loader scale for IK constraint timelines. --- .../src/com/esotericsoftware/spine/SkeletonBinary.java | 4 ++-- .../src/com/esotericsoftware/spine/SkeletonJson.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java index ce6e2f85d..073542e68 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java +++ b/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++) { timeline.setFrame(frame, time, mix, softness, input.readByte(), input.readBoolean(), input.readBoolean()); 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()) { case CURVE_STEPPED: timeline.setStepped(frame); break; case CURVE_BEZIER: 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; mix = mix2; diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java index b186061e5..f6823cc30 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -642,7 +642,7 @@ public class SkeletonJson extends SkeletonLoader { JsonValue curve = keyMap.get("curve"); if (curve != null) { 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; mix = mix2;