[ts] Ported latest AnimationState changes, see c512ee5d595076842cbb12d95a3a7f06792b81d1

This commit is contained in:
badlogic 2016-12-06 13:43:44 +01:00
parent aa49c2d48f
commit ac48da3a14
13 changed files with 33 additions and 20 deletions

View File

@ -1398,6 +1398,7 @@ var spine;
}
}
this.queueEvents(current, animationTime);
events.length = 0;
current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime;
}
@ -1441,7 +1442,9 @@ var spine;
timeline.apply(skeleton, animationLast, animationTime, events, alpha, setupPose, true);
}
}
this.queueEvents(from, animationTime);
if (entry.mixDuration > 0)
this.queueEvents(from, animationTime);
this.events.length = 0;
from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime;
return mix;
@ -1529,7 +1532,6 @@ var spine;
continue;
this.queue.event(entry, events[i]);
}
this.events.length = 0;
};
AnimationState.prototype.clearTracks = function () {
this.queue.drainDisabled = true;

File diff suppressed because one or more lines are too long

View File

@ -1398,6 +1398,7 @@ var spine;
}
}
this.queueEvents(current, animationTime);
events.length = 0;
current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime;
}
@ -1441,7 +1442,9 @@ var spine;
timeline.apply(skeleton, animationLast, animationTime, events, alpha, setupPose, true);
}
}
this.queueEvents(from, animationTime);
if (entry.mixDuration > 0)
this.queueEvents(from, animationTime);
this.events.length = 0;
from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime;
return mix;
@ -1529,7 +1532,6 @@ var spine;
continue;
this.queue.event(entry, events[i]);
}
this.events.length = 0;
};
AnimationState.prototype.clearTracks = function () {
this.queue.drainDisabled = true;

File diff suppressed because one or more lines are too long

View File

@ -1051,6 +1051,7 @@ var spine;
}
}
this.queueEvents(current, animationTime);
events.length = 0;
current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime;
}
@ -1094,7 +1095,9 @@ var spine;
timeline.apply(skeleton, animationLast, animationTime, events, alpha, setupPose, true);
}
}
this.queueEvents(from, animationTime);
if (entry.mixDuration > 0)
this.queueEvents(from, animationTime);
this.events.length = 0;
from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime;
return mix;
@ -1182,7 +1185,6 @@ var spine;
continue;
this.queue.event(entry, events[i]);
}
this.events.length = 0;
};
AnimationState.prototype.clearTracks = function () {
this.queue.drainDisabled = true;

File diff suppressed because one or more lines are too long

View File

@ -1051,6 +1051,7 @@ var spine;
}
}
this.queueEvents(current, animationTime);
events.length = 0;
current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime;
}
@ -1094,7 +1095,9 @@ var spine;
timeline.apply(skeleton, animationLast, animationTime, events, alpha, setupPose, true);
}
}
this.queueEvents(from, animationTime);
if (entry.mixDuration > 0)
this.queueEvents(from, animationTime);
this.events.length = 0;
from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime;
return mix;
@ -1182,7 +1185,6 @@ var spine;
continue;
this.queue.event(entry, events[i]);
}
this.events.length = 0;
};
AnimationState.prototype.clearTracks = function () {
this.queue.drainDisabled = true;

File diff suppressed because one or more lines are too long

View File

@ -1051,6 +1051,7 @@ var spine;
}
}
this.queueEvents(current, animationTime);
events.length = 0;
current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime;
}
@ -1094,7 +1095,9 @@ var spine;
timeline.apply(skeleton, animationLast, animationTime, events, alpha, setupPose, true);
}
}
this.queueEvents(from, animationTime);
if (entry.mixDuration > 0)
this.queueEvents(from, animationTime);
this.events.length = 0;
from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime;
return mix;
@ -1182,7 +1185,6 @@ var spine;
continue;
this.queue.event(entry, events[i]);
}
this.events.length = 0;
};
AnimationState.prototype.clearTracks = function () {
this.queue.drainDisabled = true;

File diff suppressed because one or more lines are too long

View File

@ -1051,6 +1051,7 @@ var spine;
}
}
this.queueEvents(current, animationTime);
events.length = 0;
current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime;
}
@ -1094,7 +1095,9 @@ var spine;
timeline.apply(skeleton, animationLast, animationTime, events, alpha, setupPose, true);
}
}
this.queueEvents(from, animationTime);
if (entry.mixDuration > 0)
this.queueEvents(from, animationTime);
this.events.length = 0;
from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime;
return mix;
@ -1182,7 +1185,6 @@ var spine;
continue;
this.queue.event(entry, events[i]);
}
this.events.length = 0;
};
AnimationState.prototype.clearTracks = function () {
this.queue.drainDisabled = true;

File diff suppressed because one or more lines are too long

View File

@ -157,6 +157,7 @@ module spine {
}
}
this.queueEvents(current, animationTime);
events.length = 0;
current.nextAnimationLast = animationTime;
current.nextTrackLast = current.trackTime;
}
@ -202,7 +203,8 @@ module spine {
}
}
this.queueEvents(from, animationTime);
if (entry.mixDuration > 0) this.queueEvents(from, animationTime);
this.events.length = 0;
from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime;
@ -302,7 +304,6 @@ module spine {
if (event.time < animationStart) continue; // Discard events outside animation start/end.
this.queue.event(entry, events[i]);
}
this.events.length = 0;
}
clearTracks () {