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

[cpp] Fix ambiguities with Carbon on macOS

Browse Source
This commit is contained in:
Mario Zechner 2025-09-10 12:43:38 +02:00
parent b37ee6fb6f
commit b5d6f1e427
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/src/spine/AnimationState.cpp
View File

@ -46,7 +46,7 @@
using namespace spine; using namespace spine;
void dummyOnAnimationEventFunc(AnimationState *state, EventType type, TrackEntry *entry, Event *event, void *userData) { void dummyOnAnimationEventFunc(AnimationState *state, spine::EventType type, TrackEntry *entry, Event *event, void *userData) {
SP_UNUSED(state); SP_UNUSED(state);
SP_UNUSED(type); SP_UNUSED(type);
SP_UNUSED(entry); SP_UNUSED(entry);

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

@ -178,17 +178,17 @@ bool SkeletonBounds::intersectsSegment(Polygon &polygon, float x1, float y1, flo
return false; return false;
} }
Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) { spine::Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) {
int index = _boundingBoxes.indexOf(attachment); int index = _boundingBoxes.indexOf(attachment);
return index == -1 ? NULL : _polygons[index]; return index == -1 ? NULL : _polygons[index];
} }
BoundingBoxAttachment *SkeletonBounds::getBoundingBox(Polygon *polygon) { BoundingBoxAttachment *SkeletonBounds::getBoundingBox(spine::Polygon *polygon) {
int index = _polygons.indexOf(polygon); int index = _polygons.indexOf(polygon);
return index == -1 ? NULL : _boundingBoxes[index]; return index == -1 ? NULL : _boundingBoxes[index];
} }
Array<Polygon *> &SkeletonBounds::getPolygons() { Array<spine::Polygon *> &SkeletonBounds::getPolygons() {
return _polygons; return _polygons;
} }