Skip to content

Commit f7da028

Browse files
committed
Spritekit relicts removed.
1 parent 0da9169 commit f7da028

File tree

3 files changed

+0
-41
lines changed

3 files changed

+0
-41
lines changed

cocos2d-ui/CCBReader/CCBReader.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@
2525

2626
#import <Foundation/Foundation.h>
2727

28-
#if CCB_SPRITEKIT_READER
29-
#import "CCBSpriteKitCompatibility.h"
30-
#else
3128
#import "cocos2d.h"
32-
#endif
33-
3429

3530
/**
3631
The CCBReader loads node graphs created by SpriteBuilder (or other editors using the same format). If you are using SpriteBuilder it's strongly recommended that you set up the CCFileUtils using the configureCCFileUtils method or use the Xcode project file created by SpriteBuilder.
@@ -162,12 +157,4 @@
162157
*/
163158
@property (nonatomic,strong) CCAnimationManager* animationManager;
164159

165-
166-
// Internal use: override methods for Sprite Kit Reader subclass
167-
+(void) setSceneSize:(CGSize)sceneSize;
168-
-(CCNode*) nodeFromClassName:(NSString*)nodeClassName;
169-
-(CCScene*) createScene;
170-
-(void) readerDidSetSpriteFrame:(CCSpriteFrame*)spriteFrame node:(CCNode*)node;
171-
172160
@end
173-

cocos2d-ui/CCBReader/CCBReader.m

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -356,11 +356,6 @@ - (NSString*) readCachedString
356356
return [stringCache objectAtIndex:n];
357357
}
358358

359-
-(void) readerDidSetSpriteFrame:(CCSpriteFrame*)spriteFrame node:(CCNode*)node
360-
{
361-
// does nothing, overridden by Sprite Kit reader
362-
}
363-
364359
- (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(BOOL)isExtraProp
365360
{
366361
// Read type and property name
@@ -628,7 +623,6 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
628623
{
629624
CCSpriteFrame* spriteFrame = [CCSpriteFrame frameWithImageNamed:spriteFile];
630625
[node setValue:spriteFrame forKey:name];
631-
[self readerDidSetSpriteFrame:spriteFrame node:node];
632626

633627
#if DEBUG_READER_PROPERTIES
634628
valueString = [NSString stringWithFormat:@"%@ (%@)", valueString, spriteFrame];
@@ -1906,13 +1900,6 @@ +(void) setResourcePath:(NSString *)searchPath
19061900

19071901
+ (CCBReader*) reader
19081902
{
1909-
// if available, create an instance of Sprite Kit Reader class instead
1910-
Class spriteKitReaderClass = NSClassFromString(@"CCBSpriteKitReader");
1911-
if (spriteKitReaderClass)
1912-
{
1913-
return [[spriteKitReaderClass alloc] init];
1914-
}
1915-
19161903
return [[CCBReader alloc] init];
19171904
}
19181905

@@ -1965,16 +1952,6 @@ + (NSString*) ccbDirectoryPath
19651952
return [[searchPaths objectAtIndex:0] stringByAppendingPathComponent:@"ccb"];
19661953
}
19671954

1968-
+(void) setSceneSize:(CGSize)sceneSize
1969-
{
1970-
[[CCBReader reader] setSceneSize:sceneSize];
1971-
}
1972-
1973-
-(void) setSceneSize:(CGSize)sceneSize
1974-
{
1975-
// does nothing, only needed for CCBSpriteKitReader
1976-
}
1977-
19781955
@end
19791956

19801957

cocos2d-ui/CCBReader/CCBuilderReader.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@
2323
* THE SOFTWARE.
2424
*/
2525

26-
// Unless this macro is defined in Build Settings CCBReader will assume it is working with cocos2d-iphone
27-
#ifndef CCB_SPRITEKIT_READER
28-
#define CCB_SPRITEKIT_READER 0
29-
#endif
30-
3126
#import "CCBReader.h"
3227
#import "CCBAnimationManager.h"
3328
#import "CCAnimationManager.h"

0 commit comments

Comments
 (0)