[ts] Ported AnimationState changes

spine-cocos2dx/example/Classes/SpineboyExample.cpp

@@ -64,8 +64,8 @@ bool SpineboyExample::init () {
 		log("%d event: %s, %d, %f, %s", entry->trackIndex, event->data->name, event->intValue, event->floatValue, event->stringValue);
 	});
 
-	skeletonNode->setMix("walk", "jump", 0.2f);
-	skeletonNode->setMix("jump", "run", 0.2f);
+	skeletonNode->setMix("walk", "jump", 0.4);
+	skeletonNode->setMix("jump", "run", 0.4);
 	skeletonNode->setAnimation(0, "walk", true);
 	spTrackEntry* jumpEntry = skeletonNode->addAnimation(0, "jump", false, 3);
 	skeletonNode->addAnimation(0, "run", true);

spine-ts/build/spine-all.d.ts

@@ -302,7 +302,7 @@ declare module spine {
 		trackEntryPool: Pool<TrackEntry>;
 		constructor(data: AnimationStateData);
 		update(delta: number): void;
-		updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
+		updateMixingFrom(entry: TrackEntry, delta: number): void;
 		apply(skeleton: Skeleton): void;
 		applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
 		applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;

spine-ts/build/spine-all.js

@@ -1330,10 +1330,8 @@ var spine;
 						}
 						continue;
 					}
-					this.updateMixingFrom(current, delta, true);
 				}
 				else {
-					this.updateMixingFrom(current, delta, true);
 					if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
 						tracks[i] = null;
 						this.queue.end(current);
@@ -1341,30 +1339,25 @@ var spine;
 						continue;
 					}
 				}
+				this.updateMixingFrom(current, delta);
 				current.trackTime += currentDelta;
 			}
 			this.queue.drain();
 		};
-		AnimationState.prototype.updateMixingFrom = function (entry, delta, canEnd) {
+		AnimationState.prototype.updateMixingFrom = function (entry, delta) {
 			var from = entry.mixingFrom;
 			if (from == null)
 				return;
-			if (canEnd && entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
+			this.updateMixingFrom(from, delta);
+			if (entry.mixTime >= entry.mixDuration && from.mixingFrom != null && entry.mixTime > 0) {
+				entry.mixingFrom = null;
 				this.queue.end(from);
-				var newFrom = from.mixingFrom;
-				entry.mixingFrom = newFrom;
-				if (newFrom == null)
-					return;
-				entry.mixTime = from.mixTime;
-				entry.mixDuration = from.mixDuration;
-				from = newFrom;
+				return;
 			}
 			from.animationLast = from.nextAnimationLast;
 			from.trackLast = from.nextTrackLast;
-			var mixingFromDelta = delta * from.timeScale;
-			from.trackTime += mixingFromDelta;
-			entry.mixTime += mixingFromDelta;
-			this.updateMixingFrom(from, delta, canEnd && from.alpha == 1);
+			from.trackTime += delta * from.timeScale;
+			entry.mixTime += delta * from.timeScale;
 		};
 		AnimationState.prototype.apply = function (skeleton) {
 			if (skeleton == null)
@@ -1380,6 +1373,8 @@ var spine;
 				var mix = current.alpha;
 				if (current.mixingFrom != null)
 					mix *= this.applyMixingFrom(current, skeleton);
+				else if (current.trackTime >= current.trackEnd)
+					mix = 0;
 				var animationLast = current.animationLast, animationTime = current.getAnimationTime();
 				var timelineCount = current.animation.timelines.length;
 				var timelines = current.animation.timelines;
@@ -1591,11 +1586,11 @@ var spine;
 			var current = this.expandToIndex(trackIndex);
 			if (current != null) {
 				if (current.nextTrackLast == -1) {
-					this.tracks[trackIndex] = null;
+					this.tracks[trackIndex] = current.mixingFrom;
 					this.queue.interrupt(current);
 					this.queue.end(current);
 					this.disposeNext(current);
-					current = null;
+					current = current.mixingFrom;
 				}
 				else
 					this.disposeNext(current);

spine-ts/build/spine-canvas.d.ts

@@ -302,7 +302,7 @@ declare module spine {
 		trackEntryPool: Pool<TrackEntry>;
 		constructor(data: AnimationStateData);
 		update(delta: number): void;
-		updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
+		updateMixingFrom(entry: TrackEntry, delta: number): void;
 		apply(skeleton: Skeleton): void;
 		applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
 		applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;

spine-ts/build/spine-canvas.js

@@ -1330,10 +1330,8 @@ var spine;
 						}
 						continue;
 					}
-					this.updateMixingFrom(current, delta, true);
 				}
 				else {
-					this.updateMixingFrom(current, delta, true);
 					if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
 						tracks[i] = null;
 						this.queue.end(current);
@@ -1341,30 +1339,25 @@ var spine;
 						continue;
 					}
 				}
+				this.updateMixingFrom(current, delta);
 				current.trackTime += currentDelta;
 			}
 			this.queue.drain();
 		};
