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

[c] Fixed yDown behaviour in Bone, fixed spSkeleton_updateCache.

Browse Source
This commit is contained in:
badlogic 2016-10-19 12:46:58 +02:00
parent 5a6aa972ec
commit fc373f9791
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/src/spine/Bone.c
View File

@ -189,7 +189,7 @@ void spBone_updateWorldTransformWith (spBone* self, float x, float y, float rota
CONST_CAST(float, self->a) = -self->a; CONST_CAST(float, self->a) = -self->a;
CONST_CAST(float, self->b) = -self->b; CONST_CAST(float, self->b) = -self->b;
} }
if (self->skeleton->flipY) { if (self->skeleton->flipY != yDown) {
CONST_CAST(float, self->c) = -self->c; CONST_CAST(float, self->c) = -self->c;
CONST_CAST(float, self->d) = -self->d; CONST_CAST(float, self->d) = -self->d;
} }

13
spine-c/src/spine/Skeleton.c
View File

@ -174,7 +174,7 @@ static void _addToUpdateCacheReset(_spSkeleton* const internal, spBone* bone) {
internal->updateCacheResetCapacity *= 2; internal->updateCacheResetCapacity *= 2;
internal->updateCacheReset = realloc(internal->updateCacheReset, sizeof(spBone*) * internal->updateCacheResetCapacity); internal->updateCacheReset = realloc(internal->updateCacheReset, sizeof(spBone*) * internal->updateCacheResetCapacity);
} }
internal->updateCacheReset[internal->updateCacheResetCount++] = bone; internal->updateCacheReset[internal->updateCacheResetCount] = bone;
++internal->updateCacheResetCount; ++internal->updateCacheResetCount;
} }
@ -244,7 +244,8 @@ static void _sortIkConstraint (_spSkeleton* const internal, spIkConstraint* cons
break; break;
} }
} }
if (!contains) _addToUpdateCacheReset(internal, child); if (!contains)
_addToUpdateCacheReset(internal, child);
} }
_addToUpdateCache(internal, SP_UPDATE_IK_CONSTRAINT, constraint); _addToUpdateCache(internal, SP_UPDATE_IK_CONSTRAINT, constraint);
@ -331,11 +332,14 @@ void spSkeleton_updateCache (spSkeleton* self) {
ikCount = self->ikConstraintsCount; transformCount = self->transformConstraintsCount; pathCount = self->pathConstraintsCount; ikCount = self->ikConstraintsCount; transformCount = self->transformConstraintsCount; pathCount = self->pathConstraintsCount;
constraintCount = ikCount + transformCount + pathCount; constraintCount = ikCount + transformCount + pathCount;
for (i = 0; i < constraintCount; i++) { i = 0;
outer:
for (; i < constraintCount; i++) {
for (ii = 0; ii < ikCount; ii++) { for (ii = 0; ii < ikCount; ii++) {
spIkConstraint* ikConstraint = ikConstraints[ii]; spIkConstraint* ikConstraint = ikConstraints[ii];
if (ikConstraint->data->order == i) { if (ikConstraint->data->order == i) {
_sortIkConstraint(internal, ikConstraint); _sortIkConstraint(internal, ikConstraint);
i++;
goto outer; goto outer;
} }
} }
@ -344,6 +348,7 @@ void spSkeleton_updateCache (spSkeleton* self) {
spTransformConstraint* transformConstraint = transformConstraints[ii]; spTransformConstraint* transformConstraint = transformConstraints[ii];
if (transformConstraint->data->order == i) { if (transformConstraint->data->order == i) {
_sortTransformConstraint(internal, transformConstraint); _sortTransformConstraint(internal, transformConstraint);
i++;
goto outer; goto outer;
} }
} }
@ -352,11 +357,11 @@ void spSkeleton_updateCache (spSkeleton* self) {
spPathConstraint* pathConstraint = pathConstraints[ii]; spPathConstraint* pathConstraint = pathConstraints[ii];
if (pathConstraint->data->order == i) { if (pathConstraint->data->order == i) {
_sortPathConstraint(internal, pathConstraint); _sortPathConstraint(internal, pathConstraint);
i++;
goto outer; goto outer;
} }
} }
} }
outer:
for (i = 0; i < self->bonesCount; ++i) for (i = 0; i < self->bonesCount; ++i)
_sortBone(internal, self->bones[i]); _sortBone(internal, self->bones[i]);