UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-10 17:18:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
badlogic 2018-01-12 11:06:22 +01:00
parent 4f4a4e8dce
commit ce124e381e
13 changed files with 55 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spine-ts/build/spine-all.js
View File

@ -1521,8 +1521,13 @@ var spine;
last.next = entry;
if (delay <= 0) {
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
delay = 0;
}

2
spine-ts/build/spine-all.js.map
View File

File diff suppressed because one or more lines are too long

9
spine-ts/build/spine-canvas.js
View File

@ -1521,8 +1521,13 @@ var spine;
last.next = entry;
if (delay <= 0) {
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
delay = 0;
}

2
spine-ts/build/spine-canvas.js.map
View File

File diff suppressed because one or more lines are too long

9
spine-ts/build/spine-core.js
View File

@ -1521,8 +1521,13 @@ var spine;
last.next = entry;
if (delay <= 0) {
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
delay = 0;
}

2
spine-ts/build/spine-core.js.map
View File

File diff suppressed because one or more lines are too long

9
spine-ts/build/spine-threejs.js
View File

@ -1521,8 +1521,13 @@ var spine;
last.next = entry;
if (delay <= 0) {
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
delay = 0;
}

2
spine-ts/build/spine-threejs.js.map
View File

File diff suppressed because one or more lines are too long

9
spine-ts/build/spine-webgl.js
View File

@ -1521,8 +1521,13 @@ var spine;
last.next = entry;
if (delay <= 0) {
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
delay = 0;
}

2
spine-ts/build/spine-webgl.js.map
View File

File diff suppressed because one or more lines are too long

9
spine-ts/build/spine-widget.js
View File

@ -1521,8 +1521,13 @@ var spine;
last.next = entry;
if (delay <= 0) {
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
delay = 0;
}

2
spine-ts/build/spine-widget.js.map
View File

File diff suppressed because one or more lines are too long

10
spine-ts/core/src/AnimationState.ts
View File

@ -453,9 +453,13 @@ module spine {
last.next = entry;
if (delay <= 0) {
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;
}
}