[spine-ts] Fixed copy/paste bug when firing listeners.

This commit is contained in:
NathanSweet 2016-10-30 23:06:50 +01:00
parent ca4373cf01
commit c6cc8847ae
6 changed files with 8557 additions and 8563 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -659,14 +659,14 @@ module spine {
let entry = objects[i + 1] as TrackEntry;
switch (type) {
case EventType.start:
if (entry.listener != null && entry.listener.end) entry.listener.end(entry);
if (entry.listener != null && entry.listener.start) entry.listener.start(entry);
for (let ii = 0; ii < listeners.length; ii++)
if (listeners[ii].start) listeners[ii].start(entry);
break;
case EventType.interrupt:
if (entry.listener != null && entry.listener.end) entry.listener.end(entry);
if (entry.listener != null && entry.listener.interrupt) entry.listener.interrupt(entry);
for (let ii = 0; ii < listeners.length; ii++)
if (listeners[ii].interrupt)listeners[ii].interrupt(entry);
if (listeners[ii].interrupt) listeners[ii].interrupt(entry);
break;
case EventType.end:
if (entry.listener != null && entry.listener.end) entry.listener.end(entry);
@ -674,7 +674,7 @@ module spine {
if (listeners[ii].end) listeners[ii].end(entry);
// Fall through.
case EventType.dispose:
if (entry.listener != null && entry.listener.end) entry.listener.end(entry);
if (entry.listener != null && entry.listener.dispose) entry.listener.dispose(entry);
for (let ii = 0; ii < listeners.length; ii++)
if (listeners[ii].dispose) listeners[ii].dispose(entry);
this.animState.trackEntryPool.free(entry);

View File

@ -100,12 +100,9 @@ var skinsDemo = function(loadingComplete, bgColor) {
state.addAnimation(0, "crouchIdle", true, 1.5);
state.addAnimation(0, "crouchWalk", true, 2);
state.addAnimation(0, "crouchIdle", true, 2.5).listener = {
event: function (trackIndex, event) {},
complete: function (trackIndex, loopCount) {},
start: function (trackIndex) {
setupAnimations(state);
},
end: function (trackIndex) {}
}
};
state.setAnimation(1, "empty", false, 0);

View File

@ -86,12 +86,9 @@ var transitionsDemo = function(loadingComplete, bgColor) {
state.addAnimation(0, "run", true, mix);
state.addAnimation(0, "jump", true, 0.5);
state.addAnimation(0, "run", true, mix).listener = {
event: function (trackIndex, event) {},
complete: function (trackIndex, loopCount) {},
start: function (trackIndex) {
setAnimations(state, mix);
},
end: function (trackIndex) {}
}
};
}