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

Renamed clearAnimation to clearTracks.

Browse Source
This commit is contained in:
NathanSweet 2013-09-28 20:33:56 +02:00
parent 10fa956f39
commit 4852fdca14
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-c/include/spine/AnimationState.h
View File

@ -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. */

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

@ -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);

4
spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.h
View File

@ -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;

6
spine-cocos2d-iphone/src/spine/CCSkeletonAnimation.m
View File

@ -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);
}

6
spine-cocos2dx/src/spine/CCSkeletonAnimation.cpp
View File

@ -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);
}

4
spine-cocos2dx/src/spine/CCSkeletonAnimation.h
View File

@ -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);