UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 15:24:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[libgdx] Fixed AlphaTimeline and loading RGB timelines in skeleton data.

Browse Source
This commit is contained in:
Nathan Sweet 2020-11-12 12:33:58 -08:00
parent d383caccb5
commit 391917d37b
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -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;
}

6
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonBinary.java
View File

@ -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;

6
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/SkeletonJson.java
View File

@ -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;