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

Merge branch '3.8-beta' into skin-bones

Browse Source
This commit is contained in:
badlogic 2019-05-28 14:21:52 +02:00
commit 07adb9d268
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-lua/AnimationState.lua
View File

@ -326,7 +326,6 @@ function AnimationState:apply (skeleton)
if skeleton == nil then error("skeleton cannot be null.", 2) end if skeleton == nil then error("skeleton cannot be null.", 2) end
if self.animationsChanged then self:_animationsChanged() end if self.animationsChanged then self:_animationsChanged() end
local events = self.events
local tracks = self.tracks local tracks = self.tracks
local queue = self.queue local queue = self.queue
local applied = false local applied = false
@ -352,7 +351,7 @@ function AnimationState:apply (skeleton)
local timelines = current.animation.timelines local timelines = current.animation.timelines
if (i == 0 and mix == 1) or blend == MixBlend.add then if (i == 0 and mix == 1) or blend == MixBlend.add then
for i,timeline in ipairs(timelines) do for i,timeline in ipairs(timelines) do
timeline:apply(skeleton, animationLast, animationTime, events, mix, blend, MixDirection._in) timeline:apply(skeleton, animationLast, animationTime, self.events, mix, blend, MixDirection._in)
end end
else else
local timelineMode = current.timelineMode local timelineMode = current.timelineMode
@ -367,13 +366,12 @@ function AnimationState:apply (skeleton)
self:applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii * 2, self:applyRotateTimeline(timeline, skeleton, animationTime, mix, timelineBlend, timelinesRotation, ii * 2,
firstFrame) firstFrame)
else else
timeline:apply(skeleton, animationLast, animationTime, events, mix, timelineBlend, MixDirection._in) timeline:apply(skeleton, animationLast, animationTime, self.events, mix, timelineBlend, MixDirection._in)
end end
end end
end end
self:queueEvents(current, animationTime) self:queueEvents(current, animationTime)
self.events = {}; self.events = {};
events = self.events;
current.nextAnimationLast = animationTime current.nextAnimationLast = animationTime
current.nextTrackLast = current.trackTime current.nextTrackLast = current.trackTime
end end
@ -460,13 +458,15 @@ function AnimationState:applyMixingFrom (to, skeleton, blend)
if drawOrder then direction = MixDirection._in end if drawOrder then direction = MixDirection._in end
end end
end end
timeline:apply(skeleton, animationLast, animationTime, events, alpha, timelineBlend, direction) timeline:apply(skeleton, animationLast, animationTime, self.events, alpha, timelineBlend, direction)
end end
end end
end end
end end
if (to.mixDuration > 0) then self:queueEvents(from, animationTime) end if (to.mixDuration > 0) then
self:queueEvents(from, animationTime)
end
self.events = {}; self.events = {};
from.nextAnimationLast = animationTime from.nextAnimationLast = animationTime
from.nextTrackLast = from.trackTime from.nextTrackLast = from.trackTime