mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-21 17:56:04 +08:00
[ts] Fixed deform timelines not mixing from/to setup pose. #920
This commit is contained in:
parent
3e8f3be0e4
commit
2b5058f020
@ -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
@ -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
@ -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
@ -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
@ -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
@ -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.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user