-		AnimationState.prototype.updateMixingFrom = function (entry, delta, canEnd) {
+		AnimationState.prototype.updateMixingFrom = function (entry, delta) {
 			var from = entry.mixingFrom;
 			if (from == null)
 				return;
-			if (canEnd && entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
+			this.updateMixingFrom(from, delta);
+			if (entry.mixTime >= entry.mixDuration && from.mixingFrom != null && entry.mixTime > 0) {
+				entry.mixingFrom = null;
 				this.queue.end(from);
-				var newFrom = from.mixingFrom;
-				entry.mixingFrom = newFrom;
-				if (newFrom == null)
-					return;
-				entry.mixTime = from.mixTime;
-				entry.mixDuration = from.mixDuration;
-				from = newFrom;
+				return;
 			}
 			from.animationLast = from.nextAnimationLast;
 			from.trackLast = from.nextTrackLast;
-			var mixingFromDelta = delta * from.timeScale;
-			from.trackTime += mixingFromDelta;
-			entry.mixTime += mixingFromDelta;
-			this.updateMixingFrom(from, delta, canEnd && from.alpha == 1);
+			from.trackTime += delta * from.timeScale;
+			entry.mixTime += delta * from.timeScale;
 		};
 		AnimationState.prototype.apply = function (skeleton) {
 			if (skeleton == null)
@@ -1380,6 +1373,8 @@ var spine;
 				var mix = current.alpha;
 				if (current.mixingFrom != null)
 					mix *= this.applyMixingFrom(current, skeleton);
+				else if (current.trackTime >= current.trackEnd)
+					mix = 0;
 				var animationLast = current.animationLast, animationTime = current.getAnimationTime();
 				var timelineCount = current.animation.timelines.length;
 				var timelines = current.animation.timelines;
@@ -1591,11 +1586,11 @@ var spine;
 			var current = this.expandToIndex(trackIndex);
 			if (current != null) {
 				if (current.nextTrackLast == -1) {
-					this.tracks[trackIndex] = null;
+					this.tracks[trackIndex] = current.mixingFrom;
 					this.queue.interrupt(current);
 					this.queue.end(current);
 					this.disposeNext(current);
-					current = null;
+					current = current.mixingFrom;
 				}
 				else
 					this.disposeNext(current);

spine-ts/build/spine-core.d.ts

@@ -214,7 +214,7 @@ declare module spine {
 		trackEntryPool: Pool<TrackEntry>;
 		constructor(data: AnimationStateData);
 		update(delta: number): void;
-		updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
+		updateMixingFrom(entry: TrackEntry, delta: number): void;
 		apply(skeleton: Skeleton): void;
 		applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
 		applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;

spine-ts/build/spine-core.js

@@ -983,10 +983,8 @@ var spine;
 						}
 						continue;
 					}
-					this.updateMixingFrom(current, delta, true);
 				}
 				else {
-					this.updateMixingFrom(current, delta, true);
 					if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
 						tracks[i] = null;
 						this.queue.end(current);
@@ -994,30 +992,25 @@ var spine;
 						continue;
 					}
 				}
+				this.updateMixingFrom(current, delta);
 				current.trackTime += currentDelta;
 			}
 			this.queue.drain();
 		};
