[ts] Fixed deform timelines not mixing from/to setup pose. #920

This commit is contained in:
badlogic 2017-06-04 11:03:13 +02:00
parent 3e8f3be0e4
commit 2b5058f020
16 changed files with 42918 additions and 42918 deletions

View File

@ -1051,7 +1051,7 @@ var spine;
}
var frameVertices = this.frameVertices;
var vertexCount = frameVertices[0].length;
if (verticesArray.length != vertexCount)
if (verticesArray.length != vertexCount && !setupPose)
alpha = 1;
var vertices = spine.Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) {

File diff suppressed because one or more lines are too long

View File

@ -1051,7 +1051,7 @@ var spine;
}
var frameVertices = this.frameVertices;
var vertexCount = frameVertices[0].length;
if (verticesArray.length != vertexCount)
if (verticesArray.length != vertexCount && !setupPose)
alpha = 1;
var vertices = spine.Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) {

File diff suppressed because one or more lines are too long

View File

@ -603,7 +603,7 @@ var spine;
}
var frameVertices = this.frameVertices;
var vertexCount = frameVertices[0].length;
if (verticesArray.length != vertexCount)
if (verticesArray.length != vertexCount && !setupPose)
alpha = 1;
var vertices = spine.Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) {

File diff suppressed because one or more lines are too long

View File

@ -603,7 +603,7 @@ var spine;
}
var frameVertices = this.frameVertices;
var vertexCount = frameVertices[0].length;
if (verticesArray.length != vertexCount)
if (verticesArray.length != vertexCount && !setupPose)
alpha = 1;
var vertices = spine.Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) {

File diff suppressed because one or more lines are too long

View File

@ -603,7 +603,7 @@ var spine;
}
var frameVertices = this.frameVertices;
var vertexCount = frameVertices[0].length;
if (verticesArray.length != vertexCount)
if (verticesArray.length != vertexCount && !setupPose)
alpha = 1;
var vertices = spine.Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) {

File diff suppressed because one or more lines are too long

View File

@ -667,7 +667,7 @@ module spine {
let frameVertices = this.frameVertices;
let vertexCount = frameVertices[0].length;
if (verticesArray.length != vertexCount) alpha = 1; // Don't mix from uninitialized slot vertices.
if (verticesArray.length != vertexCount && !setupPose) alpha = 1; // Don't mix from uninitialized slot vertices.
let vertices: Array<number> = Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) { // Time is after last frame.