UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-02 05:39:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

[c] 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:22:49 +02:00
parent 0245a83a07
commit 6d833f36d1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spine-c/spine-c/src/spine/AnimationState.c
View File

@ -33,8 +33,9 @@
#define SUBSEQUENT 0 #define SUBSEQUENT 0
#define FIRST 1 #define FIRST 1
#define HOLD 2 #define HOLD_SUBSEQUENT 2
#define HOLD_MIX 3 #define HOLD_FIRST 3
#define HOLD_MIX 4
#define SETUP 1 #define SETUP 1
#define CURRENT 2 #define CURRENT 2
@ -501,7 +502,11 @@ float _spAnimationState_applyMixingFrom (spAnimationState* self, spTrackEntry* t
timelineBlend = SP_MIX_BLEND_SETUP; timelineBlend = SP_MIX_BLEND_SETUP;
alpha = alphaMix; alpha = alphaMix;
break; break;
case HOLD: case HOLD_SUBSEQUENT:
timelineBlend = blend;
alpha = alphaHold;
break;
case HOLD_FIRST:
timelineBlend = SP_MIX_BLEND_SETUP; timelineBlend = SP_MIX_BLEND_SETUP;
alpha = alphaHold; alpha = alphaHold;
break; break;
@ -1024,8 +1029,7 @@ void _spTrackEntry_computeHold(spTrackEntry* entry, spAnimationState* state) {
if (to != 0 && to->holdPrevious) { if (to != 0 && to->holdPrevious) {
for (i = 0; i < timelinesCount; i++) { for (i = 0; i < timelinesCount; i++) {
int id = spTimeline_getPropertyId(timelines[i]); int id = spTimeline_getPropertyId(timelines[i]);
_spAnimationState_addPropertyID(state, id); timelineMode[i] = _spAnimationState_addPropertyID(state, id) ? HOLD_FIRST : HOLD_SUBSEQUENT;
timelineMode[i] = HOLD;
} }
return; return;
} }
@ -1051,7 +1055,7 @@ void _spTrackEntry_computeHold(spTrackEntry* entry, spAnimationState* state) {
} }
break; break;
} }
timelineMode[i] = HOLD; timelineMode[i] = HOLD_FIRST;
} }
} }
} }