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

[lua] Ported latest AnimationState changes. See #792

Browse Source
This commit is contained in:
badlogic 2016-12-02 15:42:31 +01:00
parent ee9b03bc9d
commit 8e9d54b3ad
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-lua/AnimationState.lua
View File

@ -541,7 +541,7 @@ function AnimationState:setCurrent (index, current, interrupt)
from.timelinesRotation = {}; from.timelinesRotation = {};
-- If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero. -- If not completely mixed in, set mixAlpha so mixing out happens from current mix to zero.
if from.mixingFrom then current.mixAlpha = current.mixAlpha * math_min(from.mixTime / from.mixDuration, 1) end if from.mixingFrom and from.mixDuration > 0 then current.mixAlpha = current.mixAlpha * math_min(from.mixTime / from.mixDuration, 1) end
end end
queue:start(current) queue:start(current)
@ -665,11 +665,7 @@ function AnimationState:trackEntry (trackIndex, animation, loop, last)
entry.trackTime = 0 entry.trackTime = 0
entry.trackLast = -1 entry.trackLast = -1
entry.nextTrackLast = -1 entry.nextTrackLast = -1
if loop then entry.trackEnd = 999999999
entry.trackEnd = 999999999
else
entry.trackEnd = entry.animationEnd
end
entry.timeScale = 1 entry.timeScale = 1
entry.alpha = 1 entry.alpha = 1