mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-23 18:21:23 +08:00
[as3] Ported attachment timeline threshold and draw order fix. See #1204.
This commit is contained in:
parent
941a9bd685
commit
54c6aacaa2
Binary file not shown.
@ -241,6 +241,7 @@ package spine.animation {
|
|||||||
from.totalAlpha = 0;
|
from.totalAlpha = 0;
|
||||||
for (i = 0; i < timelineCount; i++) {
|
for (i = 0; i < timelineCount; i++) {
|
||||||
var timeline : Timeline = timelines[i];
|
var timeline : Timeline = timelines[i];
|
||||||
|
var direction : MixDirection = MixDirection.Out;
|
||||||
var timelineBlend: MixBlend;
|
var timelineBlend: MixBlend;
|
||||||
var alpha : Number = 0;
|
var alpha : Number = 0;
|
||||||
switch (timelineMode[i]) {
|
switch (timelineMode[i]) {
|
||||||
@ -268,7 +269,14 @@ package spine.animation {
|
|||||||
if (timeline is RotateTimeline)
|
if (timeline is RotateTimeline)
|
||||||
applyRotateTimeline(timeline, skeleton, animationTime, alpha, timelineBlend, timelinesRotation, i << 1, firstFrame);
|
applyRotateTimeline(timeline, skeleton, animationTime, alpha, timelineBlend, timelinesRotation, i << 1, firstFrame);
|
||||||
else {
|
else {
|
||||||
timeline.apply(skeleton, animationLast, animationTime, events, alpha, timelineBlend, MixDirection.Out);
|
if (timelineBlend == MixBlend.setup) {
|
||||||
|
if (timeline is AttachmentTimeline) {
|
||||||
|
if (attachments) direction = MixDirection.In;
|
||||||
|
} else if (timeline is DrawOrderTimeline) {
|
||||||
|
if (drawOrder) direction = MixDirection.In;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
timeline.apply(skeleton, animationLast, animationTime, events, alpha, timelineBlend, direction);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user