UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Ported latest AnimationState changes. See #792

Browse Source
This commit is contained in:
badlogic 2016-12-02 15:38:30 +01:00
parent 9fedf6877a
commit fb327d9000
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1568,7 +1568,7 @@ var spine;
current.mixingFrom = from; current.mixingFrom = from;
current.mixTime = 0; current.mixTime = 0;
from.timelinesRotation.length = 0; from.timelinesRotation.length = 0;
if (from.mixingFrom != null) if (from.mixingFrom != null && from.mixDuration > 0)
current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1); current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
} }
this.queue.start(current); this.queue.start(current);
@ -1680,7 +1680,7 @@ var spine;
entry.trackTime = 0; entry.trackTime = 0;
entry.trackLast = -1; entry.trackLast = -1;
entry.nextTrackLast = -1; entry.nextTrackLast = -1;
entry.trackEnd = loop ? Number.MAX_VALUE : entry.animationEnd; entry.trackEnd = Number.MAX_VALUE;
entry.timeScale = 1; entry.timeScale = 1;
entry.alpha = 1; entry.alpha = 1;
entry.mixAlpha = 1; entry.mixAlpha = 1;

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

File diff suppressed because one or more lines are too long

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

@ -1568,7 +1568,7 @@ var spine;
current.mixingFrom = from; current.mixingFrom = from;
current.mixTime = 0; current.mixTime = 0;
from.timelinesRotation.length = 0; from.timelinesRotation.length = 0;
if (from.mixingFrom != null) if (from.mixingFrom != null && from.mixDuration > 0)
current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1); current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
} }
this.queue.start(current); this.queue.start(current);
@ -1680,7 +1680,7 @@ var spine;
entry.trackTime = 0; entry.trackTime = 0;
entry.trackLast = -1; entry.trackLast = -1;
entry.nextTrackLast = -1; entry.nextTrackLast = -1;
entry.trackEnd = loop ? Number.MAX_VALUE : entry.animationEnd; entry.trackEnd = Number.MAX_VALUE;
entry.timeScale = 1; entry.timeScale = 1;
entry.alpha = 1; entry.alpha = 1;
entry.mixAlpha = 1; entry.mixAlpha = 1;

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

File diff suppressed because one or more lines are too long

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

@ -1221,7 +1221,7 @@ var spine;
current.mixingFrom = from; current.mixingFrom = from;
current.mixTime = 0; current.mixTime = 0;
from.timelinesRotation.length = 0; from.timelinesRotation.length = 0;
if (from.mixingFrom != null) if (from.mixingFrom != null && from.mixDuration > 0)
current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1); current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
} }
this.queue.start(current); this.queue.start(current);
@ -1333,7 +1333,7 @@ var spine;
entry.trackTime = 0; entry.trackTime = 0;
entry.trackLast = -1; entry.trackLast = -1;
entry.nextTrackLast = -1; entry.nextTrackLast = -1;
entry.trackEnd = loop ? Number.MAX_VALUE : entry.animationEnd; entry.trackEnd = Number.MAX_VALUE;
entry.timeScale = 1; entry.timeScale = 1;
entry.alpha = 1; entry.alpha = 1;
entry.mixAlpha = 1; entry.mixAlpha = 1;

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

File diff suppressed because one or more lines are too long

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

@ -1221,7 +1221,7 @@ var spine;
current.mixingFrom = from; current.mixingFrom = from;
current.mixTime = 0; current.mixTime = 0;
from.timelinesRotation.length = 0; from.timelinesRotation.length = 0;
if (from.mixingFrom != null) if (from.mixingFrom != null && from.mixDuration > 0)
current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1); current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
} }
this.queue.start(current); this.queue.start(current);
@ -1333,7 +1333,7 @@ var spine;
entry.trackTime = 0; entry.trackTime = 0;
entry.trackLast = -1; entry.trackLast = -1;
entry.nextTrackLast = -1; entry.nextTrackLast = -1;
entry.trackEnd = loop ? Number.MAX_VALUE : entry.animationEnd; entry.trackEnd = Number.MAX_VALUE;
entry.timeScale = 1; entry.timeScale = 1;
entry.alpha = 1; entry.alpha = 1;
entry.mixAlpha = 1; entry.mixAlpha = 1;

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

File diff suppressed because one or more lines are too long

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

@ -1221,7 +1221,7 @@ var spine;
current.mixingFrom = from; current.mixingFrom = from;
current.mixTime = 0; current.mixTime = 0;
from.timelinesRotation.length = 0; from.timelinesRotation.length = 0;
if (from.mixingFrom != null) if (from.mixingFrom != null && from.mixDuration > 0)
current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1); current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
} }
this.queue.start(current); this.queue.start(current);
@ -1333,7 +1333,7 @@ var spine;
entry.trackTime = 0; entry.trackTime = 0;
entry.trackLast = -1; entry.trackLast = -1;
entry.nextTrackLast = -1; entry.nextTrackLast = -1;
entry.trackEnd = loop ? Number.MAX_VALUE : entry.animationEnd; entry.trackEnd = Number.MAX_VALUE;
entry.timeScale = 1; entry.timeScale = 1;
entry.alpha = 1; entry.alpha = 1;
entry.mixAlpha = 1; entry.mixAlpha = 1;

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

File diff suppressed because one or more lines are too long

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

@ -1221,7 +1221,7 @@ var spine;
current.mixingFrom = from; current.mixingFrom = from;
current.mixTime = 0; current.mixTime = 0;
from.timelinesRotation.length = 0; from.timelinesRotation.length = 0;
if (from.mixingFrom != null) if (from.mixingFrom != null && from.mixDuration > 0)
current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1); current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
} }
this.queue.start(current); this.queue.start(current);
@ -1333,7 +1333,7 @@ var spine;
entry.trackTime = 0; entry.trackTime = 0;
entry.trackLast = -1; entry.trackLast = -1;
entry.nextTrackLast = -1; entry.nextTrackLast = -1;
entry.trackEnd = loop ? Number.MAX_VALUE : entry.animationEnd; entry.trackEnd = Number.MAX_VALUE;
entry.timeScale = 1; entry.timeScale = 1;
entry.alpha = 1; entry.alpha = 1;
entry.mixAlpha = 1; entry.mixAlpha = 1;

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

File diff suppressed because one or more lines are too long

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

@ -349,7 +349,7 @@ module spine {
from.timelinesRotation.length = 0; from.timelinesRotation.length = 0;
// If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero. // If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero.
if (from.mixingFrom != null) current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1); if (from.mixingFrom != null && from.mixDuration > 0) current.mixAlpha *= Math.min(from.mixTime / from.mixDuration, 1);
} }
this.queue.start(current); this.queue.start(current);
@ -469,7 +469,7 @@ module spine {
entry.trackTime = 0; entry.trackTime = 0;
entry.trackLast = -1; entry.trackLast = -1;
entry.nextTrackLast = -1; entry.nextTrackLast = -1;
entry.trackEnd = loop ? Number.MAX_VALUE : entry.animationEnd; entry.trackEnd = Number.MAX_VALUE;
entry.timeScale = 1; entry.timeScale = 1;
entry.alpha = 1; entry.alpha = 1;