浏览代码

Go back to clearing the entry after the "end" listeners.

Changing the AnimationState state from an "end" listener is problematic even when the entry is cleared before the listener, so better to make the track that is ending available to the listener.
NathanSweet 11 年之前
父节点
当前提交
df70264a5b

+ 2 - 2
spine-as3/spine-as3/src/spine/animation/AnimationState.as

@@ -128,10 +128,10 @@ public class AnimationState {
 		var current:TrackEntry = _tracks[trackIndex];
 		var current:TrackEntry = _tracks[trackIndex];
 		if (!current) return;
 		if (!current) return;
 
 
-		_tracks[trackIndex] = null;
-
 		if (current.onEnd != null) current.onEnd(trackIndex);
 		if (current.onEnd != null) current.onEnd(trackIndex);
 		onEnd.invoke(trackIndex);
 		onEnd.invoke(trackIndex);
+
+		_tracks[trackIndex] = null;
 	}
 	}
 	
 	
 	private function expandToIndex (index:int) : TrackEntry {
 	private function expandToIndex (index:int) : TrackEntry {

+ 2 - 2
spine-c/src/spine/AnimationState.c

@@ -181,11 +181,11 @@ void spAnimationState_clearTrack (spAnimationState* self, int trackIndex) {
 	current = self->tracks[trackIndex];
 	current = self->tracks[trackIndex];
 	if (!current) return;
 	if (!current) return;
 
 
-	self->tracks[trackIndex] = 0;
-
 	if (current->listener) current->listener(self, trackIndex, ANIMATION_END, 0, 0);
 	if (current->listener) current->listener(self, trackIndex, ANIMATION_END, 0, 0);
 	if (self->listener) self->listener(self, trackIndex, ANIMATION_END, 0, 0);
 	if (self->listener) self->listener(self, trackIndex, ANIMATION_END, 0, 0);
 
 
+	self->tracks[trackIndex] = 0;
+
 	if (current->previous) _spTrackEntry_dispose(current->previous);
 	if (current->previous) _spTrackEntry_dispose(current->previous);
 	_spTrackEntry_disposeAll(current);
 	_spTrackEntry_disposeAll(current);
 }
 }

+ 2 - 2
spine-csharp/src/AnimationState.cs

@@ -141,10 +141,10 @@ namespace Spine {
 			TrackEntry current = tracks[trackIndex];
 			TrackEntry current = tracks[trackIndex];
 			if (current == null) return;
 			if (current == null) return;
 
 
-			tracks[trackIndex] = null;
-
 			current.OnEnd(this, trackIndex);
 			current.OnEnd(this, trackIndex);
 			if (End != null) End(this, trackIndex);
 			if (End != null) End(this, trackIndex);
+
+			tracks[trackIndex] = null;
 		}
 		}
 
 
 		private TrackEntry ExpandToIndex (int index) {
 		private TrackEntry ExpandToIndex (int index) {

+ 2 - 2
spine-js/spine.js

@@ -1041,10 +1041,10 @@ spine.AnimationState.prototype = {
 		var current = this.tracks[trackIndex];
 		var current = this.tracks[trackIndex];
 		if (!current) return;
 		if (!current) return;
 
 
-		this.tracks[trackIndex] = null;
-
 		if (current.onEnd != null) current.onEnd(trackIndex);
 		if (current.onEnd != null) current.onEnd(trackIndex);
 		if (this.onEnd != null) this.onEnd(trackIndex);
 		if (this.onEnd != null) this.onEnd(trackIndex);
+
+		this.tracks[trackIndex] = null;
 	},
 	},
 	_expandToIndex: function (index) {
 	_expandToIndex: function (index) {
 		if (index < this.tracks.length) return this.tracks[index];
 		if (index < this.tracks.length) return this.tracks[index];

+ 2 - 2
spine-libgdx/src/com/esotericsoftware/spine/AnimationState.java

@@ -140,12 +140,12 @@ public class AnimationState {
 		TrackEntry current = tracks.get(trackIndex);
 		TrackEntry current = tracks.get(trackIndex);
 		if (current == null) return;
 		if (current == null) return;
 
 
-		tracks.set(trackIndex, null);
-
 		if (current.listener != null) current.listener.end(trackIndex);
 		if (current.listener != null) current.listener.end(trackIndex);
 		for (int i = 0, n = listeners.size; i < n; i++)
 		for (int i = 0, n = listeners.size; i < n; i++)
 			listeners.get(i).end(trackIndex);
 			listeners.get(i).end(trackIndex);
 
 
+		tracks.set(trackIndex, null);
+
 		freeAll(current);
 		freeAll(current);
 		if (current.previous != null) trackEntryPool.free(current.previous);
 		if (current.previous != null) trackEntryPool.free(current.previous);
 	}
 	}

+ 3 - 3
spine-lua/AnimationState.lua

@@ -161,13 +161,13 @@ function AnimationState.new (data)
 		local current = self.tracks[trackIndex]
 		local current = self.tracks[trackIndex]
 		if not current then return end
 		if not current then return end
 
 
+		if current.onEnd then current.onEnd(trackIndex) end
+		if self.onEnd then self.onEnd(trackIndex) end
+
 		self.tracks[trackIndex] = nil
 		self.tracks[trackIndex] = nil
 		if trackIndex == self.trackCount - 1 then
 		if trackIndex == self.trackCount - 1 then
 			self.trackCount = self.trackCount - 1
 			self.trackCount = self.trackCount - 1
 		end
 		end
-
-		if current.onEnd then current.onEnd(trackIndex) end
-		if self.onEnd then self.onEnd(trackIndex) end
 	end
 	end
 
 
 	function self:setAnimationByName (trackIndex, animationName, loop)
 	function self:setAnimationByName (trackIndex, animationName, loop)