From 78e4222341a644a949f24a2feab95b1ebbf2b224 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Sat, 17 May 2014 20:47:28 +0200 Subject: [PATCH] Clean up. --- .../2/src/spine/SkeletonAnimation.cpp | 25 +++++++++++++------ .../2/src/spine/SkeletonAnimation.h | 7 ------ .../3.0/src/spine/SkeletonAnimation.cpp | 25 +++++++++++++------ .../3.0/src/spine/SkeletonAnimation.h | 7 ------ .../3.1/src/spine/SkeletonAnimation.cpp | 25 +++++++++++++------ .../3.1/src/spine/SkeletonAnimation.h | 7 ------ 6 files changed, 51 insertions(+), 45 deletions(-) diff --git a/spine-cocos2dx/2/src/spine/SkeletonAnimation.cpp b/spine-cocos2dx/2/src/spine/SkeletonAnimation.cpp index c08c7bc8a..0e729947b 100644 --- a/spine-cocos2dx/2/src/spine/SkeletonAnimation.cpp +++ b/spine-cocos2dx/2/src/spine/SkeletonAnimation.cpp @@ -48,11 +48,28 @@ void trackEntryCallback (spAnimationState* state, int trackIndex, spEventType ty ((SkeletonAnimation*)state->rendererObject)->onTrackEntryEvent(trackIndex, type, event, loopCount); } +typedef struct _TrackEntryListeners { + StartListener startListener; + EndListener endListener; + CompleteListener completeListener; + EventListener eventListener; +} _TrackEntryListeners; + +static _TrackEntryListeners* getListeners (spTrackEntry* entry) { + if (!entry->rendererObject) { + entry->rendererObject = NEW(spine::_TrackEntryListeners); + entry->listener = trackEntryCallback; + } + return (_TrackEntryListeners*)entry->rendererObject; +} + void disposeTrackEntry (spAnimationState* self, spTrackEntry* entry) { if (entry->rendererObject) FREE(entry->rendererObject); _spTrackEntry_dispose(entry); } +// + SkeletonAnimation* SkeletonAnimation::createWithData (spSkeletonData* skeletonData) { SkeletonAnimation* node = new SkeletonAnimation(skeletonData); node->autorelease(); @@ -193,14 +210,6 @@ void SkeletonAnimation::onTrackEntryEvent (int trackIndex, spEventType type, spE } } -static _TrackEntryListeners* getListeners (spTrackEntry* entry) { - if (!entry->rendererObject) { - entry->rendererObject = NEW(spine::_TrackEntryListeners); - entry->listener = trackEntryCallback; - } - return (_TrackEntryListeners*)entry->rendererObject; -} - void SkeletonAnimation::setStartListener (spTrackEntry* entry, StartListener listener) { getListeners(entry)->startListener = listener; } diff --git a/spine-cocos2dx/2/src/spine/SkeletonAnimation.h b/spine-cocos2dx/2/src/spine/SkeletonAnimation.h index bede0fd3f..ce5da45bb 100644 --- a/spine-cocos2dx/2/src/spine/SkeletonAnimation.h +++ b/spine-cocos2dx/2/src/spine/SkeletonAnimation.h @@ -42,13 +42,6 @@ typedef std::function EndListener; typedef std::function CompleteListener; typedef std::function EventListener; -typedef struct _TrackEntryListeners { - StartListener startListener; - EndListener endListener; - CompleteListener completeListener; - EventListener eventListener; -} _TrackEntryListeners; - /** Draws an animated skeleton, providing an AnimationState for applying one or more animations and queuing animations to be * played later. */ class SkeletonAnimation: public SkeletonRenderer { diff --git a/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.cpp b/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.cpp index baedb69e9..fbf85529e 100644 --- a/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.cpp +++ b/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.cpp @@ -48,11 +48,28 @@ void trackEntryCallback (spAnimationState* state, int trackIndex, spEventType ty ((SkeletonAnimation*)state->rendererObject)->onTrackEntryEvent(trackIndex, type, event, loopCount); } +typedef struct _TrackEntryListeners { + StartListener startListener; + EndListener endListener; + CompleteListener completeListener; + EventListener eventListener; +} _TrackEntryListeners; + +static _TrackEntryListeners* getListeners (spTrackEntry* entry) { + if (!entry->rendererObject) { + entry->rendererObject = NEW(spine::_TrackEntryListeners); + entry->listener = trackEntryCallback; + } + return (_TrackEntryListeners*)entry->rendererObject; +} + void disposeTrackEntry (spAnimationState* self, spTrackEntry* entry) { if (entry->rendererObject) FREE(entry->rendererObject); _spTrackEntry_dispose(entry); } +// + SkeletonAnimation* SkeletonAnimation::createWithData (spSkeletonData* skeletonData) { SkeletonAnimation* node = new SkeletonAnimation(skeletonData); node->autorelease(); @@ -193,14 +210,6 @@ void SkeletonAnimation::onTrackEntryEvent (int trackIndex, spEventType type, spE } } -static _TrackEntryListeners* getListeners (spTrackEntry* entry) { - if (!entry->rendererObject) { - entry->rendererObject = NEW(spine::_TrackEntryListeners); - entry->listener = trackEntryCallback; - } - return (_TrackEntryListeners*)entry->rendererObject; -} - void SkeletonAnimation::setStartListener (spTrackEntry* entry, StartListener listener) { getListeners(entry)->startListener = listener; } diff --git a/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.h b/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.h index bede0fd3f..ce5da45bb 100644 --- a/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.h +++ b/spine-cocos2dx/3.0/src/spine/SkeletonAnimation.h @@ -42,13 +42,6 @@ typedef std::function EndListener; typedef std::function CompleteListener; typedef std::function EventListener; -typedef struct _TrackEntryListeners { - StartListener startListener; - EndListener endListener; - CompleteListener completeListener; - EventListener eventListener; -} _TrackEntryListeners; - /** Draws an animated skeleton, providing an AnimationState for applying one or more animations and queuing animations to be * played later. */ class SkeletonAnimation: public SkeletonRenderer { diff --git a/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.cpp b/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.cpp index baedb69e9..fbf85529e 100644 --- a/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.cpp +++ b/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.cpp @@ -48,11 +48,28 @@ void trackEntryCallback (spAnimationState* state, int trackIndex, spEventType ty ((SkeletonAnimation*)state->rendererObject)->onTrackEntryEvent(trackIndex, type, event, loopCount); } +typedef struct _TrackEntryListeners { + StartListener startListener; + EndListener endListener; + CompleteListener completeListener; + EventListener eventListener; +} _TrackEntryListeners; + +static _TrackEntryListeners* getListeners (spTrackEntry* entry) { + if (!entry->rendererObject) { + entry->rendererObject = NEW(spine::_TrackEntryListeners); + entry->listener = trackEntryCallback; + } + return (_TrackEntryListeners*)entry->rendererObject; +} + void disposeTrackEntry (spAnimationState* self, spTrackEntry* entry) { if (entry->rendererObject) FREE(entry->rendererObject); _spTrackEntry_dispose(entry); } +// + SkeletonAnimation* SkeletonAnimation::createWithData (spSkeletonData* skeletonData) { SkeletonAnimation* node = new SkeletonAnimation(skeletonData); node->autorelease(); @@ -193,14 +210,6 @@ void SkeletonAnimation::onTrackEntryEvent (int trackIndex, spEventType type, spE } } -static _TrackEntryListeners* getListeners (spTrackEntry* entry) { - if (!entry->rendererObject) { - entry->rendererObject = NEW(spine::_TrackEntryListeners); - entry->listener = trackEntryCallback; - } - return (_TrackEntryListeners*)entry->rendererObject; -} - void SkeletonAnimation::setStartListener (spTrackEntry* entry, StartListener listener) { getListeners(entry)->startListener = listener; } diff --git a/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.h b/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.h index bede0fd3f..ce5da45bb 100644 --- a/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.h +++ b/spine-cocos2dx/3.1/src/spine/SkeletonAnimation.h @@ -42,13 +42,6 @@ typedef std::function EndListener; typedef std::function CompleteListener; typedef std::function EventListener; -typedef struct _TrackEntryListeners { - StartListener startListener; - EndListener endListener; - CompleteListener completeListener; - EventListener eventListener; -} _TrackEntryListeners; - /** Draws an animated skeleton, providing an AnimationState for applying one or more animations and queuing animations to be * played later. */ class SkeletonAnimation: public SkeletonRenderer {