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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

File diff suppressed because one or more lines are too long

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

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

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

File diff suppressed because one or more lines are too long

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

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

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

File diff suppressed because one or more lines are too long

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

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

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

File diff suppressed because one or more lines are too long

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

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

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

File diff suppressed because one or more lines are too long

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

@ -667,7 +667,7 @@ module spine {
let frameVertices = this.frameVertices; let frameVertices = this.frameVertices;
let vertexCount = frameVertices[0].length; 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); let vertices: Array<number> = Utils.setArraySize(verticesArray, vertexCount);
if (time >= frames[frames.length - 1]) { // Time is after last frame. if (time >= frames[frames.length - 1]) { // Time is after last frame.