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

[libgdx] Fixed deform timelines not mixing to/from setup pose.

Browse Source
This commit is contained in:
NathanSweet 2017-06-01 23:44:09 +02:00
parent 7e75c7c5b1
commit ef6ccb84d3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-libgdx/spine-libgdx/src/com/esotericsoftware/spine/Animation.java
View File

@ -869,7 +869,7 @@ public class Animation {
float[][] frameVertices = this.frameVertices; float[][] frameVertices = this.frameVertices;
int vertexCount = frameVertices[0].length; int vertexCount = frameVertices[0].length;
if (verticesArray.size != vertexCount) alpha = 1; // Don't mix from uninitialized slot vertices. if (verticesArray.size != vertexCount && !setupPose) alpha = 1; // Don't mix from uninitialized slot vertices.
float[] vertices = verticesArray.setSize(vertexCount); float[] vertices = verticesArray.setSize(vertexCount);
if (time >= frames[frames.length - 1]) { // Time is after last frame. if (time >= frames[frames.length - 1]) { // Time is after last frame.
@ -908,6 +908,7 @@ public class Animation {
if (alpha == 1) { if (alpha == 1) {
// Vertex positions or deform offsets, no alpha. // Vertex positions or deform offsets, no alpha.
System.out.println(1);
for (int i = 0; i < vertexCount; i++) { for (int i = 0; i < vertexCount; i++) {
float prev = prevVertices[i]; float prev = prevVertices[i];
vertices[i] = prev + (nextVertices[i] - prev) * percent; vertices[i] = prev + (nextVertices[i] - prev) * percent;
@ -916,6 +917,7 @@ public class Animation {
VertexAttachment vertexAttachment = (VertexAttachment)slotAttachment; VertexAttachment vertexAttachment = (VertexAttachment)slotAttachment;
if (vertexAttachment.getBones() == null) { if (vertexAttachment.getBones() == null) {
// Unweighted vertex positions, with alpha. // Unweighted vertex positions, with alpha.
System.out.println(2);
float[] setupVertices = vertexAttachment.getVertices(); float[] setupVertices = vertexAttachment.getVertices();
for (int i = 0; i < vertexCount; i++) { for (int i = 0; i < vertexCount; i++) {
float prev = prevVertices[i], setup = setupVertices[i]; float prev = prevVertices[i], setup = setupVertices[i];
@ -923,6 +925,7 @@ public class Animation {
} }
} else { } else {
// Weighted deform offsets, with alpha. // Weighted deform offsets, with alpha.
System.out.println(3);
for (int i = 0; i < vertexCount; i++) { for (int i = 0; i < vertexCount; i++) {
float prev = prevVertices[i]; float prev = prevVertices[i];
vertices[i] = (prev + (nextVertices[i] - prev) * percent) * alpha; vertices[i] = (prev + (nextVertices[i] - prev) * percent) * alpha;
@ -930,6 +933,7 @@ public class Animation {
} }
} else { } else {
// Vertex positions or deform offsets, with alpha. // Vertex positions or deform offsets, with alpha.
System.out.println(4);
for (int i = 0; i < vertexCount; i++) { for (int i = 0; i < vertexCount; i++) {
float prev = prevVertices[i]; float prev = prevVertices[i];
vertices[i] += (prev + (nextVertices[i] - prev) * percent - vertices[i]) * alpha; vertices[i] += (prev + (nextVertices[i] - prev) * percent - vertices[i]) * alpha;