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

[ts] Fixed DeformTimeline additive blend after last frame.

Browse Source
This commit is contained in:
badlogic 2017-10-30 14:05:12 +01:00
parent 070b3c98d8
commit 78a1df5c8e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
spine-ts/core/src/Animation.ts
View File

@ -812,7 +812,7 @@ module spine {
} }
} else { } else {
switch (blend) { switch (blend) {
case MixBlend.setup: case MixBlend.setup: {
let vertexAttachment = slotAttachment as VertexAttachment; let vertexAttachment = slotAttachment as VertexAttachment;
if (vertexAttachment.bones == null) { if (vertexAttachment.bones == null) {
// Unweighted vertex positions, with alpha. // Unweighted vertex positions, with alpha.
@ -827,13 +827,24 @@ module spine {
vertices[i] = lastVertices[i] * alpha; vertices[i] = lastVertices[i] * alpha;
} }
break; break;
}
case MixBlend.first: case MixBlend.first:
case MixBlend.replace: case MixBlend.replace:
for (let i = 0; i < vertexCount; i++) for (let i = 0; i < vertexCount; i++)
vertices[i] += (lastVertices[i] - vertices[i]) * alpha; vertices[i] += (lastVertices[i] - vertices[i]) * alpha;
case MixBlend.add: case MixBlend.add:
for (let i = 0; i < vertexCount; i++) let vertexAttachment = slotAttachment as VertexAttachment;
vertices[i] += lastVertices[i] * alpha; if (vertexAttachment.bones == null) {
// Unweighted vertex positions, with alpha.
let setupVertices = vertexAttachment.vertices;
for (let i = 0; i < vertexCount; i++) {
vertices[i] += (lastVertices[i] - setupVertices[i]) * alpha;
}
} else {
// Weighted deform offsets, with alpha.
for (let i = 0; i < vertexCount; i++)
vertices[i] += lastVertices[i] * alpha;
}
} }
} }
return; return;