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

[c] Ported scale mixing fix, see #2028.

Browse Source
This commit is contained in:
Mario Zechner 2022-01-26 20:36:10 +01:00
parent 0744b4c12d
commit c8fe2c884b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spine-c/spine-c/src/spine/Animation.c
View File

@ -655,8 +655,8 @@ void _spScaleTimeline_apply(spTimeline *timeline, spSkeleton *skeleton, float la
bone->scaleY = by + (ABS(y) * SIGNUM(by) - by) * alpha; bone->scaleY = by + (ABS(y) * SIGNUM(by) - by) * alpha;
break; break;
case SP_MIX_BLEND_ADD: case SP_MIX_BLEND_ADD:
bone->scaleX = (x - bone->data->scaleX) * alpha; bone->scaleX += (x - bone->data->scaleX) * alpha;
bone->scaleY = (y - bone->data->scaleY) * alpha; bone->scaleY += (y - bone->data->scaleY) * alpha;
} }
} else { } else {
switch (blend) { switch (blend) {
@ -748,7 +748,7 @@ void _spScaleXTimeline_apply(spTimeline *timeline, spSkeleton *skeleton, float l
bone->scaleX = bx + (ABS(x) * SIGNUM(bx) - bx) * alpha; bone->scaleX = bx + (ABS(x) * SIGNUM(bx) - bx) * alpha;
break; break;
case SP_MIX_BLEND_ADD: case SP_MIX_BLEND_ADD:
bone->scaleX = (x - bone->data->scaleX) * alpha; bone->scaleX += (x - bone->data->scaleX) * alpha;
} }
} else { } else {
switch (blend) { switch (blend) {
@ -834,7 +834,7 @@ void _spScaleYTimeline_apply(spTimeline *timeline, spSkeleton *skeleton, float l
bone->scaleY = by + (ABS(y) * SIGNUM(by) - by) * alpha; bone->scaleY = by + (ABS(y) * SIGNUM(by) - by) * alpha;
break; break;
case SP_MIX_BLEND_ADD: case SP_MIX_BLEND_ADD:
bone->scaleY = (y - bone->data->scaleY) * alpha; bone->scaleY += (y - bone->data->scaleY) * alpha;
} }
} else { } else {
switch (blend) { switch (blend) {
@ -1756,7 +1756,7 @@ void _spDeformTimeline_apply(
spTimeline *timeline, spSkeleton *skeleton, float lastTime, float time, spEvent **firedEvents, spTimeline *timeline, spSkeleton *skeleton, float lastTime, float time, spEvent **firedEvents,
int *eventsCount, float alpha, spMixBlend blend, spMixDirection direction) { int *eventsCount, float alpha, spMixBlend blend, spMixDirection direction) {
int frame, i, vertexCount; int frame, i, vertexCount;
float percent, frameTime; float percent;
const float *prevVertices; const float *prevVertices;
const float *nextVertices; const float *nextVertices;
float *frames; float *frames;
@ -1892,7 +1892,6 @@ void _spDeformTimeline_apply(
percent = _spDeformTimeline_getCurvePercent(self, time, frame); percent = _spDeformTimeline_getCurvePercent(self, time, frame);
prevVertices = frameVertices[frame]; prevVertices = frameVertices[frame];
nextVertices = frameVertices[frame + 1]; nextVertices = frameVertices[frame + 1];
frameTime = frames[frame];
if (alpha == 1) { if (alpha == 1) {
if (blend == SP_MIX_BLEND_ADD) { if (blend == SP_MIX_BLEND_ADD) {