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

Changed bone sorting so transform behavior is consistent when IK and transform constraints are mixed. (#550)

Browse Source 
based on : b0eec6f411
This commit is contained in:
John 2016-04-15 03:45:34 +08:00 committed by Nathan Sweet
parent 47f79b7a8d
commit f65ca667b3
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,22 +143,15 @@ void spSkeleton_updateCache (const spSkeleton* self) {
FREE(internal->updateCache); FREE(internal->updateCache);
FREE(internal->updateCacheType); FREE(internal->updateCacheType);
internal->updateCache = MALLOC(void*, self->bonesCount + self->transformConstraintsCount + self->ikConstraintsCount); int capacity = self->bonesCount + self->transformConstraintsCount + self->ikConstraintsCount;
internal->updateCacheType = MALLOC(_spUpdateType, self->bonesCount + self->transformConstraintsCount + self->ikConstraintsCount); internal->updateCache = MALLOC(void*, capacity);
internal->updateCacheType = MALLOC(_spUpdateType, capacity);
internal->updateCacheCount = 0; internal->updateCacheCount = 0;
for (i = 0; i < self->bonesCount; ++i) { for (i = 0; i < self->bonesCount; ++i) {
spBone* bone = self->bones[i]; spBone* bone = self->bones[i];
internal->updateCache[internal->updateCacheCount] = bone; internal->updateCache[internal->updateCacheCount] = bone;
internal->updateCacheType[internal->updateCacheCount++] = SP_UPDATE_BONE; internal->updateCacheType[internal->updateCacheCount++] = SP_UPDATE_BONE;
for (ii = 0; ii < self->transformConstraintsCount; ++ii) {
spTransformConstraint* transformConstraint = self->transformConstraints[ii];
if (bone == transformConstraint->bone) {
internal->updateCache[internal->updateCacheCount] = transformConstraint;
internal->updateCacheType[internal->updateCacheCount++] = SP_UPDATE_TRANSFORM_CONSTRAINT;
break;
}
}
for (ii = 0; ii < self->ikConstraintsCount; ++ii) { for (ii = 0; ii < self->ikConstraintsCount; ++ii) {
spIkConstraint* ikConstraint = self->ikConstraints[ii]; spIkConstraint* ikConstraint = self->ikConstraints[ii];
if (bone == ikConstraint->bones[ikConstraint->bonesCount - 1]) { if (bone == ikConstraint->bones[ikConstraint->bonesCount - 1]) {
@ -168,6 +161,23 @@ void spSkeleton_updateCache (const spSkeleton* self) {
} }
} }
} }
for (i = 0; i < self->transformConstraintsCount; ++i) {
spTransformConstraint* transformConstraint = self->transformConstraints[i];
for (ii = internal->updateCacheCount - 1; ii >= 0; --ii) {
void* updatable = internal->updateCache[ii];
if (updatable == transformConstraint->bone || updatable == transformConstraint->target) {
int insertIndex = ii + 1;
int moveCount = (capacity-2) - insertIndex;
memmove(internal->updateCache + (insertIndex+1), internal->updateCache + insertIndex, moveCount * sizeof(void*));
memmove(internal->updateCacheType + (insertIndex+1), internal->updateCacheType + insertIndex, moveCount * sizeof(_spUpdateType));
internal->updateCacheCount++;
internal->updateCache[insertIndex] = transformConstraint;
internal->updateCacheType[insertIndex] = SP_UPDATE_TRANSFORM_CONSTRAINT;
break;
}
}
}
} }
void spSkeleton_updateWorldTransform (const spSkeleton* self) { void spSkeleton_updateWorldTransform (const spSkeleton* self) {