From 0b01c0036e10a2b837176a8d97c26cfb67087e28 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Tue, 20 Jul 2021 13:31:31 -0400 Subject: [PATCH] [as3][c][cpp][csharp][libgdx][ts] Fixed SkeletonBinary scale not being applied to some timelines. closes #1928 --- spine-as3/spine-as3/src/spine/SkeletonBinary.as | 2 +- spine-c/spine-c/src/spine/SkeletonBinary.c | 2 +- spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp | 2 +- spine-csharp/src/SkeletonBinary.cs | 2 +- .../src/com/esotericsoftware/spine/SkeletonBinary.java | 2 +- spine-ts/core/src/SkeletonBinary.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/spine-as3/spine-as3/src/spine/SkeletonBinary.as b/spine-as3/spine-as3/src/spine/SkeletonBinary.as index cf4909516..57bb31979 100644 --- a/spine-as3/spine-as3/src/spine/SkeletonBinary.as +++ b/spine-as3/spine-as3/src/spine/SkeletonBinary.as @@ -1040,7 +1040,7 @@ package spine { timeline.setStepped(frame); break; case CURVE_BEZIER: - setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1); + setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale); } time = time2; value = value2; diff --git a/spine-c/spine-c/src/spine/SkeletonBinary.c b/spine-c/spine-c/src/spine/SkeletonBinary.c index c63ea4445..99ffb92d3 100644 --- a/spine-c/spine-c/src/spine/SkeletonBinary.c +++ b/spine-c/spine-c/src/spine/SkeletonBinary.c @@ -239,7 +239,7 @@ static spTimeline *readTimeline(_dataInput *input, spCurveTimeline1 *timeline, f spCurveTimeline_setStepped(timeline, frame); break; case CURVE_BEZIER: - setBezier(input, SUPER(timeline), bezier++, frame, 0, time, time2, value, value2, 1); + setBezier(input, SUPER(timeline), bezier++, frame, 0, time, time2, value, value2, scale); } time = time2; value = value2; diff --git a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp index 33dbd7ce8..e5a5fe32e 100644 --- a/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp +++ b/spine-cpp/spine-cpp/src/spine/SkeletonBinary.cpp @@ -707,7 +707,7 @@ Timeline *SkeletonBinary::readTimeline(DataInput *input, CurveTimeline1 *timelin timeline->setStepped(frame); break; case CURVE_BEZIER: - setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1); + setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale); } time = time2; value = value2; diff --git a/spine-csharp/src/SkeletonBinary.cs b/spine-csharp/src/SkeletonBinary.cs index e551fbc63..f2ce5bef7 100644 --- a/spine-csharp/src/SkeletonBinary.cs +++ b/spine-csharp/src/SkeletonBinary.cs @@ -1031,7 +1031,7 @@ namespace Spine { timeline.SetStepped(frame); break; case CURVE_BEZIER: - SetBezier (input, timeline, bezier++, frame, 0, time, time2, value, value2, 1); + SetBezier (input, timeline, bezier++, frame, 0, time, time2, value, value2, scale); break; } time = time2; 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 bd24288be..d6e8f81c4 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java @@ -1016,7 +1016,7 @@ public class SkeletonBinary extends SkeletonLoader { timeline.setStepped(frame); break; case CURVE_BEZIER: - setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1); + setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale); } time = time2; value = value2; diff --git a/spine-ts/core/src/SkeletonBinary.ts b/spine-ts/core/src/SkeletonBinary.ts index 8806eb301..10cebc0d4 100644 --- a/spine-ts/core/src/SkeletonBinary.ts +++ b/spine-ts/core/src/SkeletonBinary.ts @@ -1070,7 +1070,7 @@ module spine { timeline.setStepped(frame); break; case CURVE_BEZIER: - setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, 1); + setBezier(input, timeline, bezier++, frame, 0, time, time2, value, value2, scale); } time = time2; value = value2;