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

Merge branch 'dev' of https://github.com/esotericsoftware/spine-runtimes into dev

Browse Source
This commit is contained in:
badlogic 2016-11-04 12:34:30 +01:00
commit ae1b449f58
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,7 +583,7 @@ public class AnimationState {
private void setTimelinesFirst (TrackEntry entry) { private void setTimelinesFirst (TrackEntry entry) {
if (entry.mixingFrom != null) { if (entry.mixingFrom != null) {
setTimelinesFirst(entry.mixingFrom); setTimelinesFirst(entry.mixingFrom);
checkTimelinesUsage(entry, entry.timelinesFirst); checkTimelinesUsage(entry);
return; return;
} }
IntSet propertyIDs = this.propertyIDs; IntSet propertyIDs = this.propertyIDs;
@ -599,14 +599,14 @@ public class AnimationState {
/** From last to first mixingFrom entries, calls checkTimelineUsage. */ /** From last to first mixingFrom entries, calls checkTimelineUsage. */
private void checkTimelinesFirst (TrackEntry entry) { private void checkTimelinesFirst (TrackEntry entry) {
if (entry.mixingFrom != null) checkTimelinesFirst(entry.mixingFrom); if (entry.mixingFrom != null) checkTimelinesFirst(entry.mixingFrom);
checkTimelinesUsage(entry, entry.timelinesFirst); checkTimelinesUsage(entry);
} }
private void checkTimelinesUsage (TrackEntry entry, BooleanArray usageArray) { private void checkTimelinesUsage (TrackEntry entry) {
IntSet propertyIDs = this.propertyIDs; IntSet propertyIDs = this.propertyIDs;
int n = entry.animation.timelines.size; int n = entry.animation.timelines.size;
Object[] timelines = entry.animation.timelines.items; Object[] timelines = entry.animation.timelines.items;
boolean[] usage = usageArray.setSize(n); boolean[] usage = entry.timelinesFirst.setSize(n);
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
usage[i] = propertyIDs.add(((Timeline)timelines[i]).getPropertyId()); usage[i] = propertyIDs.add(((Timeline)timelines[i]).getPropertyId());
} }