UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't clear FFD if before first FFD key in animation.

Browse Source 
Didn't make any sense. Any existing FFD should remain until time passes a key.
This commit is contained in:
NathanSweet 2014-11-16 00:13:37 +01:00
parent 31848ad22a
commit ee1f13ab9c
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spine-as3/spine-as3/src/spine/animation/FfdTimeline.as
View File

@ -57,10 +57,7 @@ public class FfdTimeline extends CurveTimeline {
if (slot.attachment != attachment) return; if (slot.attachment != attachment) return;
var frames:Vector.<Number> = this.frames; var frames:Vector.<Number> = this.frames;
if (time < frames[0]) { if (time < frames[0]) return; // Time is before first frame.
slot.attachmentVertices.length = 0;
return; // Time is before first frame.
}
var frameVertices:Vector.<Vector.<Number>> = this.frameVertices; var frameVertices:Vector.<Vector.<Number>> = this.frameVertices;
var vertexCount:int = frameVertices[0].length; var vertexCount:int = frameVertices[0].length;

5
spine-c/src/spine/Animation.c
View File

@ -659,10 +659,7 @@ void _spFFDTimeline_apply (const spTimeline* timeline, spSkeleton* skeleton, flo
spSlot *slot = skeleton->slots[self->slotIndex]; spSlot *slot = skeleton->slots[self->slotIndex];
if (slot->attachment != self->attachment) return; if (slot->attachment != self->attachment) return;
if (time < self->frames[0]) { if (time < self->frames[0]) return; /* Time is before first frame. */
slot->attachmentVerticesCount = 0;
return; /* Time is before first frame. */
}
if (slot->attachmentVerticesCount < self->frameVerticesCount) { if (slot->attachmentVerticesCount < self->frameVerticesCount) {
if (slot->attachmentVerticesCapacity < self->frameVerticesCount) { if (slot->attachmentVerticesCapacity < self->frameVerticesCount) {

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

@ -571,10 +571,7 @@ namespace Spine {
if (slot.attachment != attachment) return; if (slot.attachment != attachment) return;
float[] frames = this.frames; float[] frames = this.frames;
if (time < frames[0]) { if (time < frames[0]) return; // Time is before first frame.
slot.attachmentVerticesCount = 0;
return; // Time is before first frame.
}
float[][] frameVertices = this.frameVertices; float[][] frameVertices = this.frameVertices;
int vertexCount = frameVertices[0].Length; int vertexCount = frameVertices[0].Length;

5
spine-js/spine.js
View File

@ -774,10 +774,7 @@ spine.FfdTimeline.prototype = {
if (slot.attachment != attachment) return; if (slot.attachment != attachment) return;
var frames = this.frames; var frames = this.frames;
if (time < frames[0]) { if (time < frames[0]) return; // Time is before first frame.
slot.attachmentVertices.length = 0;
return; // Time is before first frame.
}
var frameVertices = this.frameVertices; var frameVertices = this.frameVertices;
var vertexCount = frameVertices[0].length; var vertexCount = frameVertices[0].length;