Bläddra i källkod

Renamed clearAnimation to clearTracks.

NathanSweet 12 år sedan
förälder
incheckning
4852fdca14

+ 1 - 1
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. */

+ 1 - 1
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);

+ 2 - 2
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;
 

+ 3 - 3
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);
 }
 

+ 3 - 3
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);
 }
 

+ 2 - 2
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);