-		AnimationState.prototype.updateMixingFrom = function (entry, delta, canEnd) {
+		AnimationState.prototype.updateMixingFrom = function (entry, delta) {
 			var from = entry.mixingFrom;
 			if (from == null)
 				return;
-			if (canEnd && entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
+			this.updateMixingFrom(from, delta);
+			if (entry.mixTime >= entry.mixDuration && from.mixingFrom != null && entry.mixTime > 0) {
+				entry.mixingFrom = null;
 				this.queue.end(from);
-				var newFrom = from.mixingFrom;
-				entry.mixingFrom = newFrom;
-				if (newFrom == null)
-					return;
-				entry.mixTime = from.mixTime;
-				entry.mixDuration = from.mixDuration;
-				from = newFrom;
+				return;
 			}
 			from.animationLast = from.nextAnimationLast;
 			from.trackLast = from.nextTrackLast;
-			var mixingFromDelta = delta * from.timeScale;
-			from.trackTime += mixingFromDelta;
-			entry.mixTime += mixingFromDelta;
-			this.updateMixingFrom(from, delta, canEnd && from.alpha == 1);
+			from.trackTime += delta * from.timeScale;
+			entry.mixTime += delta * from.timeScale;
 		};
 		AnimationState.prototype.apply = function (skeleton) {
 			if (skeleton == null)
@@ -1033,6 +1026,8 @@ var spine;
 				var mix = current.alpha;
 				if (current.mixingFrom != null)
 					mix *= this.applyMixingFrom(current, skeleton);
+				else if (current.trackTime >= current.trackEnd)
+					mix = 0;
 				var animationLast = current.animationLast, animationTime = current.getAnimationTime();
 				var timelineCount = current.animation.timelines.length;
 				var timelines = current.animation.timelines;
@@ -1244,11 +1239,11 @@ var spine;
 			var current = this.expandToIndex(trackIndex);
 			if (current != null) {
 				if (current.nextTrackLast == -1) {
-					this.tracks[trackIndex] = null;
+					this.tracks[trackIndex] = current.mixingFrom;
 					this.queue.interrupt(current);
 					this.queue.end(current);
 					this.disposeNext(current);
-					current = null;
+					current = current.mixingFrom;
 				}
 				else
 					this.disposeNext(current);

spine-ts/build/spine-threejs.d.ts

@@ -214,7 +214,7 @@ declare module spine {
 		trackEntryPool: Pool<TrackEntry>;
 		constructor(data: AnimationStateData);
 		update(delta: number): void;
-		updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
+		updateMixingFrom(entry: TrackEntry, delta: number): void;
 		apply(skeleton: Skeleton): void;
 		applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
 		applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;

spine-ts/build/spine-threejs.js

@@ -983,10 +983,8 @@ var spine;
 						}
 						continue;
 					}
-					this.updateMixingFrom(current, delta, true);
 				}
 				else {
-					this.updateMixingFrom(current, delta, true);
 					if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
 						tracks[i] = null;
 						this.queue.end(current);
@@ -994,30 +992,25 @@ var spine;
 						continue;
 					}
 				}
+				this.updateMixingFrom(current, delta);
 				current.trackTime += currentDelta;
 			}
 			this.queue.drain();
 		};
