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

[c] Ported AnimationState change

Browse Source 
[ts] Rebuild artifacts
This commit is contained in:
badlogic 2017-04-10 15:45:13 +02:00
parent d34f7c7b11
commit 14c1df8cfb
13 changed files with 43 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/spine-c/src/spine/AnimationState.c
View File

@ -327,7 +327,7 @@ void spAnimationState_apply (spAnimationState* self, spSkeleton* skeleton) {
mix = current->alpha; mix = current->alpha;
if (current->mixingFrom) if (current->mixingFrom)
mix *= _spAnimationState_applyMixingFrom(self, current, skeleton); mix *= _spAnimationState_applyMixingFrom(self, current, skeleton);
else if (current->trackTime >= current->trackEnd) else if (current->trackTime >= current->trackEnd && current->next == 0)
mix = 0; mix = 0;
/* Apply current entry. */ /* Apply current entry. */

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

@ -1504,13 +1504,11 @@ var spine;
continue; continue;
} }
} }
else { else if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
if (current.trackLast >= current.trackEnd && current.mixingFrom == null) { tracks[i] = null;
tracks[i] = null; this.queue.end(current);
this.queue.end(current); this.disposeNext(current);
this.disposeNext(current); continue;
continue;
}
} }
this.updateMixingFrom(current, delta); this.updateMixingFrom(current, delta);
current.trackTime += currentDelta; current.trackTime += currentDelta;
@ -1546,7 +1544,7 @@ var spine;
var mix = current.alpha; var mix = current.alpha;
if (current.mixingFrom != null) if (current.mixingFrom != null)
mix *= this.applyMixingFrom(current, skeleton); mix *= this.applyMixingFrom(current, skeleton);
else if (current.trackTime >= current.trackEnd) else if (current.trackTime >= current.trackEnd && current.next == null)
mix = 0; mix = 0;
var animationLast = current.animationLast, animationTime = current.getAnimationTime(); var animationLast = current.animationLast, animationTime = current.getAnimationTime();
var timelineCount = current.animation.timelines.length; var timelineCount = current.animation.timelines.length;

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

File diff suppressed because one or more lines are too long

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

@ -1504,13 +1504,11 @@ var spine;
continue; continue;
} }
} }
else { else if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
if (current.trackLast >= current.trackEnd && current.mixingFrom == null) { tracks[i] = null;
tracks[i] = null; this.queue.end(current);
this.queue.end(current); this.disposeNext(current);
this.disposeNext(current); continue;
continue;
}
} }
this.updateMixingFrom(current, delta); this.updateMixingFrom(current, delta);
current.trackTime += currentDelta; current.trackTime += currentDelta;
@ -1546,7 +1544,7 @@ var spine;
var mix = current.alpha; var mix = current.alpha;
if (current.mixingFrom != null) if (current.mixingFrom != null)
mix *= this.applyMixingFrom(current, skeleton); mix *= this.applyMixingFrom(current, skeleton);
else if (current.trackTime >= current.trackEnd) else if (current.trackTime >= current.trackEnd && current.next == null)
mix = 0; mix = 0;
var animationLast = current.animationLast, animationTime = current.getAnimationTime(); var animationLast = current.animationLast, animationTime = current.getAnimationTime();
var timelineCount = current.animation.timelines.length; var timelineCount = current.animation.timelines.length;

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

File diff suppressed because one or more lines are too long

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

@ -1080,13 +1080,11 @@ var spine;
continue; continue;
} }
} }
else { else if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
if (current.trackLast >= current.trackEnd && current.mixingFrom == null) { tracks[i] = null;
tracks[i] = null; this.queue.end(current);
this.queue.end(current); this.disposeNext(current);
this.disposeNext(current); continue;
continue;
}
} }
this.updateMixingFrom(current, delta); this.updateMixingFrom(current, delta);
current.trackTime += currentDelta; current.trackTime += currentDelta;
@ -1122,7 +1120,7 @@ var spine;
var mix = current.alpha; var mix = current.alpha;
if (current.mixingFrom != null) if (current.mixingFrom != null)
mix *= this.applyMixingFrom(current, skeleton); mix *= this.applyMixingFrom(current, skeleton);
else if (current.trackTime >= current.trackEnd) else if (current.trackTime >= current.trackEnd && current.next == null)
mix = 0; mix = 0;
var animationLast = current.animationLast, animationTime = current.getAnimationTime(); var animationLast = current.animationLast, animationTime = current.getAnimationTime();
var timelineCount = current.animation.timelines.length; var timelineCount = current.animation.timelines.length;

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

