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

[lua] Ported latest AnimationState changes

Browse Source
This commit is contained in:
badlogic 2016-11-28 16:40:38 +01:00
parent e2e6126592
commit 61c5c8f7a1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spine-lua/AnimationState.lua
View File

@ -240,7 +240,7 @@ function AnimationState:update (delta)
_next.delay = 0 _next.delay = 0
_next.trackTime = nextTime + delta * _next.timeScale _next.trackTime = nextTime + delta * _next.timeScale
current.trackTime = current.trackTime + currentDelta current.trackTime = current.trackTime + currentDelta
self:setCurrent(i, _next) self:setCurrent(i, _next, true)
while _next.mixingFrom do while _next.mixingFrom do
_next.mixTime = _next.mixTime + currentDelta _next.mixTime = _next.mixTime + currentDelta
_next = _next.mixingFrom _next = _next.mixingFrom
@ -530,14 +530,14 @@ function AnimationState:clearTrack (trackIndex)
queue:drain() queue:drain()
end end
function AnimationState:setCurrent (index, current) function AnimationState:setCurrent (index, current, interrupt)
local from = self:expandToIndex(index) local from = self:expandToIndex(index)
local tracks = self.tracks local tracks = self.tracks
local queue = self.queue local queue = self.queue
tracks[index] = current tracks[index] = current
if from then if from then
queue:interrupt(from) if interrupt then queue:interrupt(from) end
current.mixingFrom = from current.mixingFrom = from
current.mixTime = 0 current.mixTime = 0
@ -556,6 +556,7 @@ end
function AnimationState:setAnimation (trackIndex, animation, loop) function AnimationState:setAnimation (trackIndex, animation, loop)
if not animation then error("animation cannot be null.") end if not animation then error("animation cannot be null.") end
local interrupt = true;
local current = self:expandToIndex(trackIndex) local current = self:expandToIndex(trackIndex)
local queue = self.queue local queue = self.queue
if current then if current then
@ -566,12 +567,13 @@ function AnimationState:setAnimation (trackIndex, animation, loop)
queue:_end(current) queue:_end(current)
self:disposeNext(current) self:disposeNext(current)
current = current.mixingFrom current = current.mixingFrom
interrupt = false;
else else
self:disposeNext(current) self:disposeNext(current)
end end
end end
local entry = self:trackEntry(trackIndex, animation, loop, current) local entry = self:trackEntry(trackIndex, animation, loop, current)
self:setCurrent(trackIndex, entry) self:setCurrent(trackIndex, entry, interrupt)
queue:drain() queue:drain()
return entry return entry
end end
@ -597,7 +599,7 @@ function AnimationState:addAnimation (trackIndex, animation, loop, delay)
local data = self.data local data = self.data
if not last then if not last then
self:setCurrent(trackIndex, entry) self:setCurrent(trackIndex, entry, true)
queue:drain() queue:drain()
else else
last.next = entry last.next = entry