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] Port of commit 8290353. Fix for hold previous on 3+ animations causing dipping. See #1738.

Browse Source
This commit is contained in:
badlogic 2020-08-13 14:41:50 +02:00
parent c0d8f1cece
commit 0f8ffd6ba6
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spine-lua/AnimationState.lua
View File

@ -52,8 +52,9 @@ end
local EMPTY_ANIMATION = Animation.new("<empty>", {}, 0) local EMPTY_ANIMATION = Animation.new("<empty>", {}, 0)
local SUBSEQUENT = 0 local SUBSEQUENT = 0
local FIRST = 1 local FIRST = 1
local HOLD = 2 local HOLD_SUBSEQUENT = 2
local HOLD_MIX = 3 local HOLD_FIRST = 3
local HOLD_MIX = 4
local SETUP = 1 local SETUP = 1
local CURRENT = 2 local CURRENT = 2
@ -466,7 +467,10 @@ function AnimationState:applyMixingFrom (to, skeleton, blend)
elseif timelineMode[i] == FIRST then elseif timelineMode[i] == FIRST then
timelineBlend = MixBlend.setup timelineBlend = MixBlend.setup
alpha = alphaMix alpha = alphaMix
elseif timelineMode[i] == HOLD then elseif timelineMode[i] == HOLD_SUBSEQUENT then
timelineBlend = blend
alpha = alphaHold
elseif timelineMode[i] == HOLD_FIRST then
timelineBlend = MixBlend.setup timelineBlend = MixBlend.setup
alpha = alphaHold alpha = alphaHold
else else
@ -932,8 +936,10 @@ function AnimationState:computeHold(entry)
local id = "" .. timelines[i]:getPropertyId() local id = "" .. timelines[i]:getPropertyId()
if propertyIDs[id] == nil then if propertyIDs[id] == nil then
propertyIDs[id] = id propertyIDs[id] = id
timelineMode[i] = HOLD_FIRST
else
timelineMode[i] = HOLD_SUBSEQUENT
end end
timelineMode[i] = HOLD
end end
return return
end end
@ -966,7 +972,7 @@ function AnimationState:computeHold(entry)
end end
next = next.mixingTo next = next.mixingTo
end end
if not skip then timelineMode[i] = HOLD end if not skip then timelineMode[i] = HOLD_FIRST end
end end
end end
i = i + 1 i = i + 1