UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Combined properties for rgb channels.

Browse Source
This commit is contained in:
NathanSweet 2019-10-26 17:18:01 +02:00
parent 93ca505864
commit 40e0f7c88c
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ public class Animation {
static private enum TimelineType { static private enum TimelineType {
rotate, translateX, translateY, scaleX, scaleY, shearX, shearY, // rotate, translateX, translateY, scaleX, scaleY, shearX, shearY, //
r, b, g, a, r2, g2, b2, // rgb, a, rgb2, //
attachment, deform, // attachment, deform, //
event, drawOrder, // event, drawOrder, //
ikConstraint, transformConstraint, // ikConstraint, transformConstraint, //
@ -808,9 +808,8 @@ public class Animation {
public ColorTimeline (int frameCount, int bezierIndex, int slotIndex) { public ColorTimeline (int frameCount, int bezierIndex, int slotIndex) {
super(frameCount, ENTRIES, bezierIndex, // super(frameCount, ENTRIES, bezierIndex, //
TimelineType.r.ordinal() + "|" + slotIndex, // TimelineType.rgb.ordinal() + "|" + slotIndex, //
TimelineType.g.ordinal() + "|" + slotIndex, // TimelineType.a.ordinal() + "|" + slotIndex);
TimelineType.b.ordinal() + "|" + slotIndex, TimelineType.a.ordinal() + "|" + slotIndex);
this.slotIndex = slotIndex; this.slotIndex = slotIndex;
} }
@ -893,12 +892,9 @@ public class Animation {
public TwoColorTimeline (int frameCount, int bezierIndex, int slotIndex) { public TwoColorTimeline (int frameCount, int bezierIndex, int slotIndex) {
super(frameCount, ENTRIES, bezierIndex, // super(frameCount, ENTRIES, bezierIndex, //
TimelineType.r.ordinal() + "|" + slotIndex, // TimelineType.rgb.ordinal() + "|" + slotIndex, //
TimelineType.g.ordinal() + "|" + slotIndex, //
TimelineType.b.ordinal() + "|" + slotIndex, //
TimelineType.a.ordinal() + "|" + slotIndex, // TimelineType.a.ordinal() + "|" + slotIndex, //
TimelineType.r2.ordinal() + "|" + slotIndex, // TimelineType.rgb2.ordinal() + "|" + slotIndex);
TimelineType.g2.ordinal() + "|" + slotIndex, TimelineType.b2.ordinal() + "|" + slotIndex);
this.slotIndex = slotIndex; this.slotIndex = slotIndex;
} }