[ts] Ported 0 timeScale fix, see #1194.

EsotericSoftware · Oct 15, 2018 · 0161fe5 · 0161fe5
1 parent e11e0d4
commit 0161fe5
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 13 deletions.
diff --git a/spine-ts/build/spine-all.js b/spine-ts/build/spine-all.js
diff --git a/spine-ts/build/spine-all.js.map b/spine-ts/build/spine-all.js.map
diff --git a/spine-ts/build/spine-canvas.js b/spine-ts/build/spine-canvas.js
diff --git a/spine-ts/build/spine-canvas.js.map b/spine-ts/build/spine-canvas.js.map
diff --git a/spine-ts/build/spine-core.js b/spine-ts/build/spine-core.js
diff --git a/spine-ts/build/spine-core.js.map b/spine-ts/build/spine-core.js.map
diff --git a/spine-ts/build/spine-threejs.js b/spine-ts/build/spine-threejs.js
diff --git a/spine-ts/build/spine-threejs.js.map b/spine-ts/build/spine-threejs.js.map
diff --git a/spine-ts/build/spine-webgl.js b/spine-ts/build/spine-webgl.js
diff --git a/spine-ts/build/spine-webgl.js.map b/spine-ts/build/spine-webgl.js.map
diff --git a/spine-ts/build/spine-widget.js b/spine-ts/build/spine-widget.js
diff --git a/spine-ts/build/spine-widget.js.map b/spine-ts/build/spine-widget.js.map
diff --git a/spine-ts/core/src/AnimationState.ts b/spine-ts/core/src/AnimationState.ts
@@ -118,7 +118,7 @@ module spine {
 			from.trackLast = from.nextTrackLast;
 
 			// Require mixTime > 0 to ensure the mixing from entry was applied at least once.
-			if (to.mixTime > 0 && (to.mixTime >= to.mixDuration || to.timeScale == 0)) {
+			if (to.mixTime > 0 && to.mixTime >= to.mixDuration) {
 				// Require totalAlpha == 0 to ensure mixing is complete, unless mixDuration == 0 (the transition is a single frame).
 				if (from.totalAlpha == 0 || to.mixDuration == 0) {
 					to.mixingFrom = from.mixingFrom;
@@ -129,6 +129,12 @@ module spine {
 				return finished;
 			}
 
+			if (to.timeScale == 0 && to.mixingTo != null) {
+				to.timeScale = 1;
+				to.mixTime = 0;
+				to.mixDuration = 0;
+			}
+
 			from.trackTime += delta * from.timeScale;
 			to.mixTime += delta * to.timeScale;
 			return false;