diff --git a/spine-c/include/spine/AnimationState.h b/spine-c/include/spine/AnimationState.h index 8e13f18fe..bf07efe20 100644 --- a/spine-c/include/spine/AnimationState.h +++ b/spine-c/include/spine/AnimationState.h @@ -77,7 +77,7 @@ void AnimationState_dispose (AnimationState* self); void AnimationState_update (AnimationState* self, float delta); void AnimationState_apply (AnimationState* self, struct Skeleton* skeleton); -void AnimationState_clear (AnimationState* self); +void AnimationState_clearTracks (AnimationState* self); void AnimationState_clearTrack (AnimationState* self, int trackIndex); /** Set the current animation. Any queued animations are cleared. */ diff --git a/spine-c/src/spine/AnimationState.c b/spine-c/src/spine/AnimationState.c index 2217693eb..3ea4c0574 100644 --- a/spine-c/src/spine/AnimationState.c +++ b/spine-c/src/spine/AnimationState.c @@ -157,7 +157,7 @@ void AnimationState_apply (AnimationState* self, Skeleton* skeleton) { } } -void AnimationState_clear (AnimationState* self) { +void AnimationState_clearTracks (AnimationState* self) { int i; for (i = 0; i < self->trackCount; i++) AnimationState_clearTrack(self, i); diff --git a/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h b/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h index d12492a67..53a39c793 100644 --- a/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h +++ b/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h @@ -70,8 +70,8 @@ - (TrackEntry*) setAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop; - (TrackEntry*) addAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop afterDelay:(int)delay; - (TrackEntry*) getCurrentForTrack:(int)trackIndex; -- (void) clearAnimation; -- (void) clearAnimationForTrack:(int)trackIndex; +- (void) clearTracks; +- (void) clearTrack:(int)trackIndex; - (void) onAnimationStateEvent:(int)trackIndex type:(EventType)type event:(Event*)event loopCount:(int)loopCount; diff --git a/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.m b/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.m index 3c659761d..185c519e7 100644 --- a/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.m +++ b/spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.m @@ -143,11 +143,11 @@ static void callback (AnimationState* state, int trackIndex, EventType type, Eve return AnimationState_getCurrent(_state, trackIndex); } -- (void) clearAnimation { - AnimationState_clear(_state); +- (void) clearTracks { + AnimationState_clearTracks(_state); } -- (void) clearAnimationForTrack:(int)trackIndex { +- (void) clearTrack:(int)trackIndex { AnimationState_clearTrack(_state, trackIndex); } diff --git a/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp b/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp index d5e5cf79e..6ab4e93ca 100644 --- a/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp +++ b/spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp @@ -135,11 +135,11 @@ TrackEntry* CCSkeletonAnimation::getCurrent (int trackIndex) { return AnimationState_getCurrent(state, trackIndex); } -void CCSkeletonAnimation::clearAnimation () { - AnimationState_clear(state); +void CCSkeletonAnimation::clearTracks () { + AnimationState_clearTracks(state); } -void CCSkeletonAnimation::clearAnimation (int trackIndex) { +void CCSkeletonAnimation::clearTrack (int trackIndex) { AnimationState_clearTrack(state, trackIndex); } diff --git a/spine-cocos2dx/src/spine/CCSkeletonAnimation.h b/spine-cocos2dx/src/spine/CCSkeletonAnimation.h index bfa6d9a6f..c852bd10c 100644 --- a/spine-cocos2dx/src/spine/CCSkeletonAnimation.h +++ b/spine-cocos2dx/src/spine/CCSkeletonAnimation.h @@ -69,8 +69,8 @@ public: TrackEntry* setAnimation (int trackIndex, const char* name, bool loop); TrackEntry* addAnimation (int trackIndex, const char* name, bool loop, float delay = 0); TrackEntry* getCurrent (int trackIndex = 0); - void clearAnimation (); - void clearAnimation (int trackIndex = 0); + void clearTracks (); + void clearTrack (int trackIndex = 0); void onAnimationStateEvent (int trackIndex, EventType type, Event* event, int loopCount);