[as3] Renames applyFFD in MeshAttachment to applyDeform. Fixes bug in AnimationState#applyMixingFrom, local events may be null. Closes #801

This commit is contained in:
badlogic 2016-12-12 09:38:32 +01:00
parent 31b5011acf
commit f5422f1950
6 changed files with 3 additions and 3 deletions

View File

@ -219,7 +219,7 @@ public class AnimationState {
} }
if (entry.mixDuration > 0) queueEvents(from, animationTime); if (entry.mixDuration > 0) queueEvents(from, animationTime);
events.length = 0; this.events.length = 0;
from.nextAnimationLast = animationTime; from.nextAnimationLast = animationTime;
from.nextTrackLast = from.trackTime; from.nextTrackLast = from.trackTime;

View File

@ -83,7 +83,7 @@ public dynamic class MeshAttachment extends VertexAttachment {
} }
} }
public function applyFFD (sourceAttachment:Attachment) : Boolean { override public function applyDeform (sourceAttachment:VertexAttachment) : Boolean {
return this == sourceAttachment || (inheritDeform && _parentMesh == sourceAttachment); return this == sourceAttachment || (inheritDeform && _parentMesh == sourceAttachment);
} }

View File

@ -42,7 +42,7 @@ public class Main extends Sprite {
var example:Class; var example:Class;
example = SpineboyExample; example = SpineboyExample;
// example = GoblinsExample; // example = GoblinsExample;
// example = RaptorExample; example = RaptorExample;
// example = TankExample; // example = TankExample;
// example = VineExample; // example = VineExample;
// example = StretchymanExample; // example = StretchymanExample;