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

[c][cpp] Ported active bone check in SkeletonBounds. See #1378.

Browse Source
This commit is contained in:
badlogic 2019-06-11 15:31:42 +02:00
parent f2fa37dbe0
commit d790429cd1
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spine-c/spine-c/src/spine/SkeletonBounds.c
View File

@ -129,6 +129,7 @@ void spSkeletonBounds_update (spSkeletonBounds* self, spSkeleton* skeleton, int/
spBoundingBoxAttachment* boundingBox; spBoundingBoxAttachment* boundingBox;
spSlot* slot = skeleton->slots[i]; spSlot* slot = skeleton->slots[i];
if (!slot->bone->active) continue;
spAttachment* attachment = slot->attachment; spAttachment* attachment = slot->attachment;
if (!attachment || attachment->type != SP_ATTACHMENT_BOUNDING_BOX) continue; if (!attachment || attachment->type != SP_ATTACHMENT_BOUNDING_BOX) continue;
boundingBox = (spBoundingBoxAttachment*)attachment; boundingBox = (spBoundingBoxAttachment*)attachment;

3
spine-cpp/spine-cpp/src/spine/SkeletonBounds.cpp
View File

@ -34,6 +34,7 @@
#include <spine/SkeletonBounds.h> #include <spine/SkeletonBounds.h>
#include <spine/Skeleton.h> #include <spine/Skeleton.h>
#include <spine/Bone.h>
#include <spine/BoundingBoxAttachment.h> #include <spine/BoundingBoxAttachment.h>
#include <spine/Slot.h> #include <spine/Slot.h>
@ -56,6 +57,8 @@ void SkeletonBounds::update(Skeleton &skeleton, bool updateAabb) {
for (size_t i = 0; i < slotCount; i++) { for (size_t i = 0; i < slotCount; i++) {
Slot *slot = slots[i]; Slot *slot = slots[i];
if (!slot->getBone().isActive()) continue;
Attachment *attachment = slot->getAttachment(); Attachment *attachment = slot->getAttachment();
if (attachment == NULL || !attachment->getRTTI().instanceOf(BoundingBoxAttachment::rtti)) { if (attachment == NULL || !attachment->getRTTI().instanceOf(BoundingBoxAttachment::rtti)) {
continue; continue;