فهرست منبع

[ts] Port fix to AnimationState, see #1092

badlogic 7 سال پیش
والد
کامیت
7f481cd633

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

@@ -1654,11 +1654,11 @@ var spine;
 						if (last.loop)
 						if (last.loop)
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 						else
 						else
-							delay += duration;
+							delay += Math.max(duration, last.trackTime);
 						delay -= this.data.getMix(last.animation, animation);
 						delay -= this.data.getMix(last.animation, animation);
 					}
 					}
 					else
 					else
-						delay = 0;
+						delay = last.trackTime;
 				}
 				}
 			}
 			}
 			entry.delay = delay;
 			entry.delay = delay;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
spine-ts/build/spine-all.js.map


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

@@ -1654,11 +1654,11 @@ var spine;
 						if (last.loop)
 						if (last.loop)
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 						else
 						else
-							delay += duration;
+							delay += Math.max(duration, last.trackTime);
 						delay -= this.data.getMix(last.animation, animation);
 						delay -= this.data.getMix(last.animation, animation);
 					}
 					}
 					else
 					else
-						delay = 0;
+						delay = last.trackTime;
 				}
 				}
 			}
 			}
 			entry.delay = delay;
 			entry.delay = delay;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
spine-ts/build/spine-canvas.js.map


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

@@ -1654,11 +1654,11 @@ var spine;
 						if (last.loop)
 						if (last.loop)
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 						else
 						else
-							delay += duration;
+							delay += Math.max(duration, last.trackTime);
 						delay -= this.data.getMix(last.animation, animation);
 						delay -= this.data.getMix(last.animation, animation);
 					}
 					}
 					else
 					else
-						delay = 0;
+						delay = last.trackTime;
 				}
 				}
 			}
 			}
 			entry.delay = delay;
 			entry.delay = delay;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
spine-ts/build/spine-core.js.map


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

@@ -1654,11 +1654,11 @@ var spine;
 						if (last.loop)
 						if (last.loop)
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 						else
 						else
-							delay += duration;
+							delay += Math.max(duration, last.trackTime);
 						delay -= this.data.getMix(last.animation, animation);
 						delay -= this.data.getMix(last.animation, animation);
 					}
 					}
 					else
 					else
-						delay = 0;
+						delay = last.trackTime;
 				}
 				}
 			}
 			}
 			entry.delay = delay;
 			entry.delay = delay;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
spine-ts/build/spine-threejs.js.map


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

@@ -1654,11 +1654,11 @@ var spine;
 						if (last.loop)
 						if (last.loop)
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 						else
 						else
-							delay += duration;
+							delay += Math.max(duration, last.trackTime);
 						delay -= this.data.getMix(last.animation, animation);
 						delay -= this.data.getMix(last.animation, animation);
 					}
 					}
 					else
 					else
-						delay = 0;
+						delay = last.trackTime;
 				}
 				}
 			}
 			}
 			entry.delay = delay;
 			entry.delay = delay;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
spine-ts/build/spine-webgl.js.map


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

@@ -1654,11 +1654,11 @@ var spine;
 						if (last.loop)
 						if (last.loop)
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 						else
 						else
-							delay += duration;
+							delay += Math.max(duration, last.trackTime);
 						delay -= this.data.getMix(last.animation, animation);
 						delay -= this.data.getMix(last.animation, animation);
 					}
 					}
 					else
 					else
-						delay = 0;
+						delay = last.trackTime;
 				}
 				}
 			}
 			}
 			entry.delay = delay;
 			entry.delay = delay;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
spine-ts/build/spine-widget.js.map


+ 2 - 2
spine-ts/core/src/AnimationState.ts

@@ -463,10 +463,10 @@ module spine {
 						if (last.loop)
 						if (last.loop)
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 							delay += duration * (1 + ((last.trackTime / duration) | 0));
 						else
 						else
-							delay += duration;
+							delay += Math.max(duration, last.trackTime);
 						delay -= this.data.getMix(last.animation, animation);
 						delay -= this.data.getMix(last.animation, animation);
 					} else
 					} else
-						delay = 0;
+						delay = last.trackTime;
 				}
 				}
 			}
 			}
 
 

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است