File diff suppressed because one or more lines are too long

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

@ -1080,13 +1080,11 @@ var spine;
continue; continue;
} }
} }
else { else if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
if (current.trackLast >= current.trackEnd && current.mixingFrom == null) { tracks[i] = null;
tracks[i] = null; this.queue.end(current);
this.queue.end(current); this.disposeNext(current);
this.disposeNext(current); continue;
continue;
}
} }
this.updateMixingFrom(current, delta); this.updateMixingFrom(current, delta);
current.trackTime += currentDelta; current.trackTime += currentDelta;
@ -1122,7 +1120,7 @@ var spine;
var mix = current.alpha; var mix = current.alpha;
if (current.mixingFrom != null) if (current.mixingFrom != null)
mix *= this.applyMixingFrom(current, skeleton); mix *= this.applyMixingFrom(current, skeleton);
else if (current.trackTime >= current.trackEnd) else if (current.trackTime >= current.trackEnd && current.next == null)
mix = 0; mix = 0;
var animationLast = current.animationLast, animationTime = current.getAnimationTime(); var animationLast = current.animationLast, animationTime = current.getAnimationTime();
var timelineCount = current.animation.timelines.length; var timelineCount = current.animation.timelines.length;

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

File diff suppressed because one or more lines are too long

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

@ -1080,13 +1080,11 @@ var spine;
continue; continue;
} }
} }
else { else if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
if (current.trackLast >= current.trackEnd && current.mixingFrom == null) { tracks[i] = null;
tracks[i] = null; this.queue.end(current);
this.queue.end(current); this.disposeNext(current);
this.disposeNext(current); continue;
continue;
}
} }
this.updateMixingFrom(current, delta); this.updateMixingFrom(current, delta);
current.trackTime += currentDelta; current.trackTime += currentDelta;
@ -1122,7 +1120,7 @@ var spine;
var mix = current.alpha; var mix = current.alpha;
if (current.mixingFrom != null) if (current.mixingFrom != null)
mix *= this.applyMixingFrom(current, skeleton); mix *= this.applyMixingFrom(current, skeleton);
else if (current.trackTime >= current.trackEnd) else if (current.trackTime >= current.trackEnd && current.next == null)
mix = 0; mix = 0;
var animationLast = current.animationLast, animationTime = current.getAnimationTime(); var animationLast = current.animationLast, animationTime = current.getAnimationTime();
var timelineCount = current.animation.timelines.length; var timelineCount = current.animation.timelines.length;

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

File diff suppressed because one or more lines are too long

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

@ -1080,13 +1080,11 @@ var spine;
continue; continue;
} }
} }
else { else if (current.trackLast >= current.trackEnd && current.mixingFrom == null) {
if (current.trackLast >= current.trackEnd && current.mixingFrom == null) { tracks[i] = null;
tracks[i] = null; this.queue.end(current);
this.queue.end(current); this.disposeNext(current);
this.disposeNext(current); continue;
continue;
}
} }
this.updateMixingFrom(current, delta); this.updateMixingFrom(current, delta);
current.trackTime += currentDelta; current.trackTime += currentDelta;
@ -1122,7 +1120,7 @@ var spine;
var mix = current.alpha; var mix = current.alpha;
if (current.mixingFrom != null) if (current.mixingFrom != null)
mix *= this.applyMixingFrom(current, skeleton); mix *= this.applyMixingFrom(current, skeleton);
else if (current.trackTime >= current.trackEnd) else if (current.trackTime >= current.trackEnd && current.next == null)
mix = 0; mix = 0;
var animationLast = current.animationLast, animationTime = current.getAnimationTime(); var animationLast = current.animationLast, animationTime = current.getAnimationTime();
var timelineCount = current.animation.timelines.length; var timelineCount = current.animation.timelines.length;

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

File diff suppressed because one or more lines are too long