UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-05 10:16:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

[csharp] Fixed mixing unweighted meshes that aren't keyed on frame zero. a8e1faf4dd

Browse Source
This commit is contained in:
pharan 2017-06-22 11:27:46 +08:00
parent f9a4107e41
commit 4e7a409a63
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
spine-csharp/src/Animation.cs
View File

@ -797,6 +797,8 @@ namespace Spine {
} }
public class DeformTimeline : CurveTimeline { public class DeformTimeline : CurveTimeline {
static float[] zeros = new float[64];
internal int slotIndex; internal int slotIndex;
internal float[] frames; internal float[] frames;
internal float[][] frameVertices; internal float[][] frameVertices;
@ -825,43 +827,58 @@ namespace Spine {
override public void Apply (Skeleton skeleton, float lastTime, float time, ExposedList<Event> firedEvents, float alpha, MixPose pose, MixDirection direction) { override public void Apply (Skeleton skeleton, float lastTime, float time, ExposedList<Event> firedEvents, float alpha, MixPose pose, MixDirection direction) {
Slot slot = skeleton.slots.Items[slotIndex]; Slot slot = skeleton.slots.Items[slotIndex];
VertexAttachment slotAttachment = slot.attachment as VertexAttachment; VertexAttachment vertexAttachment = slot.attachment as VertexAttachment;
if (slotAttachment == null || !slotAttachment.ApplyDeform(attachment)) return; if (vertexAttachment == null || !vertexAttachment.ApplyDeform(attachment)) return;
var verticesArray = slot.attachmentVertices; var verticesArray = slot.attachmentVertices;
float[][] frameVertices = this.frameVertices; float[][] frameVertices = this.frameVertices;
int vertexCount = frameVertices[0].Length; int vertexCount = frameVertices[0].Length;
if (verticesArray.Count != vertexCount && pose != MixPose.Setup) alpha = 1; // Don't mix from uninitialized slot vertices. if (verticesArray.Capacity < vertexCount) verticesArray.Capacity = vertexCount; // verticesArray.SetSize(vertexCount) // Ensure size and preemptively set count.
// verticesArray.SetSize(vertexCount) // Ensure size and preemptively set count.
if (verticesArray.Capacity < vertexCount) verticesArray.Capacity = vertexCount;
verticesArray.Count = vertexCount; verticesArray.Count = vertexCount;
float[] vertices = verticesArray.Items; float[] vertices = verticesArray.Items;
float[] frames = this.frames; float[] frames = this.frames;
if (time < frames[0]) { if (time < frames[0]) {
switch (pose) { switch (pose) {
case MixPose.Setup: case MixPose.Setup:
verticesArray.Clear(); float[] zeroVertices;
if (vertexAttachment.bones == null) {
// Unweighted vertex positions (setup pose).
zeroVertices = vertexAttachment.vertices;
} else {
// Weighted deform offsets (zeros).
zeroVertices = DeformTimeline.zeros;
if (zeroVertices.Length < vertexCount) DeformTimeline.zeros = zeroVertices = new float[vertexCount];
}
Array.Copy(zeroVertices, 0, vertices, 0, vertexCount);
return; return;
case MixPose.Current: case MixPose.Current:
alpha = 1 - alpha; if (alpha == 1) return;
for (int i = 0; i < vertexCount; i++) if (vertexAttachment.bones == null) {
vertices[i] *= alpha; // Unweighted vertex positions.
float[] setupVertices = vertexAttachment.vertices;
for (int i = 0; i < vertexCount; i++)
vertices[i] += (setupVertices[i] - vertices[i]) * alpha;
} else {
// Weighted deform offsets.
alpha = 1 - alpha;
for (int i = 0; i < vertexCount; i++)
vertices[i] *= alpha;
}
return;
default:
return; return;
} }
return;
} }
if (time >= frames[frames.Length - 1]) { // Time is after last frame. if (time >= frames[frames.Length - 1]) { // Time is after last frame.
float[] lastVertices = frameVertices[frames.Length - 1]; float[] lastVertices = frameVertices[frames.Length - 1];
if (alpha == 1) { if (alpha == 1) {
// Vertex positions or deform offsets, no alpha. // Vertex positions or deform offsets, no alpha.
Array.Copy(lastVertices, 0, vertices, 0, vertexCount); Array.Copy(lastVertices, 0, vertices, 0, vertexCount);
} else if (pose == MixPose.Setup) { } else if (pose == MixPose.Setup) {
VertexAttachment vertexAttachment = slotAttachment;
if (vertexAttachment.bones == null) { if (vertexAttachment.bones == null) {
// Unweighted vertex positions, with alpha. // Unweighted vertex positions, with alpha.
float[] setupVertices = vertexAttachment.vertices; float[] setupVertices = vertexAttachment.vertices;
@ -896,7 +913,6 @@ namespace Spine {
vertices[i] = prev + (nextVertices[i] - prev) * percent; vertices[i] = prev + (nextVertices[i] - prev) * percent;
} }
} else if (pose == MixPose.Setup) { } else if (pose == MixPose.Setup) {
VertexAttachment vertexAttachment = (VertexAttachment)slotAttachment;
if (vertexAttachment.bones == null) { if (vertexAttachment.bones == null) {
// Unweighted vertex positions, with alpha. // Unweighted vertex positions, with alpha.
var setupVertices = vertexAttachment.vertices; var setupVertices = vertexAttachment.vertices;