-		AnimationState.prototype.updateMixingFrom = function (entry, delta, canEnd) {
+		AnimationState.prototype.updateMixingFrom = function (entry, delta) {
 			var from = entry.mixingFrom;
 			if (from == null)
 				return;
-			if (canEnd && entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
+			this.updateMixingFrom(from, delta);
+			if (entry.mixTime >= entry.mixDuration && from.mixingFrom != null && entry.mixTime > 0) {
+				entry.mixingFrom = null;
 				this.queue.end(from);
-				var newFrom = from.mixingFrom;
-				entry.mixingFrom = newFrom;
-				if (newFrom == null)
-					return;
-				entry.mixTime = from.mixTime;
-				entry.mixDuration = from.mixDuration;
-				from = newFrom;
+				return;
 			}
 			from.animationLast = from.nextAnimationLast;
 			from.trackLast = from.nextTrackLast;
-			var mixingFromDelta = delta * from.timeScale;
-			from.trackTime += mixingFromDelta;
-			entry.mixTime += mixingFromDelta;
-			this.updateMixingFrom(from, delta, canEnd && from.alpha == 1);
+			from.trackTime += delta * from.timeScale;
+			entry.mixTime += delta * from.timeScale;
 		};
 		AnimationState.prototype.apply = function (skeleton) {
 			if (skeleton == null)
@@ -1033,6 +1026,8 @@ var spine;
 				var mix = current.alpha;
 				if (current.mixingFrom != null)
 					mix *= this.applyMixingFrom(current, skeleton);
+				else if (current.trackTime >= current.trackEnd)
+					mix = 0;
 				var animationLast = current.animationLast, animationTime = current.getAnimationTime();
 				var timelineCount = current.animation.timelines.length;
 				var timelines = current.animation.timelines;
@@ -1244,11 +1239,11 @@ var spine;
 			var current = this.expandToIndex(trackIndex);
 			if (current != null) {
 				if (current.nextTrackLast == -1) {
-					this.tracks[trackIndex] = null;
+					this.tracks[trackIndex] = current.mixingFrom;
 					this.queue.interrupt(current);
 					this.queue.end(current);
 					this.disposeNext(current);
-					current = null;
+					current = current.mixingFrom;
 				}
 				else
 					this.disposeNext(current);

spine-ts/build/spine-webgl.d.ts

@@ -214,7 +214,7 @@ declare module spine {
 		trackEntryPool: Pool<TrackEntry>;
 		constructor(data: AnimationStateData);
 		update(delta: number): void;
-		updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
+		updateMixingFrom(entry: TrackEntry, delta: number): void;
 		apply(skeleton: Skeleton): void;
 		applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
 		applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;

spine-ts/build/spine-webgl.js

@@ -983,10 +983,8 @@ var spine;
 						}
 						continue;
 					}
-					this.updateMixingFrom(current, delta, true);
 				}
 				else {
-					this.updateMixingFrom(current, delta, true);
 					if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
 						tracks[i] = null;
 						this.queue.end(current);
@@ -994,30 +992,25 @@ var spine;
 						continue;
 					}
 				}
+				this.updateMixingFrom(current, delta);
 				current.trackTime += currentDelta;
 			}
 			this.queue.drain();
 		};
