Prechádzať zdrojové kódy

[ts] Fixes #1064, delay was calculated incorrectly for non-loop previous track entries.

badlogic 7 rokov pred
rodič
commit
ce124e381e

+ 7 - 2
spine-ts/build/spine-all.js

@@ -1521,8 +1521,13 @@ var spine;
 				last.next = entry;
 				last.next = entry;
 				if (delay <= 0) {
 				if (delay <= 0) {
 					var duration = last.animationEnd - last.animationStart;
 					var duration = last.animationEnd - last.animationStart;
-					if (duration != 0)
-						delay += duration * (1 + ((last.trackTime / duration) | 0)) - this.data.getMix(last.animation, animation);
+					if (duration != 0) {
+						if (last.loop)
+							delay += duration * (1 + ((last.trackTime / duration) | 0));
+						else
+							delay += duration;
+						delay -= this.data.getMix(last.animation, animation);
+					}
 					else
 					else
 						delay = 0;
 						delay = 0;
 				}
 				}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
spine-ts/build/spine-all.js.map


+ 7 - 2
spine-ts/build/spine-canvas.js

@@ -1521,8 +1521,13 @@ var spine;
 				last.next = entry;
 				last.next = entry;
 				if (delay <= 0) {
 				if (delay <= 0) {
 					var duration = last.animationEnd - last.animationStart;
 					var duration = last.animationEnd - last.animationStart;
-					if (duration != 0)
-						delay += duration * (1 + ((last.trackTime / duration) | 0)) - this.data.getMix(last.animation, animation);
+					if (duration != 0) {
+						if (last.loop)
+							delay += duration * (1 + ((last.trackTime / duration) | 0));
+						else
+							delay += duration;
+						delay -= this.data.getMix(last.animation, animation);
+					}
 					else
 					else
 						delay = 0;
 						delay = 0;
 				}
 				}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
spine-ts/build/spine-canvas.js.map


+ 7 - 2
spine-ts/build/spine-core.js

@@ -1521,8 +1521,13 @@ var spine;
 				last.next = entry;
 				last.next = entry;
 				if (delay <= 0) {
 				if (delay <= 0) {
 					var duration = last.animationEnd - last.animationStart;
 					var duration = last.animationEnd - last.animationStart;
-					if (duration != 0)
-						delay += duration * (1 + ((last.trackTime / duration) | 0)) - this.data.getMix(last.animation, animation);
+					if (duration != 0) {
+						if (last.loop)
+							delay += duration * (1 + ((last.trackTime / duration) | 0));
+						else
+							delay += duration;
+						delay -= this.data.getMix(last.animation, animation);
+					}
 					else
 					else
 						delay = 0;
 						delay = 0;
 				}
 				}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
spine-ts/build/spine-core.js.map


+ 7 - 2
spine-ts/build/spine-threejs.js

@@ -1521,8 +1521,13 @@ var spine;
 				last.next = entry;
 				last.next = entry;
 				if (delay <= 0) {
 				if (delay <= 0) {
 					var duration = last.animationEnd - last.animationStart;
 					var duration = last.animationEnd - last.animationStart;
-					if (duration != 0)
-						delay += duration * (1 + ((last.trackTime / duration) | 0)) - this.data.getMix(last.animation, animation);
+					if (duration != 0) {
+						if (last.loop)
+							delay += duration * (1 + ((last.trackTime / duration) | 0));
+						else
+							delay += duration;
+						delay -= this.data.getMix(last.animation, animation);
+					}
 					else
 					else
 						delay = 0;
 						delay = 0;
 				}
 				}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
spine-ts/build/spine-threejs.js.map


+ 7 - 2
spine-ts/build/spine-webgl.js

@@ -1521,8 +1521,13 @@ var spine;
 				last.next = entry;
 				last.next = entry;
 				if (delay <= 0) {
 				if (delay <= 0) {
 					var duration = last.animationEnd - last.animationStart;
 					var duration = last.animationEnd - last.animationStart;
-					if (duration != 0)
-						delay += duration * (1 + ((last.trackTime / duration) | 0)) - this.data.getMix(last.animation, animation);
+					if (duration != 0) {
+						if (last.loop)
+							delay += duration * (1 + ((last.trackTime / duration) | 0));
+						else
+							delay += duration;
+						delay -= this.data.getMix(last.animation, animation);
+					}
 					else
 					else
 						delay = 0;
 						delay = 0;
 				}
 				}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
spine-ts/build/spine-webgl.js.map


+ 7 - 2
spine-ts/build/spine-widget.js

@@ -1521,8 +1521,13 @@ var spine;
 				last.next = entry;
 				last.next = entry;
 				if (delay <= 0) {
 				if (delay <= 0) {
 					var duration = last.animationEnd - last.animationStart;
 					var duration = last.animationEnd - last.animationStart;
-					if (duration != 0)
-						delay += duration * (1 + ((last.trackTime / duration) | 0)) - this.data.getMix(last.animation, animation);
+					if (duration != 0) {
+						if (last.loop)
+							delay += duration * (1 + ((last.trackTime / duration) | 0));
+						else
+							delay += duration;
+						delay -= this.data.getMix(last.animation, animation);
+					}
 					else
 					else
 						delay = 0;
 						delay = 0;
 				}
 				}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
spine-ts/build/spine-widget.js.map


+ 7 - 3
spine-ts/core/src/AnimationState.ts

@@ -453,9 +453,13 @@ module spine {
 				last.next = entry;
 				last.next = entry;
 				if (delay <= 0) {
 				if (delay <= 0) {
 					let duration = last.animationEnd - last.animationStart;
 					let duration = last.animationEnd - last.animationStart;
-					if (duration != 0)
-						delay += duration * (1 + ((last.trackTime / duration) | 0)) - this.data.getMix(last.animation, animation);
-					else
+					if (duration != 0) {
+						if (last.loop)
+							delay += duration * (1 + ((last.trackTime / duration) | 0));
+						else
+							delay += duration;
+						delay -= this.data.getMix(last.animation, animation);
+					} else
 						delay = 0;
 						delay = 0;
 				}
 				}
 			}
 			}

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov