UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-01 21:29:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Ported latest anim state change

Browse Source
This commit is contained in:
badlogic 2017-05-18 10:28:19 +02:00
parent 6756f01557
commit e4ff874172
13 changed files with 49 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1118,9 +1118,12 @@ var spine;
return true; return true;
var finished = this.updateMixingFrom(from, delta, animationCount + 1); var finished = this.updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) { if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { if (animationCount > 5 && from.mixingFrom == null) {
entry.mixingFrom = null; entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
this.queue.end(from); if (entry.interruptAlpha <= 0) {
entry.mixingFrom = null;
this.queue.end(from);
}
} }
return finished; return finished;
} }

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

@ -1118,9 +1118,12 @@ var spine;
return true; return true;
var finished = this.updateMixingFrom(from, delta, animationCount + 1); var finished = this.updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) { if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { if (animationCount > 5 && from.mixingFrom == null) {
entry.mixingFrom = null; entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
this.queue.end(from); if (entry.interruptAlpha <= 0) {
entry.mixingFrom = null;
this.queue.end(from);
}
} }
return finished; return finished;
} }

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

@ -1118,9 +1118,12 @@ var spine;
return true; return true;
var finished = this.updateMixingFrom(from, delta, animationCount + 1); var finished = this.updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) { if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { if (animationCount > 5 && from.mixingFrom == null) {
entry.mixingFrom = null; entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
this.queue.end(from); if (entry.interruptAlpha <= 0) {
entry.mixingFrom = null;
this.queue.end(from);
}
} }
return finished; return finished;
} }

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

@ -1118,9 +1118,12 @@ var spine;
return true; return true;
var finished = this.updateMixingFrom(from, delta, animationCount + 1); var finished = this.updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) { if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { if (animationCount > 5 && from.mixingFrom == null) {
entry.mixingFrom = null; entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
this.queue.end(from); if (entry.interruptAlpha <= 0) {
entry.mixingFrom = null;
this.queue.end(from);
}
} }
return finished; return finished;
} }

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

@ -1118,9 +1118,12 @@ var spine;
return true; return true;
var finished = this.updateMixingFrom(from, delta, animationCount + 1); var finished = this.updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) { if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { if (animationCount > 5 && from.mixingFrom == null) {
entry.mixingFrom = null; entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
this.queue.end(from); if (entry.interruptAlpha <= 0) {
entry.mixingFrom = null;
this.queue.end(from);
}
} }
return finished; return finished;
} }

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

@ -1118,9 +1118,12 @@ var spine;
return true; return true;
var finished = this.updateMixingFrom(from, delta, animationCount + 1); var finished = this.updateMixingFrom(from, delta, animationCount + 1);
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) { if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { if (animationCount > 5 && from.mixingFrom == null) {
entry.mixingFrom = null; entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
this.queue.end(from); if (entry.interruptAlpha <= 0) {
entry.mixingFrom = null;
this.queue.end(from);
}
} }
return finished; return finished;
} }

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

@ -115,9 +115,13 @@ module spine {
// Require mixTime > 0 to ensure the mixing from entry was applied at least once. // Require mixTime > 0 to ensure the mixing from entry was applied at least once.
if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) { if (entry.mixTime > 0 && (entry.mixTime >= entry.mixDuration || entry.timeScale == 0)) {
if (animationCount > 6 && from.mixingFrom == null) { // Limit the mixing from linked list. if (animationCount > 5 && from.mixingFrom == null) {
entry.mixingFrom = null; // Limit linked list by speeding up and removing old entries.
this.queue.end(from); entry.interruptAlpha = Math.max(0, entry.interruptAlpha - delta * 0.66);
if (entry.interruptAlpha <= 0) {
entry.mixingFrom = null;
this.queue.end(from);
}
} }
return finished; return finished;
} }