-		AnimationState.prototype.updateMixingFrom = function (entry, delta, canEnd) {
+		AnimationState.prototype.updateMixingFrom = function (entry, delta) {
 			var from = entry.mixingFrom;
 			if (from == null)
 				return;
-			if (canEnd && entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
+			this.updateMixingFrom(from, delta);
+			if (entry.mixTime >= entry.mixDuration && from.mixingFrom != null && entry.mixTime > 0) {
+				entry.mixingFrom = null;
 				this.queue.end(from);
-				var newFrom = from.mixingFrom;
-				entry.mixingFrom = newFrom;
-				if (newFrom == null)
-					return;
-				entry.mixTime = from.mixTime;
-				entry.mixDuration = from.mixDuration;
-				from = newFrom;
+				return;
 			}
 			from.animationLast = from.nextAnimationLast;
 			from.trackLast = from.nextTrackLast;
-			var mixingFromDelta = delta * from.timeScale;
-			from.trackTime += mixingFromDelta;
-			entry.mixTime += mixingFromDelta;
-			this.updateMixingFrom(from, delta, canEnd && from.alpha == 1);
+			from.trackTime += delta * from.timeScale;
+			entry.mixTime += delta * from.timeScale;
 		};
 		AnimationState.prototype.apply = function (skeleton) {
 			if (skeleton == null)
@@ -1033,6 +1026,8 @@ var spine;
 				var mix = current.alpha;
 				if (current.mixingFrom != null)
 					mix *= this.applyMixingFrom(current, skeleton);
+				else if (current.trackTime >= current.trackEnd)
+					mix = 0;
 				var animationLast = current.animationLast, animationTime = current.getAnimationTime();
 				var timelineCount = current.animation.timelines.length;
 				var timelines = current.animation.timelines;
@@ -1244,11 +1239,11 @@ var spine;
 			var current = this.expandToIndex(trackIndex);
 			if (current != null) {
 				if (current.nextTrackLast == -1) {
-					this.tracks[trackIndex] = null;
+					this.tracks[trackIndex] = current.mixingFrom;
 					this.queue.interrupt(current);
 					this.queue.end(current);
 					this.disposeNext(current);
-					current = null;
+					current = current.mixingFrom;
 				}
 				else
 					this.disposeNext(current);

spine-ts/build/spine-widget.d.ts

@@ -214,7 +214,7 @@ declare module spine {
 		trackEntryPool: Pool<TrackEntry>;
 		constructor(data: AnimationStateData);
 		update(delta: number): void;
-		updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
+		updateMixingFrom(entry: TrackEntry, delta: number): void;
 		apply(skeleton: Skeleton): void;
 		applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
 		applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;

spine-ts/build/spine-widget.js

@@ -983,10 +983,8 @@ var spine;
 						}
 						continue;
 					}
-					this.updateMixingFrom(current, delta, true);
 				}
 				else {
-					this.updateMixingFrom(current, delta, true);
 					if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
 						tracks[i] = null;
 						this.queue.end(current);
@@ -994,30 +992,25 @@ var spine;
 						continue;
 					}
 				}
+				this.updateMixingFrom(current, delta);
 				current.trackTime += currentDelta;
 			}
 			this.queue.drain();
 		};
-		AnimationState.prototype.updateMixingFrom = function (entry, delta, canEnd) {
+		AnimationState.prototype.updateMixingFrom = function (entry, delta) {
 			var from = entry.mixingFrom;
 			if (from == null)
 				return;
-			if (canEnd && entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
+			this.updateMixingFrom(from, delta);
+			if (entry.mixTime >= entry.mixDuration && from.mixingFrom != null && entry.mixTime > 0) {
+				entry.mixingFrom = null;
 				this.queue.end(from);
-				var newFrom = from.mixingFrom;
-				entry.mixingFrom = newFrom;
-				if (newFrom == null)
-					return;
-				entry.mixTime = from.mixTime;
-				entry.mixDuration = from.mixDuration;
-				from = newFrom;
+				return;
 			}
 			from.animationLast = from.nextAnimationLast;
 			from.trackLast = from.nextTrackLast;
-			var mixingFromDelta = delta * from.timeScale;
-			from.trackTime += mixingFromDelta;
-			entry.mixTime += mixingFromDelta;
-			this.updateMixingFrom(from, delta, canEnd && from.alpha == 1);
+			from.trackTime += delta * from.timeScale;
+			entry.mixTime += delta * from.timeScale;
 		};
 		AnimationState.prototype.apply = function (skeleton) {
 			if (skeleton == null)
@@ -1033,6 +1026,8 @@ var spine;
 				var mix = current.alpha;
 				if (current.mixingFrom != null)
 					mix *= this.applyMixingFrom(current, skeleton);
+				else if (current.trackTime >= current.trackEnd)
+					mix = 0;
 				var animationLast = current.animationLast, animationTime = current.getAnimationTime();
 				var timelineCount = current.animation.timelines.length;
 				var timelines = current.animation.timelines;
@@ -1244,11 +1239,11 @@ var spine;
 			var current = this.expandToIndex(trackIndex);
 			if (current != null) {
 				if (current.nextTrackLast == -1) {
-					this.tracks[trackIndex] = null;
+					this.tracks[trackIndex] = current.mixingFrom;
 					this.queue.interrupt(current);
 					this.queue.end(current);
 					this.disposeNext(current);
-					current = null;
+					current = current.mixingFrom;
 				}
 				else
 					this.disposeNext(current);

spine-ts/core/src/AnimationState.ts

@@ -80,10 +80,8 @@ module spine {
 							next = next.mixingFrom;
 						}
 						continue;
-					}
-					this.updateMixingFrom(current, delta, true);
-				} else {
-					this.updateMixingFrom(current, delta, true);
+					}					
+				} else {					
 					// Clear the track when there is no next entry, the track end time is reached, and there is no mixingFrom.
 					if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
 						tracks[i] = null;
@@ -92,6 +90,7 @@ module spine {
 						continue;
 					}
 				}
+				this.updateMixingFrom(current, delta);
 
 				current.trackTime += currentDelta;
 			}
