diff --git a/spine-cpp/src/spine/AnimationState.cpp b/spine-cpp/src/spine/AnimationState.cpp index c9e615739..3ee17fd59 100644 --- a/spine-cpp/src/spine/AnimationState.cpp +++ b/spine-cpp/src/spine/AnimationState.cpp @@ -46,7 +46,7 @@ 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(type); SP_UNUSED(entry); diff --git a/spine-cpp/src/spine/SkeletonBounds.cpp b/spine-cpp/src/spine/SkeletonBounds.cpp index 738b05e08..66e26c520 100644 --- a/spine-cpp/src/spine/SkeletonBounds.cpp +++ b/spine-cpp/src/spine/SkeletonBounds.cpp @@ -178,17 +178,17 @@ bool SkeletonBounds::intersectsSegment(Polygon &polygon, float x1, float y1, flo return false; } -Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) { +spine::Polygon *SkeletonBounds::getPolygon(BoundingBoxAttachment *attachment) { int index = _boundingBoxes.indexOf(attachment); return index == -1 ? NULL : _polygons[index]; } -BoundingBoxAttachment *SkeletonBounds::getBoundingBox(Polygon *polygon) { +BoundingBoxAttachment *SkeletonBounds::getBoundingBox(spine::Polygon *polygon) { int index = _polygons.indexOf(polygon); return index == -1 ? NULL : _boundingBoxes[index]; } -Array &SkeletonBounds::getPolygons() { +Array &SkeletonBounds::getPolygons() { return _polygons; }