From 391917d37b337d0699832363c7b3b109140e8563 Mon Sep 17 00:00:00 2001 From: Nathan Sweet Date: Thu, 12 Nov 2020 12:33:58 -0800 Subject: [PATCH] [libgdx] Fixed AlphaTimeline and loading RGB timelines in skeleton data. --- .../src/com/esotericsoftware/spine/Animation.java | 8 ++------ .../src/com/esotericsoftware/spine/SkeletonBinary.java | 6 +++--- .../src/com/esotericsoftware/spine/SkeletonJson.java | 6 +++--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java index 8f3ad851a..da677bee6 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java @@ -1294,14 +1294,10 @@ public class Animation { Color color = slot.color, setup = slot.data.color; switch (blend) { case setup: - color.r = setup.r; - color.g = setup.g; - color.b = setup.b; + color.a = setup.a; return; case first: - color.r += (setup.r - color.r) * alpha; - color.g += (setup.g - color.g) * alpha; - color.b += (setup.b - color.b) * alpha; + color.a += (setup.a - color.a) * alpha; } return; } 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 b617fd196..462874d4a 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java @@ -704,9 +704,9 @@ public class SkeletonBinary extends SkeletonLoader { setBezier(input, timeline, bezier++, frame, 0, time, time2, r, nr, 1); setBezier(input, timeline, bezier++, frame, 1, time, time2, g, ng, 1); setBezier(input, timeline, bezier++, frame, 2, time, time2, b, nb, 1); - setBezier(input, timeline, bezier++, frame, 4, time, time2, r2, nr2, 1); - setBezier(input, timeline, bezier++, frame, 5, time, time2, g2, ng2, 1); - setBezier(input, timeline, bezier++, frame, 6, time, time2, b2, nb2, 1); + setBezier(input, timeline, bezier++, frame, 3, time, time2, r2, nr2, 1); + setBezier(input, timeline, bezier++, frame, 4, time, time2, g2, ng2, 1); + setBezier(input, timeline, bezier++, frame, 5, time, time2, b2, nb2, 1); } time = time2; r = nr; 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 e6dd04bd9..eaa010bc9 100644 --- a/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java +++ b/spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java @@ -666,9 +666,9 @@ public class SkeletonJson extends SkeletonLoader { bezier = readCurve(curve, timeline, bezier, frame, 0, time, time2, r, nr, 1); bezier = readCurve(curve, timeline, bezier, frame, 1, time, time2, g, ng, 1); bezier = readCurve(curve, timeline, bezier, frame, 2, time, time2, b, nb, 1); - bezier = readCurve(curve, timeline, bezier, frame, 4, time, time2, r2, nr2, 1); - bezier = readCurve(curve, timeline, bezier, frame, 5, time, time2, g2, ng2, 1); - bezier = readCurve(curve, timeline, bezier, frame, 6, time, time2, b2, nb2, 1); + bezier = readCurve(curve, timeline, bezier, frame, 3, time, time2, r2, nr2, 1); + bezier = readCurve(curve, timeline, bezier, frame, 4, time, time2, g2, ng2, 1); + bezier = readCurve(curve, timeline, bezier, frame, 5, time, time2, b2, nb2, 1); } time = time2; r = nr;