UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-04 14:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ts] Fix applying attachment timeline in AnimationState

Browse Source 
AnimatinState.setAttachment was directly setting the slot.attachment field instead of calling the setter. This caused the deform array from a previous attachment to linger around and be applied to the current attachment incorrectly.
This commit is contained in:
badlogic 2021-05-06 15:41:59 +02:00
parent 97b3f3058b
commit bef00617d7
13 changed files with 13 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1611,7 +1611,7 @@ var spine;
slot.attachmentState = this.unkeyedState + AnimationState.SETUP; slot.attachmentState = this.unkeyedState + AnimationState.SETUP;
}; };
AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) { AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) {
slot.attachment = attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName); slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName));
if (attachments) if (attachments)
slot.attachmentState = this.unkeyedState + AnimationState.CURRENT; slot.attachmentState = this.unkeyedState + AnimationState.CURRENT;
}; };
@ -4103,17 +4103,11 @@ var spine;
var mesh = attachment; var mesh = attachment;
verticesLength = mesh.worldVerticesLength; verticesLength = mesh.worldVerticesLength;
vertices = spine.Utils.setArraySize(temp, verticesLength, 0); vertices = spine.Utils.setArraySize(temp, verticesLength, 0);
if (i == 43) {
console.log("WTF");
}
mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2); mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
} }
if (vertices != null) { if (vertices != null) {
for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) { for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) {
var x = vertices[ii], y = vertices[ii + 1]; var x = vertices[ii], y = vertices[ii + 1];
if (isNaN(x) || isNaN(y)) {
console.log("WTF");
}
minX = Math.min(minX, x); minX = Math.min(minX, x);
minY = Math.min(minY, y); minY = Math.min(minY, y);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);

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

File diff suppressed because one or more lines are too long

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

@ -1611,7 +1611,7 @@ var spine;
slot.attachmentState = this.unkeyedState + AnimationState.SETUP; slot.attachmentState = this.unkeyedState + AnimationState.SETUP;
}; };
AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) { AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) {
slot.attachment = attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName); slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName));
if (attachments) if (attachments)
slot.attachmentState = this.unkeyedState + AnimationState.CURRENT; slot.attachmentState = this.unkeyedState + AnimationState.CURRENT;
}; };
@ -4103,17 +4103,11 @@ var spine;
var mesh = attachment; var mesh = attachment;
verticesLength = mesh.worldVerticesLength; verticesLength = mesh.worldVerticesLength;
vertices = spine.Utils.setArraySize(temp, verticesLength, 0); vertices = spine.Utils.setArraySize(temp, verticesLength, 0);
if (i == 43) {
console.log("WTF");
}
mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2); mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
} }
if (vertices != null) { if (vertices != null) {
for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) { for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) {
var x = vertices[ii], y = vertices[ii + 1]; var x = vertices[ii], y = vertices[ii + 1];
if (isNaN(x) || isNaN(y)) {
console.log("WTF");
}
minX = Math.min(minX, x); minX = Math.min(minX, x);
minY = Math.min(minY, y); minY = Math.min(minY, y);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);

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

File diff suppressed because one or more lines are too long

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

@ -1611,7 +1611,7 @@ var spine;
slot.attachmentState = this.unkeyedState + AnimationState.SETUP; slot.attachmentState = this.unkeyedState + AnimationState.SETUP;
}; };
AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) { AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) {
slot.attachment = attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName); slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName));
if (attachments) if (attachments)
slot.attachmentState = this.unkeyedState + AnimationState.CURRENT; slot.attachmentState = this.unkeyedState + AnimationState.CURRENT;
}; };
@ -4103,17 +4103,11 @@ var spine;
var mesh = attachment; var mesh = attachment;
verticesLength = mesh.worldVerticesLength; verticesLength = mesh.worldVerticesLength;
vertices = spine.Utils.setArraySize(temp, verticesLength, 0); vertices = spine.Utils.setArraySize(temp, verticesLength, 0);
if (i == 43) {
console.log("WTF");
}
mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2); mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
} }
if (vertices != null) { if (vertices != null) {
for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) { for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) {
var x = vertices[ii], y = vertices[ii + 1]; var x = vertices[ii], y = vertices[ii + 1];
if (isNaN(x) || isNaN(y)) {
console.log("WTF");
}
minX = Math.min(minX, x); minX = Math.min(minX, x);
minY = Math.min(minY, y); minY = Math.min(minY, y);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);

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

File diff suppressed because one or more lines are too long

8
spine-ts/build/spine-player.js
View File

@ -1611,7 +1611,7 @@ var spine;
slot.attachmentState = this.unkeyedState + AnimationState.SETUP; slot.attachmentState = this.unkeyedState + AnimationState.SETUP;
}; };
AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) { AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) {
slot.attachment = attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName); slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName));
if (attachments) if (attachments)
slot.attachmentState = this.unkeyedState + AnimationState.CURRENT; slot.attachmentState = this.unkeyedState + AnimationState.CURRENT;
}; };
@ -4103,17 +4103,11 @@ var spine;
var mesh = attachment; var mesh = attachment;
verticesLength = mesh.worldVerticesLength; verticesLength = mesh.worldVerticesLength;
vertices = spine.Utils.setArraySize(temp, verticesLength, 0); vertices = spine.Utils.setArraySize(temp, verticesLength, 0);
if (i == 43) {
console.log("WTF");
}
mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2); mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
} }
if (vertices != null) { if (vertices != null) {
for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) { for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) {
var x = vertices[ii], y = vertices[ii + 1]; var x = vertices[ii], y = vertices[ii + 1];
if (isNaN(x) || isNaN(y)) {
console.log("WTF");
}
minX = Math.min(minX, x); minX = Math.min(minX, x);
minY = Math.min(minY, y); minY = Math.min(minY, y);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);

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

File diff suppressed because one or more lines are too long

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

@ -1611,7 +1611,7 @@ var spine;
slot.attachmentState = this.unkeyedState + AnimationState.SETUP; slot.attachmentState = this.unkeyedState + AnimationState.SETUP;
}; };
AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) { AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) {
slot.attachment = attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName); slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName));
if (attachments) if (attachments)
slot.attachmentState = this.unkeyedState + AnimationState.CURRENT; slot.attachmentState = this.unkeyedState + AnimationState.CURRENT;
}; };
@ -4103,17 +4103,11 @@ var spine;
var mesh = attachment; var mesh = attachment;
verticesLength = mesh.worldVerticesLength; verticesLength = mesh.worldVerticesLength;
vertices = spine.Utils.setArraySize(temp, verticesLength, 0); vertices = spine.Utils.setArraySize(temp, verticesLength, 0);
if (i == 43) {
console.log("WTF");
}
mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2); mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
} }
if (vertices != null) { if (vertices != null) {
for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) { for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) {
var x = vertices[ii], y = vertices[ii + 1]; var x = vertices[ii], y = vertices[ii + 1];
if (isNaN(x) || isNaN(y)) {
console.log("WTF");
}
minX = Math.min(minX, x); minX = Math.min(minX, x);
minY = Math.min(minY, y); minY = Math.min(minY, y);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);

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

File diff suppressed because one or more lines are too long

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

@ -1611,7 +1611,7 @@ var spine;
slot.attachmentState = this.unkeyedState + AnimationState.SETUP; slot.attachmentState = this.unkeyedState + AnimationState.SETUP;
}; };
AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) { AnimationState.prototype.setAttachment = function (skeleton, slot, attachmentName, attachments) {
slot.attachment = attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName); slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName));
if (attachments) if (attachments)
slot.attachmentState = this.unkeyedState + AnimationState.CURRENT; slot.attachmentState = this.unkeyedState + AnimationState.CURRENT;
}; };
@ -4103,17 +4103,11 @@ var spine;
var mesh = attachment; var mesh = attachment;
verticesLength = mesh.worldVerticesLength; verticesLength = mesh.worldVerticesLength;
vertices = spine.Utils.setArraySize(temp, verticesLength, 0); vertices = spine.Utils.setArraySize(temp, verticesLength, 0);
if (i == 43) {
console.log("WTF");
}
mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2); mesh.computeWorldVertices(slot, 0, verticesLength, vertices, 0, 2);
} }
if (vertices != null) { if (vertices != null) {
for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) { for (var ii = 0, nn = vertices.length; ii < nn; ii += 2) {
var x = vertices[ii], y = vertices[ii + 1]; var x = vertices[ii], y = vertices[ii + 1];
if (isNaN(x) || isNaN(y)) {
console.log("WTF");
}
minX = Math.min(minX, x); minX = Math.min(minX, x);
minY = Math.min(minY, y); minY = Math.min(minY, y);
maxX = Math.max(maxX, x); maxX = Math.max(maxX, x);

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/AnimationState.ts
View File

@ -378,7 +378,7 @@ module spine {
} }
setAttachment (skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean) { setAttachment (skeleton: Skeleton, slot: Slot, attachmentName: string, attachments: boolean) {
slot.attachment = attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName); slot.setAttachment(attachmentName == null ? null : skeleton.getAttachment(slot.data.index, attachmentName));
if (attachments) slot.attachmentState = this.unkeyedState + AnimationState.CURRENT; if (attachments) slot.attachmentState = this.unkeyedState + AnimationState.CURRENT;
} }