UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[cocos2d-objc] Fixed signature of SkeletonAnimation addAnimationForTrack, samples

Browse Source
This commit is contained in:
badlogic 2017-04-11 12:40:40 +02:00
parent bb93011144
commit 0e9cb8ee26
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spine-cocos2d-objc/example/SpineboyExample.m
View File

@ -35,8 +35,7 @@
+ (CCScene*) scene { + (CCScene*) scene {
CCScene *scene = [CCScene node]; CCScene *scene = [CCScene node];
[scene addChild:[SpineboyExample node]]; [scene addChild:[SpineboyExample node]];
[scene setColorRGBA: [CCColor colorWithRed:1 green:0 blue:0]];
return scene; return scene;
} }
@ -44,7 +43,7 @@
self = [super init]; self = [super init];
if (!self) return nil; if (!self) return nil;
skeletonNode = [SkeletonAnimation skeletonWithFile:@"TwoColorTest.json" atlasFile:@"TwoColorTest.atlas" scale:0.2]; skeletonNode = [SkeletonAnimation skeletonWithFile:@"spineboy.json" atlasFile:@"spineboy.atlas" scale:0.4];
[skeletonNode setMixFrom:@"walk" to:@"jump" duration:0.2f]; [skeletonNode setMixFrom:@"walk" to:@"jump" duration:0.2f];
[skeletonNode setMixFrom:@"jump" to:@"run" duration:0.2f]; [skeletonNode setMixFrom:@"jump" to:@"run" duration:0.2f];
@ -70,12 +69,14 @@
NSLog(@"%d event: %s, %d, %f, %s", entry->trackIndex, event->data->name, event->intValue, event->floatValue, event->stringValue); NSLog(@"%d event: %s, %d, %f, %s", entry->trackIndex, event->data->name, event->intValue, event->floatValue, event->stringValue);
}; };
[skeletonNode setAnimationForTrack:0 name:@"animation" loop:YES]; [skeletonNode setAnimationForTrack:0 name:@"walk" loop:YES];
[skeletonNode addAnimationForTrack:0 name:@"jump" loop:NO afterDelay:2];
[skeletonNode addAnimationForTrack:0 name:@"run" loop:YES afterDelay:0];
// [skeletonNode setAnimationForTrack:1 name:@"test" loop:YES]; // [skeletonNode setAnimationForTrack:1 name:@"test" loop:YES];
CGSize windowSize = [[CCDirector sharedDirector] viewSize]; CGSize windowSize = [[CCDirector sharedDirector] viewSize];
[skeletonNode setPosition:ccp(windowSize.width / 2, windowSize.height / 2)]; [skeletonNode setPosition:ccp(windowSize.width / 2, 20)];
[self addChild:skeletonNode]; [self addChild:skeletonNode];
self.userInteractionEnabled = YES; self.userInteractionEnabled = YES;
@ -86,7 +87,12 @@
#if ( TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR ) #if ( TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR )
- (void)touchBegan:(UITouch *)touch withEvent:(UIEvent *)event { - (void)touchBegan:(UITouch *)touch withEvent:(UIEvent *)event {
skeletonNode.twoColorTint = !skeletonNode.twoColorTint; if (!skeletonNode.debugBones)
skeletonNode.debugBones = true;
else if (skeletonNode.timeScale == 1)
skeletonNode.timeScale = 0.3f;
else
[[CCDirector sharedDirector] replaceScene:[GoblinsExample scene]];
} }
#endif #endif

2
spine-cocos2d-objc/src/spine/SkeletonAnimation.h
View File

@ -68,7 +68,7 @@ typedef void(^spEventListener)(spTrackEntry* entry, spEvent* event);
- (void) setMixFrom:(NSString*)fromAnimation to:(NSString*)toAnimation duration:(float)duration; - (void) setMixFrom:(NSString*)fromAnimation to:(NSString*)toAnimation duration:(float)duration;
- (spTrackEntry*) setAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop; - (spTrackEntry*) setAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop;
- (spTrackEntry*) addAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop afterDelay:(int)delay; - (spTrackEntry*) addAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop afterDelay:(float)delay;
- (spTrackEntry*) getCurrentForTrack:(int)trackIndex; - (spTrackEntry*) getCurrentForTrack:(int)trackIndex;
- (void) clearTracks; - (void) clearTracks;
- (void) clearTrack:(int)trackIndex; - (void) clearTrack:(int)trackIndex;

2
spine-cocos2d-objc/src/spine/SkeletonAnimation.m
View File

@ -179,7 +179,7 @@ static _TrackEntryListeners* getListeners (spTrackEntry* entry) {
return spAnimationState_setAnimation(_state, trackIndex, animation, loop); return spAnimationState_setAnimation(_state, trackIndex, animation, loop);
} }
- (spTrackEntry*) addAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop afterDelay:(int)delay { - (spTrackEntry*) addAnimationForTrack:(int)trackIndex name:(NSString*)name loop:(bool)loop afterDelay:(float)delay {
spAnimation* animation = spSkeletonData_findAnimation(_skeleton->data, [name UTF8String]); spAnimation* animation = spSkeletonData_findAnimation(_skeleton->data, [name UTF8String]);
if (!animation) { if (!animation) {
CCLOG(@"Spine: Animation not found: %@", name); CCLOG(@"Spine: Animation not found: %@", name);

3
spine-cocos2d-objc/src/spine/SkeletonRenderer.m
View File

@ -163,8 +163,7 @@ static bool handlerQueued = false;
// notification system that may break if the block is called on a // notification system that may break if the block is called on a
// separate thread. // separate thread.
if (!handlerQueued) { if (!handlerQueued) {
[[CCDirector sharedDirector] addFrameCompletionHandler: ^{ [[CCDirector sharedDirector] addFrameCompletionHandler: ^{
printf("clearing mesh\n");
spMesh_clearParts(mesh); spMesh_clearParts(mesh);
handlerQueued = false; handlerQueued = false;
}]; }];