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

Moved firing complete event to apply. Fixed missing keys on last frame when animation changes.

Browse Source
This commit is contained in:
NathanSweet 2013-10-17 16:06:18 +02:00
parent 98e4c0e7e5
commit dbd6ae87ad
5 changed files with 116 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spine-as3/spine-as3/src/spine/animation/AnimationState.as
View File

@ -55,25 +55,15 @@ public class AnimationState {
if (!current) continue;
var trackDelta:Number = delta * current.timeScale;
var time:Number = current.time + trackDelta;
var endTime:Number = current.endTime;
current.time = time;
current.time += trackDelta;
if (current.previous) {
current.previous.time += trackDelta;
current.mixTime += trackDelta;
}
// Check if completed the animation or a loop iteration.
if (current.loop ? (current.lastTime % endTime > time % endTime) : (current.lastTime < endTime && time >= endTime)) {
var count:int = (int)(time / endTime);
if (current.onComplete != null) current.onComplete(i, count);
if (onComplete != null) onComplete(i, count);
}
var next:TrackEntry = current.next;
if (next) {
if (time - trackDelta > next.delay) setCurrent(i, next);
if (current.lastTime >= next.delay) setCurrent(i, next);
} else {
// End non-looping animation when it reaches its end time and there is no next entry.
if (!current.loop && current.lastTime >= current.endTime) clearTrack(i);
@ -89,8 +79,10 @@ public class AnimationState {
_events.length = 0;
var time:Number = current.time;
var lastTime:Number = current.lastTime;
var endTime:Number = current.endTime;
var loop:Boolean = current.loop;
if (!loop && time > current.endTime) time = current.endTime;
if (!loop && time > endTime) time = endTime;
var previous:TrackEntry = current.previous;
if (!previous)
@ -113,6 +105,13 @@ public class AnimationState {
if (onEvent != null) onEvent(i, event);
}
// Check if completed the animation or a loop iteration.
if (loop ? (lastTime % endTime > time % endTime) : (lastTime < endTime && time >= endTime)) {
var count:int = (int)(time / endTime);
if (current.onComplete != null) current.onComplete(i, count);
if (onComplete != null) onComplete(i, count);
}
current.lastTime = current.time;
}
}

44
spine-c/src/spine/AnimationState.c
View File

@ -85,33 +85,21 @@ void spAnimationState_dispose (spAnimationState* self) {
void spAnimationState_update (spAnimationState* self, float delta) {
int i;
float time, endTime, trackDelta;
float trackDelta;
delta *= self->timeScale;
for (i = 0; i < self->trackCount; i++) {
spTrackEntry* current = self->tracks[i];
if (!current) continue;
trackDelta = delta * current->timeScale;
time = current->time + trackDelta;
endTime = current->endTime;
current->time = time;
current->time += trackDelta;
if (current->previous) {
current->previous->time += trackDelta;
current->mixTime += trackDelta;
}
/* Check if completed the animation or a loop iteration. */
if (current->loop ?
(FMOD(current->lastTime, endTime) > FMOD(time, endTime)) : (current->lastTime < endTime && time >= endTime)) {
int count = (int)(time / endTime);
if (current->listener) current->listener(self, i, ANIMATION_COMPLETE, 0, count);
if (self->listener) self->listener(self, i, ANIMATION_COMPLETE, 0, count);
if (i >= self->trackCount || self->tracks[i] != current) continue;
}
if (current->next) {
if (time - trackDelta >= current->next->delay) _spAnimationState_setCurrent(self, i, current->next);
if (current->lastTime >= current->next->delay) _spAnimationState_setCurrent(self, i, current->next);
} else {
/* End non-looping animation when it reaches its end time and there is no next entry. */
if (!current->loop && current->lastTime >= current->endTime) spAnimationState_clearTrack(self, i);
@ -137,8 +125,7 @@ void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
previous = current->previous;
if (!previous) {
spAnimation_apply(current->animation, skeleton, current->lastTime, time, current->loop, internal->events,
&eventCount);
spAnimation_apply(current->animation, skeleton, current->lastTime, time, current->loop, internal->events, &eventCount);
} else {
float alpha = current->mixTime / current->mixDuration;
@ -151,8 +138,8 @@ void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
_spTrackEntry_dispose(current->previous);
current->previous = 0;
}
spAnimation_mix(current->animation, skeleton, current->lastTime, time, current->loop, internal->events,
&eventCount, alpha);
spAnimation_mix(current->animation, skeleton, current->lastTime, time, current->loop, internal->events, &eventCount,
alpha);
}
for (ii = 0; ii < eventCount; ii++) {
@ -161,6 +148,15 @@ void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
if (self->listener) self->listener(self, i, ANIMATION_EVENT, event, 0);
}
/* Check if completed the animation or a loop iteration. */
if (current->loop ? (FMOD(current->lastTime, current->endTime) > FMOD(time, current->endTime)) //
: (current->lastTime < current->endTime && time >= current->endTime)) {
int count = (int)(time / current->endTime);
if (current->listener) current->listener(self, i, ANIMATION_COMPLETE, 0, count);
if (self->listener) self->listener(self, i, ANIMATION_COMPLETE, 0, count);
if (i >= self->trackCount || self->tracks[i] != current) continue;
}
if (i >= self->trackCount || self->tracks[i] != current) continue;
current->lastTime = current->time;
}
@ -222,7 +218,8 @@ void _spAnimationState_setCurrent (spAnimationState* self, int index, spTrackEnt
if (self->listener) self->listener(self, index, ANIMATION_START, 0, 0);
}
spTrackEntry* spAnimationState_setAnimationByName (spAnimationState* self, int trackIndex, const char* animationName, int/*bool*/loop) {
spTrackEntry* spAnimationState_setAnimationByName (spAnimationState* self, int trackIndex, const char* animationName,
int/*bool*/loop) {
spAnimation* animation = spSkeletonData_findAnimation(self->data->skeletonData, animationName);
return spAnimationState_setAnimation(self, trackIndex, animation, loop);
}
@ -241,13 +238,14 @@ spTrackEntry* spAnimationState_setAnimation (spAnimationState* self, int trackIn
return entry;
}
spTrackEntry* spAnimationState_addAnimationByName (spAnimationState* self, int trackIndex, const char* animationName, int/*bool*/loop,
float delay) {
spTrackEntry* spAnimationState_addAnimationByName (spAnimationState* self, int trackIndex, const char* animationName,
int/*bool*/loop, float delay) {
spAnimation* animation = spSkeletonData_findAnimation(self->data->skeletonData, animationName);
return spAnimationState_addAnimation(self, trackIndex, animation, loop, delay);
}
spTrackEntry* spAnimationState_addAnimation (spAnimationState* self, int trackIndex, spAnimation* animation, int/*bool*/loop, float delay) {
spTrackEntry* spAnimationState_addAnimation (spAnimationState* self, int trackIndex, spAnimation* animation, int/*bool*/loop,
float delay) {
spTrackEntry* last;
spTrackEntry* entry = _spTrackEntry_create();

25
spine-js/spine.js
View File

@ -971,25 +971,15 @@ spine.AnimationState.prototype = {
if (!current) continue;
var trackDelta = delta * current.timeScale;
var time = current.time + trackDelta;
var endTime = current.endTime;
current.time = time;
current.time += trackDelta;
if (current.previous) {
current.previous.time += trackDelta;
current.mixTime += trackDelta;
}
// Check if completed the animation or a loop iteration.
if (current.loop ? (current.lastTime % endTime > time % endTime) : (current.lastTime < endTime && time >= endTime)) {
var count = Math.floor(time / endTime);
if (current.onComplete) current.onComplete(i, count);
if (this.onComplete) this.onComplete(i, count);
}
var next = current.next;
if (next) {
if (time - trackDelta > next.delay) this.setCurrent(i, next);
if (current.lastTime >= next.delay) this.setCurrent(i, next);
} else {
// End non-looping animation when it reaches its end time and there is no next entry.
if (!current.loop && current.lastTime >= current.endTime) this.clearTrack(i);
@ -1004,8 +994,10 @@ spine.AnimationState.prototype = {
this.events.length = 0;
var time = current.time;
var lastTime = current.lastTime;
var endTime = current.endTime;
var loop = current.loop;
if (!loop && time > current.endTime) time = current.endTime;
if (!loop && time > endTime) time = endTime;
var previous = current.previous;
if (!previous)
@ -1029,6 +1021,13 @@ spine.AnimationState.prototype = {
if (this.onEvent != null) this.onEvent(i, event);
}
// Check if completed the animation or a loop iteration.
if (loop ? (lastTime % endTime > time % endTime) : (lastTime < endTime && time >= endTime)) {
var count = Math.floor(time / endTime);
if (current.onComplete) current.onComplete(i, count);
if (this.onComplete) this.onComplete(i, count);
}
current.lastTime = current.time;
}
},

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

@ -57,26 +57,15 @@ public class AnimationState {
if (current == null) continue;
float trackDelta = delta * current.timeScale;
float time = current.time + trackDelta;
float endTime = current.endTime;
current.time = time;
current.time += trackDelta;
if (current.previous != null) {
current.previous.time += trackDelta;
current.mixTime += trackDelta;
}
// Check if completed the animation or a loop iteration.
if (current.loop ? (current.lastTime % endTime > time % endTime) : (current.lastTime < endTime && time >= endTime)) {
int count = (int)(time / endTime);
if (current.listener != null) current.listener.complete(i, count);
for (int ii = 0, nn = listeners.size; ii < nn; ii++)
listeners.get(ii).complete(i, count);
}
TrackEntry next = current.next;
if (next != null) {
if (time - trackDelta > next.delay) setCurrent(i, next);
if (current.lastTime >= next.delay) setCurrent(i, next);
} else {
// End non-looping animation when it reaches its end time and there is no next entry.
if (!current.loop && current.lastTime >= current.endTime) clearTrack(i);
@ -95,12 +84,14 @@ public class AnimationState {
events.size = 0;
float time = current.time;
float lastTime = current.lastTime;
float endTime = current.endTime;
boolean loop = current.loop;
if (!loop && time > current.endTime) time = current.endTime;
if (!loop && time > endTime) time = endTime;
TrackEntry previous = current.previous;
if (previous == null)
current.animation.apply(skeleton, current.lastTime, time, loop, events);
current.animation.apply(skeleton, lastTime, time, loop, events);
else {
float previousTime = previous.time;
if (!previous.loop && previousTime > previous.endTime) previousTime = previous.endTime;
@ -112,7 +103,7 @@ public class AnimationState {
Pools.free(previous);
current.previous = null;
}
current.animation.mix(skeleton, current.lastTime, time, loop, events, alpha);
current.animation.mix(skeleton, lastTime, time, loop, events, alpha);
}
for (int ii = 0, nn = events.size; ii < nn; ii++) {
@ -122,6 +113,14 @@ public class AnimationState {
listeners.get(iii).event(i, event);
}
// Check if completed the animation or a loop iteration.
if (loop ? (lastTime % endTime > time % endTime) : (lastTime < endTime && time >= endTime)) {
int count = (int)(time / endTime);
if (current.listener != null) current.listener.complete(i, count);
for (int ii = 0, nn = listeners.size; ii < nn; ii++)
listeners.get(ii).complete(i, count);
}
current.lastTime = current.time;
}
}

37
spine-lua/AnimationState.lua
View File

@ -70,31 +70,15 @@ function AnimationState.new (data)
for i,current in pairs(self.tracks) do
if current then
local trackDelta = delta * current.timeScale
local time = current.time + trackDelta
local endTime = current.endTime
current.time = time
current.time = current.time + trackDelta
if current.previous then
current.previous.time = current.previous.time + trackDelta
current.mixTime = current.mixTime + trackDelta
end
-- Check if completed the animation or a loop iteration.
local complete
if current.loop then
complete = current.lastTime % endTime > time % endTime
else
complete = current.lastTime < endTime and time >= endTime
end
if complete then
local count = math.floor(time / endTime)
if current.onComplete then current.onComplete(i, count) end
if self.onComplete then self.onComplete(i, count) end
end
local next = current.next
if next then
if time - trackDelta > next.delay then setCurrent(i, next) end
if current.lastTime >= next.delay then setCurrent(i, next) end
else
-- End non-looping animation when it reaches its end time and there is no next entry.
if not current.loop and current.lastTime >= current.endTime then self:clearTrack(i) end
@ -107,8 +91,10 @@ function AnimationState.new (data)
for i,current in pairs(self.tracks) do
if current then
local time = current.time
local lastTime = current.lastTime
local endTime = current.endTime
local loop = current.loop
if not loop and time > current.endTime then time = current.endTime end
if not loop and time > endTime then time = endTime end
local previous = current.previous
if not previous then
@ -136,6 +122,19 @@ function AnimationState.new (data)
table.remove(self.events)
end
-- Check if completed the animation or a loop iteration.
local complete
if current.loop then
complete = lastTime % endTime > time % endTime
else
complete = lastTime < endTime and time >= endTime
end
if complete then
local count = math.floor(time / endTime)
if current.onComplete then current.onComplete(i, count) end
if self.onComplete then self.onComplete(i, count) end
end
current.lastTime = current.time
end
end