mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-06 23:34:53 +08:00
[ts] Apply left over time additively to track time of delayed TrackEntry. See #1504.
This commit is contained in:
parent
ce86f669f5
commit
9313d010ec
@ -1371,7 +1371,7 @@ var spine;
|
||||
var nextTime = current.trackLast - next.delay;
|
||||
if (nextTime >= 0) {
|
||||
next.delay = 0;
|
||||
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
current.trackTime += currentDelta;
|
||||
this.setCurrent(i, next, true);
|
||||
while (next.mixingFrom != null) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1371,7 +1371,7 @@ var spine;
|
||||
var nextTime = current.trackLast - next.delay;
|
||||
if (nextTime >= 0) {
|
||||
next.delay = 0;
|
||||
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
current.trackTime += currentDelta;
|
||||
this.setCurrent(i, next, true);
|
||||
while (next.mixingFrom != null) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1371,7 +1371,7 @@ var spine;
|
||||
var nextTime = current.trackLast - next.delay;
|
||||
if (nextTime >= 0) {
|
||||
next.delay = 0;
|
||||
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
current.trackTime += currentDelta;
|
||||
this.setCurrent(i, next, true);
|
||||
while (next.mixingFrom != null) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1371,7 +1371,7 @@ var spine;
|
||||
var nextTime = current.trackLast - next.delay;
|
||||
if (nextTime >= 0) {
|
||||
next.delay = 0;
|
||||
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
current.trackTime += currentDelta;
|
||||
this.setCurrent(i, next, true);
|
||||
while (next.mixingFrom != null) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1371,7 +1371,7 @@ var spine;
|
||||
var nextTime = current.trackLast - next.delay;
|
||||
if (nextTime >= 0) {
|
||||
next.delay = 0;
|
||||
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
current.trackTime += currentDelta;
|
||||
this.setCurrent(i, next, true);
|
||||
while (next.mixingFrom != null) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1371,7 +1371,7 @@ var spine;
|
||||
var nextTime = current.trackLast - next.delay;
|
||||
if (nextTime >= 0) {
|
||||
next.delay = 0;
|
||||
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
current.trackTime += currentDelta;
|
||||
this.setCurrent(i, next, true);
|
||||
while (next.mixingFrom != null) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -76,7 +76,7 @@ module spine {
|
||||
let nextTime = current.trackLast - next.delay;
|
||||
if (nextTime >= 0) {
|
||||
next.delay = 0;
|
||||
next.trackTime = current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
next.trackTime += current.timeScale == 0 ? 0 : (nextTime / current.timeScale + delta) * next.timeScale;
|
||||
current.trackTime += currentDelta;
|
||||
this.setCurrent(i, next, true);
|
||||
while (next.mixingFrom != null) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user