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

[lua] Fix for rotation timelines in AnimationState

Browse Source
This commit is contained in:
badlogic 2016-11-29 13:18:55 +01:00
parent 6377618e3f
commit 7c59ef2f09
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spine-lua/AnimationState.lua
View File

@ -382,6 +382,8 @@ function AnimationState:applyMixingFrom (entry, skeleton)
end end
function AnimationState:applyRotateTimeline (timeline, skeleton, time, alpha, setupPose, timelinesRotation, i, firstFrame) function AnimationState:applyRotateTimeline (timeline, skeleton, time, alpha, setupPose, timelinesRotation, i, firstFrame)
if firstFrame then timelinesRotation[i] = 0 end
if alpha == 1 then if alpha == 1 then
timeline:apply(skeleton, 0, time, nil, 1, setupPose, false) timeline:apply(skeleton, 0, time, nil, 1, setupPose, false)
return return
@ -418,12 +420,7 @@ function AnimationState:applyRotateTimeline (timeline, skeleton, time, alpha, se
local total = 0 local total = 0
local diff = r2 - r1 local diff = r2 - r1
if diff == 0 then if diff == 0 then
if firstFrame then
timelinesRotation[i] = 0
total = 0
else
total = timelinesRotation[i] total = timelinesRotation[i]
end
else else
diff = diff - (16384 - math_floor(16384.499999999996 - diff / 360)) * 360 diff = diff - (16384 - math_floor(16384.499999999996 - diff / 360)) * 360
local lastTotal = 0 local lastTotal = 0
@ -541,6 +538,8 @@ function AnimationState:setCurrent (index, current, interrupt)
current.mixingFrom = from current.mixingFrom = from
current.mixTime = 0 current.mixTime = 0
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 then current.mixAlpha = current.mixAlpha * math_min(from.mixTime / from.mixDuration, 1) end
end end