Skip to content

Added a way to stop the currently running animation. #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
x1024 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added a way to stop the currently running animation. #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CCBReader/CCBAnimationManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
- (void) runAnimationsForSequenceNamed:(NSString*)name tweenDuration:(float)tweenDuration;
- (void) runAnimationsForSequenceNamed:(NSString*)name;
- (void) runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuration;
- (void) stopRunningAnimation;

-(void) setCompletedAnimationCallbackBlock:(void(^)(id sender))b;

Expand Down
17 changes: 13 additions & 4 deletions CCBReader/CCBAnimationManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,8 @@ - (id) actionForSoundChannel:(CCBSequenceProperty*) channel
return [CCSequence actionWithArray:actions];
}

- (void) runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuration
- (void) stopRunningAnimation
{
NSAssert(seqId != -1, @"Sequence id %d couldn't be found",seqId);

// Stop actions associated with this animation manager
[self removeActionsByTag:animationManagerId fromNode:rootNode];

Expand All @@ -523,7 +521,18 @@ - (void) runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDurati

// Stop actions associated with this animation manager
[self removeActionsByTag:animationManagerId fromNode:node];

}
}

- (void) runAnimationsForSequenceId:(int)seqId tweenDuration:(float) tweenDuration
{
NSAssert(seqId != -1, @"Sequence id %d couldn't be found",seqId);
[self stopRunningAnimation];

for (NSValue* nodePtr in nodeSequences)
{
CCNode* node = [nodePtr pointerValue];

NSDictionary* seqs = [nodeSequences objectForKey:nodePtr];
NSDictionary* seqNodeProps = [seqs objectForKey:[NSNumber numberWithInt:seqId]];

Expand Down