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

[lua] Ported new fix for 0 timeScale not returning to setup pose. See #1194.

Browse Source
This commit is contained in:
badlogic 2018-10-30 16:23:30 +01:00
parent 32f6e449fc
commit d71d5a390e
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spine-lua/AnimationState.lua
View File

@ -249,11 +249,11 @@ function AnimationState:update (delta)
local nextTime = current.trackLast - _next.delay local nextTime = current.trackLast - _next.delay
if nextTime >= 0 then if nextTime >= 0 then
_next.delay = 0 _next.delay = 0
_next.trackTime = nextTime + delta * _next.timeScale _next.trackTime = (nextTime / current.timeScale + delta) * _next.timeScale
current.trackTime = current.trackTime + currentDelta current.trackTime = current.trackTime + currentDelta
self:setCurrent(i, _next, true) self:setCurrent(i, _next, true)
while _next.mixingFrom do while _next.mixingFrom do
_next.mixTime = _next.mixTime + currentDelta _next.mixTime = _next.mixTime + delta
_next = _next.mixingFrom _next = _next.mixingFrom
end end
skip = true skip = true
@ -310,15 +310,8 @@ function AnimationState:updateMixingFrom (to, delta)
return finished return finished
end end
-- If to has 0 timeScale and is not the first entry, remove the mix and apply it one more time to return to the setup pose.
if to.timeScale == 0 and to.mixingTo then
to.timeScale = 1
to.mixTime = 0
to.mixDuration = 0
end
from.trackTime = from.trackTime + delta * from.timeScale from.trackTime = from.trackTime + delta * from.timeScale
to.mixTime = to.mixTime + delta * to.timeScale to.mixTime = to.mixTime + delta
return false; return false;
end end