@@ -99,27 +98,22 @@ module spine {
 			this.queue.drain();
 		}
 
-		updateMixingFrom (entry: TrackEntry, delta: number, canEnd: boolean) {
+		updateMixingFrom (entry: TrackEntry, delta: number) {
 			let from = entry.mixingFrom;
 			if (from == null) return;
 
-			if (canEnd && entry.mixTime >= entry.mixDuration && entry.mixTime > 0) {
+			this.updateMixingFrom(from, delta);
+
+			if (entry.mixTime >= entry.mixDuration && from.mixingFrom != null && entry.mixTime > 0) {
+				entry.mixingFrom = null;
 				this.queue.end(from);
-				let newFrom = from.mixingFrom;
-				entry.mixingFrom = newFrom;
-				if (newFrom == null) return;
-				entry.mixTime = from.mixTime;
-				entry.mixDuration = from.mixDuration;
-				from = newFrom;
+				return;
 			}
 
 			from.animationLast = from.nextAnimationLast;
-			from.trackLast = from.nextTrackLast;
-			let mixingFromDelta = delta * from.timeScale;
-			from.trackTime += mixingFromDelta;
-			entry.mixTime += mixingFromDelta;
-
-			this.updateMixingFrom(from, delta, canEnd && from.alpha == 1);
+			from.trackLast = from.nextTrackLast;			
+			from.trackTime += delta * from.timeScale;
+			entry.mixTime += delta * from.timeScale;			
 		}
 
 		apply (skeleton: Skeleton) {
@@ -135,7 +129,10 @@ module spine {
 
 				// Apply mixing from entries first.
 				let mix = current.alpha;
-				if (current.mixingFrom != null) mix *= this.applyMixingFrom(current, skeleton);
+				if (current.mixingFrom != null) 
+					mix *= this.applyMixingFrom(current, skeleton);
+				else if (current.trackTime >= current.trackEnd)
+					mix = 0;
 
 				// Apply current entry.
 				let animationLast = current.animationLast, animationTime = current.getAnimationTime();
@@ -369,11 +366,11 @@ module spine {
 			if (current != null) {
 				if (current.nextTrackLast == -1) {
 					// Don't mix from an entry that was never applied.
-					this.tracks[trackIndex] = null;
+					this.tracks[trackIndex] = current.mixingFrom;
 					this.queue.interrupt(current);
 					this.queue.end(current);
 					this.disposeNext(current);
-					current = null;
+					current = current.mixingFrom;
 				} else
 					this.disposeNext(current);
 			}

spine-ts/webgl/example/index.html

@@ -116,8 +116,17 @@ function loadSkeleton (name, initialAnimation, premultipliedAlpha, skin) {
 	var bounds = calculateBounds(skeleton);
 
 	// Create an AnimationState, and set the initial animation in looping mode.
-	var animationState = new spine.AnimationState(new spine.AnimationStateData(skeleton.data));
-	animationState.setAnimation(0, initialAnimation, true);
+	animationStateData = new spine.AnimationStateData(skeleton.data);
+	var animationState = new spine.AnimationState(animationStateData);
+	if (name == "spineboy") {
+		animationStateData.setMix("walk", "jump", 0.4)		
+		animationStateData.setMix("jump", "run", 0.4);
+		animationState.setAnimation(0, "walk", true);
+		var jumpEntry = animationState.addAnimation(0, "jump", false, 3);
+		animationState.addAnimation(0, "run", true);
+	} else {
+		animationState.setAnimation(0, initialAnimation, true);
+	}
 	animationState.addListener({
 		start: function(track) {
 			console.log("Animation on track " + track.trackIndex + " started");