From 6b1ef3f5d7a14e7357a8d4ebe034d736962ad915 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Fri, 23 Jan 2015 15:18:50 +0100 Subject: [PATCH 01/20] Update template. --- .../PROJECTIDENTIFIERController.h | 10 +++++ .../PROJECTIDENTIFIERController.m | 39 +++++++++++++++++++ .../PROJECTNAME.xcodeproj/project.pbxproj | 2 + 3 files changed, 51 insertions(+) create mode 100644 Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h create mode 100644 Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h b/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h new file mode 100644 index 000000000..073de047e --- /dev/null +++ b/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h @@ -0,0 +1,10 @@ +// +// PROJECTIDENTIFIERController.h +// PROJECTNAME +// + +#import "CCAppController.h" + +@interface PROJECTIDENTIFIERController : CCAppController + +@end diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m b/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m new file mode 100644 index 000000000..a441b73fe --- /dev/null +++ b/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m @@ -0,0 +1,39 @@ +// +// PROJECTIDENTIFIERController.m +// PROJECTNAME +// + + +#import "PROJECTIDENTIFIERController.h" + +static PROJECTIDENTIFIERController *__sharedController; + +@implementation PROJECTIDENTIFIERController + ++ (PROJECTIDENTIFIERController*)sharedController +{ + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^ + { + __sharedController = [[PROJECTIDENTIFIERController alloc] init]; + }); + + return __sharedController; +} + ++ (void)setupApplication +{ + static dispatch_once_t setupToken; + dispatch_once(&setupToken, ^ + { + [[PROJECTIDENTIFIERController sharedController] setupApplication]; + }); +} + + +- (NSString *)firstSceneName +{ + return @"MainScene"; +} + +@end \ No newline at end of file diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj index 2275b2d0e..5c81c1cf9 100755 --- a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj +++ b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj @@ -323,6 +323,8 @@ 7A40362119DDF08C007B6E8F /* iOS */, 7A40362219DDF090007B6E8F /* Android */, 7A9791C019E6FAC5001FFC4D /* Mac */, + 14D8C3641A728F0F00FD9BFF /* PROJECTIDENTIFIERController.h */, + 14D8C3651A728F0F00FD9BFF /* PROJECTIDENTIFIERController.m */, ); name = Platforms; sourceTree = ""; From 0c12b5058b95b476954acee6b2faab19525293e2 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Fri, 23 Jan 2015 15:52:31 +0100 Subject: [PATCH 02/20] Move Controller file in template. --- .../PROJECTIDENTIFIERController.h | 10 --- .../PROJECTIDENTIFIERController.m | 39 ----------- .../PROJECTNAME.xcodeproj/project.pbxproj | 2 - .../Source/PROJECTIDENTIFIERController.h | 4 -- .../Source/PROJECTIDENTIFIERController.m | 68 ++++--------------- 5 files changed, 12 insertions(+), 111 deletions(-) delete mode 100644 Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h delete mode 100644 Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h b/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h deleted file mode 100644 index 073de047e..000000000 --- a/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.h +++ /dev/null @@ -1,10 +0,0 @@ -// -// PROJECTIDENTIFIERController.h -// PROJECTNAME -// - -#import "CCAppController.h" - -@interface PROJECTIDENTIFIERController : CCAppController - -@end diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m b/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m deleted file mode 100644 index a441b73fe..000000000 --- a/Support/PROJECTNAME.spritebuilder/PROJECTIDENTIFIERController.m +++ /dev/null @@ -1,39 +0,0 @@ -// -// PROJECTIDENTIFIERController.m -// PROJECTNAME -// - - -#import "PROJECTIDENTIFIERController.h" - -static PROJECTIDENTIFIERController *__sharedController; - -@implementation PROJECTIDENTIFIERController - -+ (PROJECTIDENTIFIERController*)sharedController -{ - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^ - { - __sharedController = [[PROJECTIDENTIFIERController alloc] init]; - }); - - return __sharedController; -} - -+ (void)setupApplication -{ - static dispatch_once_t setupToken; - dispatch_once(&setupToken, ^ - { - [[PROJECTIDENTIFIERController sharedController] setupApplication]; - }); -} - - -- (NSString *)firstSceneName -{ - return @"MainScene"; -} - -@end \ No newline at end of file diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj index 5c81c1cf9..2275b2d0e 100755 --- a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj +++ b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.xcodeproj/project.pbxproj @@ -323,8 +323,6 @@ 7A40362119DDF08C007B6E8F /* iOS */, 7A40362219DDF090007B6E8F /* Android */, 7A9791C019E6FAC5001FFC4D /* Mac */, - 14D8C3641A728F0F00FD9BFF /* PROJECTIDENTIFIERController.h */, - 14D8C3651A728F0F00FD9BFF /* PROJECTIDENTIFIERController.m */, ); name = Platforms; sourceTree = ""; diff --git a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h index 55937827c..073de047e 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h +++ b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h @@ -7,8 +7,4 @@ @interface PROJECTIDENTIFIERController : CCAppController -+ (PROJECTIDENTIFIERController*)sharedController; - -+ (void)setupApplication; - @end diff --git a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m index ccaf85740..a441b73fe 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m +++ b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m @@ -10,74 +10,30 @@ @implementation PROJECTIDENTIFIERController -#pragma mark Application Setup - - -- (void)setupApplication -{ - [super setupApplication]; - - /* - Add your custom application logic + initialization here - */ - -} - -- (NSString *)firstSceneName -{ - return @"MainScene"; -} - -#pragma mark Android - -#if __CC_PLATFORM_ANDROID - -/* - Add any android specific overrides here -*/ - -#endif - - -#pragma mark Mac - -#if __CC_PLATFORM_MAC - -/* - Add any Mac specific overrides here -*/ --(CGSize)defaultWindowSize -{ - return CGSizeMake(480.0f, 320.0f); -} - -#endif - - -#pragma mark Singleton Methods - -/* - These methods are used in the framework to reference this controller. - */ + (PROJECTIDENTIFIERController*)sharedController { static dispatch_once_t onceToken; dispatch_once(&onceToken, ^ - { - __sharedController = [[PROJECTIDENTIFIERController alloc] init]; - }); + { + __sharedController = [[PROJECTIDENTIFIERController alloc] init]; + }); return __sharedController; } - + (void)setupApplication { static dispatch_once_t setupToken; dispatch_once(&setupToken, ^ - { - [[PROJECTIDENTIFIERController sharedController] setupApplication]; - }); + { + [[PROJECTIDENTIFIERController sharedController] setupApplication]; + }); +} + + +- (NSString *)firstSceneName +{ + return @"MainScene"; } @end \ No newline at end of file From 637ae678d17709ddcccb8964749519ba958687a3 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Fri, 23 Jan 2015 17:13:46 +0100 Subject: [PATCH 03/20] Refactor file renaming / interpolation within CCBProjectCreator. --- SpriteBuilder/ccBuilder/CCBProjectCreator.m | 47 ++++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/SpriteBuilder/ccBuilder/CCBProjectCreator.m b/SpriteBuilder/ccBuilder/CCBProjectCreator.m index debfd9aa9..167d4191a 100644 --- a/SpriteBuilder/ccBuilder/CCBProjectCreator.m +++ b/SpriteBuilder/ccBuilder/CCBProjectCreator.m @@ -83,8 +83,7 @@ - (BOOL)createDefaultProjectAtPath:(NSString *)fileName engine:(CCBTargetEngine) // Update the project NSString *pbxprojFile = [xcodeFileName stringByAppendingPathComponent:@"project.pbxproj"]; - [self setName:projName inFile:pbxprojFile search:substitutableProjectName]; - [self setName:identifier inFile:pbxprojFile search:substitutableProjectIdentifier]; + [self replace:renameParams in:pbxprojFile]; NSArray *filesToRemove; if (programmingLanguage == CCBProgrammingLanguageObjectiveC) @@ -148,13 +147,7 @@ - (BOOL)createDefaultProjectAtPath:(NSString *)fileName engine:(CCBTargetEngine) //Interpolate new project values into all remaining files with placeholders NSString *xibFileName = [parentPath stringByAppendingPathComponent:@"Source/Resources/Platforms/Mac/MainMenu.xib"]; - NSString *macAppDelegateMFileName = [parentPath stringByAppendingPathComponent:@"Source/Platforms/Mac/AppDelegate.m"]; - NSString *iosAppDelegateMFileName = [parentPath stringByAppendingPathComponent:@"Source/Platforms/iOS/AppDelegate.m"]; - NSString *controllerHName = [parentPath stringByAppendingPathComponent:@"Source/PROJECTIDENTIFIERController.h"]; - NSString *controllerMName = [parentPath stringByAppendingPathComponent:@"Source/PROJECTIDENTIFIERController.m"]; - - NSMutableArray *filesNeedingInterpolation = [NSMutableArray arrayWithArray: @[xibFileName, macAppDelegateMFileName, - iosAppDelegateMFileName, controllerHName,controllerMName]]; + [self replace:renameParams in:xibFileName]; //Add android files if they exist NSString *activityMFileName = [parentPath stringByAppendingPathComponent: @@ -163,14 +156,12 @@ - (BOOL)createDefaultProjectAtPath:(NSString *)fileName engine:(CCBTargetEngine) { NSString *activityHFileName = [parentPath stringByAppendingPathComponent:[NSString stringWithFormat:@"Source/Platforms/Android/%@Activity.h", substitutableProjectIdentifier]]; NSString *manifestFileName = [parentPath stringByAppendingPathComponent:@"Source/Resources/Platforms/Android/AndroidManifest.xml"]; + NSArray *filesNeedingInterpolation = @[activityMFileName,activityHFileName, manifestFileName]; - [filesNeedingInterpolation addObjectsFromArray: @[activityMFileName,activityHFileName, manifestFileName]]; - } - - //Perform the interpolation - for (NSString* filePath in filesNeedingInterpolation) - { - [self replace:renameParams in:filePath]; + for (NSString* filePath in filesNeedingInterpolation) + { + [self replace:renameParams in:filePath]; + } } // perform cleanup to remove unnecessary files which only bloat the project @@ -203,6 +194,30 @@ - (void)replace:(NSDictionary *)substitutions in:(NSString *)fileName } } +- (void)replace:(NSDictionary *)substitutions in:(NSString *)fileName +{ + NSFileManager *fm = [NSFileManager defaultManager]; + NSString *resultFilename = [NSString stringWithString:fileName]; + + for( NSString*key in substitutions.allKeys) + { + resultFilename = [resultFilename stringByReplacingOccurrencesOfString:key withString:substitutions[key]]; + } + + BOOL renameRequired = ![resultFilename isEqualToString:fileName]; + if(renameRequired) + { + NSError *error; + [fm moveItemAtPath:fileName toPath:resultFilename error:&error]; + NSAssert(!error, @"error occurred renaming %@ - %@", fileName, [error description]); + } + + for( NSString*key in substitutions.allKeys) + { + [self setName:substitutions[key] inFile:resultFilename search:key]; + } +} + - (void)setName:(NSString *)name inFile:(NSString *)fileName search:(NSString *)searchStr { NSMutableData *fileData = [NSMutableData dataWithContentsOfFile:fileName]; From ac3c6244e91b11a99bb96cf34bf74e4fb2b10507 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Fri, 23 Jan 2015 17:30:28 +0100 Subject: [PATCH 04/20] Fixing template creation for iOS. --- SpriteBuilder/ccBuilder/CCBProjectCreator.m | 22 ++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/SpriteBuilder/ccBuilder/CCBProjectCreator.m b/SpriteBuilder/ccBuilder/CCBProjectCreator.m index 167d4191a..2cd939bb1 100644 --- a/SpriteBuilder/ccBuilder/CCBProjectCreator.m +++ b/SpriteBuilder/ccBuilder/CCBProjectCreator.m @@ -83,7 +83,8 @@ - (BOOL)createDefaultProjectAtPath:(NSString *)fileName engine:(CCBTargetEngine) // Update the project NSString *pbxprojFile = [xcodeFileName stringByAppendingPathComponent:@"project.pbxproj"]; - [self replace:renameParams in:pbxprojFile]; + [self setName:projName inFile:pbxprojFile search:substitutableProjectName]; + [self setName:identifier inFile:pbxprojFile search:substitutableProjectIdentifier]; NSArray *filesToRemove; if (programmingLanguage == CCBProgrammingLanguageObjectiveC) @@ -147,8 +148,13 @@ - (BOOL)createDefaultProjectAtPath:(NSString *)fileName engine:(CCBTargetEngine) //Interpolate new project values into all remaining files with placeholders NSString *xibFileName = [parentPath stringByAppendingPathComponent:@"Source/Resources/Platforms/Mac/MainMenu.xib"]; - [self replace:renameParams in:xibFileName]; + NSString *macAppDelegateMFileName = [parentPath stringByAppendingPathComponent:@"Source/Platforms/Mac/AppDelegate.m"]; + NSString *iosAppDelegateMFileName = [parentPath stringByAppendingPathComponent:@"Source/Platforms/iOS/AppDelegate.m"]; + NSString *controllerHName = [parentPath stringByAppendingPathComponent:@"Source/PROJECTIDENTIFIERController.h"]; + NSString *controllerMName = [parentPath stringByAppendingPathComponent:@"Source/PROJECTIDENTIFIERController.m"]; + NSMutableArray *filesNeedingInterpolation = [NSMutableArray arrayWithArray: @[xibFileName, macAppDelegateMFileName, + iosAppDelegateMFileName, controllerHName,controllerMName]]; //Add android files if they exist NSString *activityMFileName = [parentPath stringByAppendingPathComponent: [NSString stringWithFormat:@"Source/Platforms/Android/%@Activity.m", substitutableProjectIdentifier]]; @@ -156,12 +162,14 @@ - (BOOL)createDefaultProjectAtPath:(NSString *)fileName engine:(CCBTargetEngine) { NSString *activityHFileName = [parentPath stringByAppendingPathComponent:[NSString stringWithFormat:@"Source/Platforms/Android/%@Activity.h", substitutableProjectIdentifier]]; NSString *manifestFileName = [parentPath stringByAppendingPathComponent:@"Source/Resources/Platforms/Android/AndroidManifest.xml"]; - NSArray *filesNeedingInterpolation = @[activityMFileName,activityHFileName, manifestFileName]; - for (NSString* filePath in filesNeedingInterpolation) - { - [self replace:renameParams in:filePath]; - } + [filesNeedingInterpolation addObjectsFromArray: @[activityMFileName,activityHFileName, manifestFileName]]; + } + + //Perform the interpolation + for (NSString* filePath in filesNeedingInterpolation) + { + [self replace:renameParams in:filePath]; } // perform cleanup to remove unnecessary files which only bloat the project From 13b5ad76a0d3a850bb957e5e9fb7d1aca972a9d9 Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Fri, 23 Jan 2015 18:35:23 +0100 Subject: [PATCH 05/20] Refer to AppDelegate in main.m and expose AppController class methods. --- .../Source/PROJECTIDENTIFIERController.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h index 073de047e..55937827c 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h +++ b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.h @@ -7,4 +7,8 @@ @interface PROJECTIDENTIFIERController : CCAppController ++ (PROJECTIDENTIFIERController*)sharedController; + ++ (void)setupApplication; + @end From 44a2b3c6fc774423db3fc6cbb22c4caa6ea6be5d Mon Sep 17 00:00:00 2001 From: Donald Hutchison Date: Wed, 4 Feb 2015 12:41:43 +0100 Subject: [PATCH 06/20] Update Controller formatting. --- .../Source/PROJECTIDENTIFIERController.m | 68 +++++++++++++++---- 1 file changed, 56 insertions(+), 12 deletions(-) diff --git a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m index a441b73fe..ccaf85740 100644 --- a/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m +++ b/Support/PROJECTNAME.spritebuilder/Source/PROJECTIDENTIFIERController.m @@ -10,30 +10,74 @@ @implementation PROJECTIDENTIFIERController +#pragma mark Application Setup + + +- (void)setupApplication +{ + [super setupApplication]; + + /* + Add your custom application logic + initialization here + */ + +} + +- (NSString *)firstSceneName +{ + return @"MainScene"; +} + +#pragma mark Android + +#if __CC_PLATFORM_ANDROID + +/* + Add any android specific overrides here +*/ + +#endif + + +#pragma mark Mac + +#if __CC_PLATFORM_MAC + +/* + Add any Mac specific overrides here +*/ +-(CGSize)defaultWindowSize +{ + return CGSizeMake(480.0f, 320.0f); +} + +#endif + + +#pragma mark Singleton Methods + +/* + These methods are used in the framework to reference this controller. + */ + (PROJECTIDENTIFIERController*)sharedController { static dispatch_once_t onceToken; dispatch_once(&onceToken, ^ - { - __sharedController = [[PROJECTIDENTIFIERController alloc] init]; - }); + { + __sharedController = [[PROJECTIDENTIFIERController alloc] init]; + }); return __sharedController; } + + (void)setupApplication { static dispatch_once_t setupToken; dispatch_once(&setupToken, ^ - { - [[PROJECTIDENTIFIERController sharedController] setupApplication]; - }); -} - - -- (NSString *)firstSceneName -{ - return @"MainScene"; + { + [[PROJECTIDENTIFIERController sharedController] setupApplication]; + }); } @end \ No newline at end of file From f035c2d7d8f7f53e36b8291152c371dfa5c646ef Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Mon, 16 Feb 2015 18:14:43 -0600 Subject: [PATCH 07/20] Extracting references to .ccb files to constants. No renaming yet. --- SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m | 3 ++- .../SpriteBuilder Tests/CCBDictionaryReader_Tests.m | 4 ++-- SpriteBuilder/SpriteBuilder Tests/ProjectSettings_Tests.m | 4 ++-- .../Cocos2dTestHelpers.m | 5 +++-- SpriteBuilder/ccBuilder/AppDelegate.m | 6 +++--- SpriteBuilder/ccBuilder/CCBDirectoryPublisher.m | 2 +- SpriteBuilder/ccBuilder/NSString+Publishing.m | 4 ++-- SpriteBuilder/ccBuilder/ProjectSettings.h | 3 +++ SpriteBuilder/ccBuilder/ResourceManager.m | 4 ++-- SpriteBuilder/ccBuilder/ResourceNewFileCommand.m | 6 +++--- 10 files changed, 23 insertions(+), 18 deletions(-) diff --git a/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m b/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m index 18535f53c..de79b7e54 100644 --- a/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m +++ b/SpriteBuilder/Cocos2D iPhone/CCBXCocos2diPhone.m @@ -24,12 +24,13 @@ #import "CCBXCocos2diPhone.h" #import "CCBBinaryWriter.h" +#import "ProjectSettings.h" @implementation CCBXCocos2diPhone - (NSString*) extension { - return @"ccbi"; + return kCCBDefaultExportPlugIn; } - (NSData *)exportDocument:(NSDictionary *)doc diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m index 1fbe3bb78..c52afb6ce 100644 --- a/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m +++ b/SpriteBuilder/SpriteBuilder Tests/CCBDictionaryReader_Tests.m @@ -21,7 +21,7 @@ #import "CCLayoutBox.h" #import "SBErrors.h" #import "CCBDictionaryKeys.h" - +#import "ProjectSettings.h" @interface CCBDictionaryReader_Tests : XCTestCase @@ -552,7 +552,7 @@ - (void)testNodeGraphFromDocumentDict_physicsnode - (NSDictionary *)loadCCBFile:(NSString *)ccbName { NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - NSString *path = [bundle pathForResource:ccbName ofType:@"ccb"]; + NSString *path = [bundle pathForResource:ccbName ofType:kCCBDefaultExtension]; XCTAssertNotNil(path, @"CCB file loading failed, no path found for ccb %@.ccb", ccbName); diff --git a/SpriteBuilder/SpriteBuilder Tests/ProjectSettings_Tests.m b/SpriteBuilder/SpriteBuilder Tests/ProjectSettings_Tests.m index 3421e2c22..70cd24729 100644 --- a/SpriteBuilder/SpriteBuilder Tests/ProjectSettings_Tests.m +++ b/SpriteBuilder/SpriteBuilder Tests/ProjectSettings_Tests.m @@ -230,7 +230,7 @@ - (void)testInitWithDictionary @"publishEnvironment":@(0), @"publishEnablediPhone":@(YES), @"publishToZipFile":@(NO), - @"exporter":@"ccbi", + @"exporter":kCCBDefaultExportPlugIn, @"versionStr":@"Version: 1.x\n-n GitHub: \nfcec170fc2\n", @"publishResolution_ios_phone":@(YES), @"publishResolution_ios_tablethd":@(YES), @@ -268,7 +268,7 @@ - (void)testInitWithDictionary XCTAssertEqual(project.designTarget, 0); XCTAssertEqual(project.engine, CCBTargetEngineCocos2d); - SBAssertStringsEqual(project.exporter, @"ccbi"); + SBAssertStringsEqual(project.exporter, kCCBDefaultExportPlugIn); XCTAssertFalse(project.publishToZipFile); XCTAssertEqual(project.publishEnvironment, kCCBPublishEnvironmentDevelop); diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.m b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.m index 519accdf5..5d62e89ff 100644 --- a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.m +++ b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.m @@ -10,6 +10,7 @@ #import "Cocos2dTestHelpers.h" #import "PlugInManager.h" #import "PlugInExport.h" +#import "ProjectSettings.h" @implementation Cocos2dTestHelpers @@ -17,13 +18,13 @@ @implementation Cocos2dTestHelpers +(NSData*)readCCB:(NSString*)srcFileName { NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - NSString *path = [bundle pathForResource:srcFileName ofType:@"ccb"]; + NSString *path = [bundle pathForResource:srcFileName ofType:kCCBDefaultExtension]; NSDictionary * doc = [NSDictionary dictionaryWithContentsOfFile:path]; NSAssert(doc, @"Can't find animation File %@",srcFileName); if(doc == nil) return nil; - PlugInExport *plugIn = [[PlugInManager sharedManager] plugInExportForExtension:@"ccbi"]; + PlugInExport *plugIn = [[PlugInManager sharedManager] plugInExportForExtension:kCCBDefaultExportPlugIn]; NSData *data = [plugIn exportDocument:doc]; return data; } diff --git a/SpriteBuilder/ccBuilder/AppDelegate.m b/SpriteBuilder/ccBuilder/AppDelegate.m index 6f4b0efad..49abdc246 100644 --- a/SpriteBuilder/ccBuilder/AppDelegate.m +++ b/SpriteBuilder/ccBuilder/AppDelegate.m @@ -1759,7 +1759,7 @@ - (BOOL)openProjectWithProjectPath:(NSString *)projectPath NSString* ccbFile = NULL; for (NSString* file in resDir) { - if ([file hasSuffix:@".ccb"]) + if ([file hasSuffix:kCCBDefaultExtensionWithDot]) { ccbFile = file; numCCBFiles++; @@ -2800,7 +2800,7 @@ - (IBAction) saveDocumentAs:(id)sender if (!currentDocument) return; NSSavePanel* saveDlg = [NSSavePanel savePanel]; - [saveDlg setAllowedFileTypes:[NSArray arrayWithObject:@"ccb"]]; + [saveDlg setAllowedFileTypes:[NSArray arrayWithObject:kCCBDefaultExtension]]; __block SavePanelLimiter* limiter = [[SavePanelLimiter alloc] initWithPanel:saveDlg]; [saveDlg beginSheetModalForWindow:window completionHandler:^(NSInteger result){ @@ -3003,7 +3003,7 @@ - (IBAction)menuUpdateCCBsInDirectory:(id)sender NSArray* arr = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:dirName error:NULL]; for(NSString* file in arr) { - if ([file hasSuffix:@".ccb"]) + if ([file hasSuffix:kCCBDefaultExtensionWithDot]) { NSString* absPath = [dirName stringByAppendingPathComponent:file]; [self openFile:absPath]; diff --git a/SpriteBuilder/ccBuilder/CCBDirectoryPublisher.m b/SpriteBuilder/ccBuilder/CCBDirectoryPublisher.m index 73eff2790..7dd692224 100644 --- a/SpriteBuilder/ccBuilder/CCBDirectoryPublisher.m +++ b/SpriteBuilder/ccBuilder/CCBDirectoryPublisher.m @@ -307,7 +307,7 @@ - (BOOL)processFile:(NSString *)fileName } } else if (!isGeneratedSpriteSheet - && [[fileName lowercaseString] hasSuffix:@"ccb"]) + && [[fileName lowercaseString] hasSuffix:kCCBDefaultExtension]) { [self publishCCB:fileName filePath:filePath outputDir:outputDir]; } diff --git a/SpriteBuilder/ccBuilder/NSString+Publishing.m b/SpriteBuilder/ccBuilder/NSString+Publishing.m index 5d81f21e9..8ef27bb97 100644 --- a/SpriteBuilder/ccBuilder/NSString+Publishing.m +++ b/SpriteBuilder/ccBuilder/NSString+Publishing.m @@ -4,7 +4,7 @@ #import "MiscConstants.h" #import "NSNumber+ImageResolutions.h" #import "NSString+Misc.h" - +#import "ProjectSettings.h" @implementation NSString (Publishing) @@ -167,7 +167,7 @@ - (BOOL) containsCCBFile:(NSString*) dir return YES; } }else{ - if([[file lowercaseString] hasSuffix:@"ccb"]){ + if([[file lowercaseString] hasSuffix:kCCBDefaultExtension]){ return YES; } } diff --git a/SpriteBuilder/ccBuilder/ProjectSettings.h b/SpriteBuilder/ccBuilder/ProjectSettings.h index da799cd38..faecf4439 100644 --- a/SpriteBuilder/ccBuilder/ProjectSettings.h +++ b/SpriteBuilder/ccBuilder/ProjectSettings.h @@ -27,6 +27,9 @@ #define kCCBProjectSettingsVersion 1 #define kCCBDefaultExportPlugIn @"ccbi" +#define kCCBDefaultExtension @"ccb" +#define kCCBDefaultExtensionWithDot @".ccb" + typedef enum { diff --git a/SpriteBuilder/ccBuilder/ResourceManager.m b/SpriteBuilder/ccBuilder/ResourceManager.m index 7c3b66c7b..0cc2fe6f2 100644 --- a/SpriteBuilder/ccBuilder/ResourceManager.m +++ b/SpriteBuilder/ccBuilder/ResourceManager.m @@ -170,7 +170,7 @@ + (NSArray *)resIndependentDirs + (BOOL)isResolutionDependentFile:(NSString *)file { - if ([[file pathExtension] isEqualToString:@"ccb"]) + if ([[file pathExtension] isEqualToString:kCCBDefaultExtension]) { return NO; } @@ -248,7 +248,7 @@ + (int)getResourceTypeForFile:(NSString *)file { return kCCBResTypeAnimation; } - else if ([ext isEqualToString:@"ccb"]) + else if ([ext isEqualToString:kCCBDefaultExtension]) { return kCCBResTypeCCBFile; } diff --git a/SpriteBuilder/ccBuilder/ResourceNewFileCommand.m b/SpriteBuilder/ccBuilder/ResourceNewFileCommand.m index 082bc9392..e72497001 100644 --- a/SpriteBuilder/ccBuilder/ResourceNewFileCommand.m +++ b/SpriteBuilder/ccBuilder/ResourceNewFileCommand.m @@ -36,9 +36,9 @@ - (void)execute NSString* filePath = [dirPath stringByAppendingPathComponent:newFileWindowController.documentName]; - if (![[filePath pathExtension] isEqualToString:@"ccb"]) + if (![[filePath pathExtension] isEqualToString:kCCBDefaultExtension]) { - filePath = [filePath stringByAppendingPathExtension:@"ccb"]; + filePath = [filePath stringByAppendingPathExtension:kCCBDefaultExtension]; } BOOL isDir = NO; @@ -74,7 +74,7 @@ - (void)execute - (BOOL)isValidFilename:(NSString *)name { BOOL isLongEnough; - NSString *withoutFileExtension = [name stringByReplacingOccurrencesOfString:@".ccb" withString:@""]; + NSString *withoutFileExtension = [name stringByReplacingOccurrencesOfString:kCCBDefaultExtensionWithDot withString:@""]; NSString *withoutWhitespace = [withoutFileExtension stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]]; isLongEnough = withoutWhitespace.length >= MINIMUM_FILENAME_LENGTH; From 4ada7f45ea6aed68919d9d92bf88c49c4dcaa6ee Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Tue, 17 Feb 2015 16:41:34 -0600 Subject: [PATCH 08/20] Flip the switch to .sb and .sbi files. --- SpriteBuilder/ccBuilder/ProjectSettings.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SpriteBuilder/ccBuilder/ProjectSettings.h b/SpriteBuilder/ccBuilder/ProjectSettings.h index faecf4439..416173335 100644 --- a/SpriteBuilder/ccBuilder/ProjectSettings.h +++ b/SpriteBuilder/ccBuilder/ProjectSettings.h @@ -26,9 +26,9 @@ #import "CCBPublisherTypes.h" #define kCCBProjectSettingsVersion 1 -#define kCCBDefaultExportPlugIn @"ccbi" -#define kCCBDefaultExtension @"ccb" -#define kCCBDefaultExtensionWithDot @".ccb" +#define kCCBDefaultExportPlugIn @"sbi" +#define kCCBDefaultExtension @"sb" +#define kCCBDefaultExtensionWithDot @".sb" typedef enum From 13ce514ba470a7d370b6eeb803b7e8d95540a6a1 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Wed, 18 Feb 2015 11:49:38 -0600 Subject: [PATCH 09/20] Rename template main scene --- .../{MainScene.ccb => MainScene.sb} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/{MainScene.ccb => MainScene.sb} (100%) diff --git a/Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/MainScene.ccb b/Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/MainScene.sb similarity index 100% rename from Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/MainScene.ccb rename to Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/MainScene.sb From d4d5d6c759afb9905ddcb020efbb7d1adceb5d22 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Wed, 18 Feb 2015 12:45:40 -0600 Subject: [PATCH 10/20] Fix SB to build with my cocos2d branch --- .../SpriteBuilder.xcodeproj/project.pbxproj | 21 ++++++++++++++++--- .../ccBuilder/CCBDictionaryMigrator.m | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj index a6f41cc4e..f9b1319f3 100644 --- a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj +++ b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj @@ -8209,7 +8209,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "libs/cocos2d-iphone/external/kazmath/include/** libs/cocos2d-iphone/external/Chipmunk/objectivec/include/ libs/cocos2d-iphone/external/Chipmunk/include/ libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**"; + USER_HEADER_SEARCH_PATHS = "libs/cocos2d-iphone/external/Chipmunk/objectivec/include/ libs/cocos2d-iphone/external/Chipmunk/include/ libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**"; }; name = Debug; }; @@ -8240,7 +8240,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "libs/cocos2d-iphone/external/kazmath/include/** libs/cocos2d-iphone/external/Chipmunk/objectivec/include/ libs/cocos2d-iphone/external/Chipmunk/include/ libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**"; + USER_HEADER_SEARCH_PATHS = "libs/cocos2d-iphone/external/Chipmunk/objectivec/include/ libs/cocos2d-iphone/external/Chipmunk/include/ libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**"; }; name = Release; }; @@ -8434,7 +8434,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.8; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = "libs/cocos2d-iphone/external/kazmath/include/** libs/cocos2d-iphone/external/Chipmunk/objectivec/include/ libs/cocos2d-iphone/external/Chipmunk/include/ libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**"; + USER_HEADER_SEARCH_PATHS = "libs/cocos2d-iphone/external/Chipmunk/objectivec/include/ libs/cocos2d-iphone/external/Chipmunk/include/ libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**"; }; name = Testing; }; @@ -8538,6 +8538,11 @@ ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "libs/cocos2d-iphone/cocos2d/**", + "libs/cocos2d-iphone/cocos2d-ui/**", + "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**", + ); INFOPLIST_FILE = "Cocos2D iPhone/Cocos2D iPhone-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -10794,6 +10799,11 @@ ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "libs/cocos2d-iphone/cocos2d/**", + "libs/cocos2d-iphone/cocos2d-ui/**", + "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**", + ); INFOPLIST_FILE = "Cocos2D iPhone/Cocos2D iPhone-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; LIBRARY_SEARCH_PATHS = "$(inherited)"; @@ -10818,6 +10828,11 @@ GCC_PREFIX_HEADER = "Cocos2D iPhone/Cocos2D iPhone-Prefix.pch"; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + HEADER_SEARCH_PATHS = ( + "libs/cocos2d-iphone/cocos2d/**", + "libs/cocos2d-iphone/cocos2d-ui/**", + "libs/cocos2d-iphone/external/ObjectAL/ObjectAL/ObjectAL/**", + ); INFOPLIST_FILE = "Cocos2D iPhone/Cocos2D iPhone-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles"; LIBRARY_SEARCH_PATHS = "$(inherited)"; diff --git a/SpriteBuilder/ccBuilder/CCBDictionaryMigrator.m b/SpriteBuilder/ccBuilder/CCBDictionaryMigrator.m index f20cdffe4..fc49d81a1 100644 --- a/SpriteBuilder/ccBuilder/CCBDictionaryMigrator.m +++ b/SpriteBuilder/ccBuilder/CCBDictionaryMigrator.m @@ -1,5 +1,5 @@ #import "CCBDictionaryMigrator.h" -#import "CCBReader_Private.h" +#import "CCSBReader_Private.h" #import "CCBDictionaryReader.h" #import "CCBDictionaryMigrationProtocol.h" #import "CCBDictionaryKeys.h" From 078cd035231adb474528b48925d604df24e7b952 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Wed, 18 Feb 2015 12:46:02 -0600 Subject: [PATCH 11/20] Fixing more ccb extension references. --- SpriteBuilder/SpriteBuilder Tests/CCBPublisher_Tests.m | 4 ++-- SpriteBuilder/ccBuilder/NewDocWindowController.m | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBPublisher_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBPublisher_Tests.m index 1c24912d5..b74a72d8e 100644 --- a/SpriteBuilder/SpriteBuilder Tests/CCBPublisher_Tests.m +++ b/SpriteBuilder/SpriteBuilder Tests/CCBPublisher_Tests.m @@ -176,12 +176,12 @@ - (void)testPublishCCBs sequenceId:0]; NSMutableDictionary *doc = [documentCreator createData]; - [doc writeToFile:[self fullPathForFile:@"baa.spritebuilder/Packages/foo.sbpack/mainScene.ccb"] atomically:YES]; + [doc writeToFile:[self fullPathForFile:@"baa.spritebuilder/Packages/foo.sbpack/mainScene.sb"] atomically:YES]; [_publisher addPublishingTarget:_targetIOS]; [_publisher start]; - [self assertFileExists:@"Published-iOS/mainScene.ccbi"]; + [self assertFileExists:@"Published-iOS/mainScene.sbi"]; } - (void)testCustomScalingFactorsForImages diff --git a/SpriteBuilder/ccBuilder/NewDocWindowController.m b/SpriteBuilder/ccBuilder/NewDocWindowController.m index 4285d6865..6b84ed5e1 100644 --- a/SpriteBuilder/ccBuilder/NewDocWindowController.m +++ b/SpriteBuilder/ccBuilder/NewDocWindowController.m @@ -46,7 +46,7 @@ - (void) awakeFromNib self.height = 0; self.canSetSize = NO; - self.documentName = @"Untitled.ccb"; + self.documentName = [NSString stringWithFormat:@"Untitled.%@", kCCBDefaultExtension]; // Select only the Untitled word [documentNameField selectText:self]; From 00abf6c36b0292e2d38f432899f6c11e4f751a90 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Wed, 18 Feb 2015 13:04:35 -0600 Subject: [PATCH 12/20] Hard code exporter so the 'ccbi' stored in the preferences won't be used instead of the new sbi extension. --- SpriteBuilder/ccBuilder/ProjectSettings.m | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/SpriteBuilder/ccBuilder/ProjectSettings.m b/SpriteBuilder/ccBuilder/ProjectSettings.m index bdd48b7c0..7c2fbf7a1 100644 --- a/SpriteBuilder/ccBuilder/ProjectSettings.m +++ b/SpriteBuilder/ccBuilder/ProjectSettings.m @@ -173,10 +173,7 @@ - (void)initializeVersionStringWithProjectDict:(NSDictionary *)projectDict - (NSString*) exporter { - if (_exporter) - { - return _exporter; - } + // Exporter is hardcoded to the current one to prevent incompatability issues. See _exporter / self.exporter return kCCBDefaultExportPlugIn; } From f7ee86868bc9c7db367b00c097952910c7245bbb Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Wed, 18 Feb 2015 13:04:45 -0600 Subject: [PATCH 13/20] Change file type associations. --- .../ccBuilder/SpriteBuilder-Info.plist | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist b/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist index bb83313a2..c2c07eeac 100644 --- a/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist +++ b/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist @@ -31,7 +31,7 @@ CFBundleTypeExtensions - ccb + sb CFBundleTypeIconFile ccb.icns @@ -48,24 +48,24 @@ NSDocumentClass - - CFBundleTypeExtensions - - ccbproj - - CFBundleTypeIconFile - ccbproj.icns - CFBundleTypeName - SpriteBuilder Project - CFBundleTypeRole - Editor - NSDocumentClass - AppDelegate - CFBundleTypeExtensions - ccbi + ccbproj + + CFBundleTypeIconFile + ccbproj.icns + CFBundleTypeName + SpriteBuilder Project + CFBundleTypeRole + Editor + NSDocumentClass + AppDelegate + + + CFBundleTypeExtensions + + sbi CFBundleTypeIconFile ccbi.icns From c7fb075acae4aaae3a6960a73ed3a71a097ecf8c Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Wed, 18 Feb 2015 13:50:47 -0600 Subject: [PATCH 14/20] Moving template files --- .../MainScene.ccb.ppng | Bin 10257 -> 0 bytes .../{MainScene.ccbi => MainScene.sbi} | Bin .../{MainScene.ccbi => MainScene.sbi} | Bin 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100755 Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/MainScene.ccb.ppng rename Support/PROJECTNAME.spritebuilder/Source/Resources/Published-Android/{MainScene.ccbi => MainScene.sbi} (100%) rename Support/PROJECTNAME.spritebuilder/Source/Resources/Published-iOS/{MainScene.ccbi => MainScene.sbi} (100%) diff --git a/Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/MainScene.ccb.ppng b/Support/PROJECTNAME.spritebuilder/Packages/SpriteBuilder Resources.sbpack/MainScene.ccb.ppng deleted file mode 100755 index 3296fa4cae9218ecca767faa3bbf428d96e463e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10257 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 diff --git a/Support/PROJECTNAME.spritebuilder/Source/Resources/Published-Android/MainScene.ccbi b/Support/PROJECTNAME.spritebuilder/Source/Resources/Published-Android/MainScene.sbi similarity index 100% rename from Support/PROJECTNAME.spritebuilder/Source/Resources/Published-Android/MainScene.ccbi rename to Support/PROJECTNAME.spritebuilder/Source/Resources/Published-Android/MainScene.sbi diff --git a/Support/PROJECTNAME.spritebuilder/Source/Resources/Published-iOS/MainScene.ccbi b/Support/PROJECTNAME.spritebuilder/Source/Resources/Published-iOS/MainScene.sbi similarity index 100% rename from Support/PROJECTNAME.spritebuilder/Source/Resources/Published-iOS/MainScene.ccbi rename to Support/PROJECTNAME.spritebuilder/Source/Resources/Published-iOS/MainScene.sbi From 1f4e1b1d7fcc514e7498e8c9fcb38fc29740a091 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Wed, 18 Feb 2015 13:51:02 -0600 Subject: [PATCH 15/20] Update Spritebuilder tests to compile. --- .../SpriteBuilder Tests/CCAnimation_Tests.m | 18 +++++++++--------- .../CCBReader_EffectsTest.m | 2 +- .../SpriteBuilder Tests/CCBReader_Tests.m | 4 ++-- .../Cocos2dTestHelpers.h | 1 + 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m index 15084e025..b14b59c28 100644 --- a/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m +++ b/SpriteBuilder/SpriteBuilder Tests/CCAnimation_Tests.m @@ -11,10 +11,10 @@ #import "CCBXCocos2diPhone.h" #import "PlugInManager.h" #import "PlugInExport.h" -#import "CCBReader.h" +#import "CCSBReader.h" #import "CCAnimationManager.h" #import "CCAnimationManager_Private.h" -#import "CCBSequence.h" +#import "CCSequence.h" #import "Cocos2dTestHelpers.h" #define IS_NEAR(a,b,accuracy) (fabsf(a - b) < kAccuracy) @@ -25,7 +25,7 @@ @implementation CCAnimationManager (Test) --(CCBSequence*)runningSequence +-(CCSequence*)runningSequence { return _runningSequence; } @@ -33,7 +33,7 @@ -(CCBSequence*)runningSequence @end typedef void (^CallbackBlock) (); -@interface CCAnimationDelegateTester : NSObject +@interface CCAnimationDelegateTester : NSObject { CallbackBlock _sequenceFinished; } @@ -148,7 +148,7 @@ - (void)testAnimationSync1 float totalElapsed = 0.0f; __block float currentAnimElapsed = 0.0f; - CCBSequence * seq = rootNode.animationManager.sequences[0]; + CCSequence * seq = rootNode.animationManager.sequences[0]; [rootNode.animationManager setCompletedAnimationCallbackBlock:^(CCAnimationManager * manager) { XCTAssertTrue(fabsf(currentAnimElapsed - seq.duration) < kAccuracy, @"The animation should have taken 4 seconds. Possible divergenc."); @@ -193,7 +193,7 @@ -(void)testAnimationCallback1 CCBReader * reader = [CCBReader reader]; CCNode * rootNode = [reader loadWithData:animData owner:callbackTest]; - CCBSequence * seq = rootNode.animationManager.sequences[0]; + CCSequence * seq = rootNode.animationManager.sequences[0]; rootNode.animationManager.delegate = callbackTest; @@ -252,7 +252,7 @@ -(void)testAnimationTween1 XCTAssertTrue([node0.name isEqualToString:@"node0"]); - CCBSequence * seq = rootNode.animationManager.sequences[0]; + CCSequence * seq = rootNode.animationManager.sequences[0]; rootNode.animationManager.delegate = callbackTest; const CGFloat kXTranslation = 500.0f; @@ -392,7 +392,7 @@ -(void)testAnimationLoop1 XCTAssertTrue([node0.name isEqualToString:@"node0"]); - CCBSequence * seq = rootNode.animationManager.sequences[0]; + CCSequence * seq = rootNode.animationManager.sequences[0]; rootNode.animationManager.delegate = callbackHelper; const CGFloat kXTranslation = 500.0f; @@ -455,7 +455,7 @@ -(void)testAnimationSeeking1 XCTAssertTrue([node0.name isEqualToString:@"node0"]); - CCBSequence * seq = rootNode.animationManager.sequences[0]; + CCSequence * seq = rootNode.animationManager.sequences[0]; const CGFloat kXTranslation = 500.0f; diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m b/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m index c9b4c77ae..1ccadad5a 100644 --- a/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m +++ b/SpriteBuilder/SpriteBuilder Tests/CCBReader_EffectsTest.m @@ -8,7 +8,7 @@ #import #import "Cocos2dTestHelpers.h" -#import "CCBReader.h" +#import "CCSBReader.h" @interface CCBReader_EffectsTest : XCTestCase diff --git a/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m b/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m index fec32f54c..94dda39d0 100644 --- a/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m +++ b/SpriteBuilder/SpriteBuilder Tests/CCBReader_Tests.m @@ -8,8 +8,8 @@ #import #import "CCBBinaryWriter.h" -#import "CCBReader_Private.h" #import "Cocos2dTestHelpers.h" +#import "CCSBReader_Private.h" @interface CCBReader_Tests : XCTestCase @@ -31,7 +31,7 @@ - (void)tearDown - (void)testCCBVersionCompatibility { - XCTAssertEqual(kCCBVersion, kCCBBinaryVersion, @"CCB version %d read by CCBReader is incompatible with version %d written by SpriteBuilder. Is cocos2d up to date?", kCCBVersion, kCCBBinaryVersion); + XCTAssertEqual(kCCVersion, kCCBBinaryVersion, @"SB version %d read by CCSBReader is incompatible with version %d written by SpriteBuilder. Is cocos2d up to date?", kCCVersion, kCCBBinaryVersion); } @end diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.h b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.h index c8fb35969..c034c90a6 100644 --- a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.h +++ b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/Cocos2dTestHelpers.h @@ -7,6 +7,7 @@ // #import +#import "CCDeprecated.h" @interface Cocos2dTestHelpers : NSObject From 5584bc1576ea2f23626add0744c037b2900bab97 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Thu, 19 Feb 2015 14:47:37 -0600 Subject: [PATCH 16/20] SB can read both .ccbproj and .sbproj files, but creates only .sbproj when you start a new project. --- SpriteBuilder/ccBuilder/AppDelegate.m | 10 ++++++---- SpriteBuilder/ccBuilder/CCBProjectCreator.m | 2 +- SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist | 14 ++++++++++++++ .../{PROJECTNAME.ccbproj => PROJECTNAME.sbproj} | 0 4 files changed, 21 insertions(+), 5 deletions(-) rename Support/PROJECTNAME.spritebuilder/{PROJECTNAME.ccbproj => PROJECTNAME.sbproj} (100%) diff --git a/SpriteBuilder/ccBuilder/AppDelegate.m b/SpriteBuilder/ccBuilder/AppDelegate.m index 49abdc246..0dcce19b3 100644 --- a/SpriteBuilder/ccBuilder/AppDelegate.m +++ b/SpriteBuilder/ccBuilder/AppDelegate.m @@ -1789,12 +1789,13 @@ - (BOOL)openProjectWithProjectPath:(NSString *)projectPath - (void)openProject:(NSString *)fileName { if (![fileName hasSuffix:@".spritebuilder"] - && ![fileName hasSuffix:@".ccbproj"]) + && ![fileName hasSuffix:@".ccbproj"] + && ![fileName hasSuffix:@".sbproj"]) { return; } - if ([fileName hasSuffix:@".ccbproj"]) + if ([fileName hasSuffix:@".ccbproj"] || [fileName hasSuffix:@".sbproj"]) { NSURL *projectPathURL = [NSURL fileURLWithPath:[fileName stringByDeletingLastPathComponent] isDirectory:YES]; NSURL *projectPathURLResolved = [SecurityScopedBookmarksStore resolveBookmarkForURL:projectPathURL]; @@ -2048,7 +2049,7 @@ - (NSString*) findProject:(NSString*) path NSArray* files = [fm contentsOfDirectoryAtPath:path error:NULL]; for( NSString* file in files ) { - if( [file hasSuffix:@".ccbproj"] ) + if( [file hasSuffix:@".ccbproj"] || [file hasSuffix:@".sbproj"] ) { projectFile = [path stringByAppendingPathComponent:file]; break; @@ -3023,6 +3024,7 @@ - (IBAction)menuUpdateCCBsInDirectory:(id)sender - (IBAction)menuOpenProjectInXCode:(id)sender { NSString *xcodePrjPath = [projectSettings.projectPath stringByReplacingOccurrencesOfString:@".ccbproj" withString:@".xcodeproj"]; + xcodePrjPath = [xcodePrjPath stringByReplacingOccurrencesOfString:@".sbproj" withString:@".xcodeproj"]; [[NSWorkspace sharedWorkspace] openFile:xcodePrjPath withApplication:@"Xcode"]; } @@ -3159,7 +3161,7 @@ -(void) createNewProjectTargetting:(CCBTargetEngine)engine // Create project file NSString* projectName = [fileNameRaw lastPathComponent]; - fileName = [[fileName stringByAppendingPathComponent:projectName] stringByAppendingPathExtension:@"ccbproj"]; + fileName = [[fileName stringByAppendingPathComponent:projectName] stringByAppendingPathExtension:@"sbproj"]; dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0), dispatch_get_main_queue(), ^{ diff --git a/SpriteBuilder/ccBuilder/CCBProjectCreator.m b/SpriteBuilder/ccBuilder/CCBProjectCreator.m index 2cd939bb1..ad4ff1303 100644 --- a/SpriteBuilder/ccBuilder/CCBProjectCreator.m +++ b/SpriteBuilder/ccBuilder/CCBProjectCreator.m @@ -70,7 +70,7 @@ - (BOOL)createDefaultProjectAtPath:(NSString *)fileName engine:(CCBTargetEngine) [zipTask waitUntilExit]; // Rename ccbproj - NSString *ccbproj = [NSString stringWithFormat:@"%@.ccbproj", substitutableProjectName]; + NSString *ccbproj = [NSString stringWithFormat:@"%@.sbproj", substitutableProjectName]; [fm moveItemAtPath:[parentPath stringByAppendingPathComponent:ccbproj] toPath:fileName error:NULL]; // Update the Xcode project diff --git a/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist b/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist index c2c07eeac..32b43ae57 100644 --- a/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist +++ b/SpriteBuilder/ccBuilder/SpriteBuilder-Info.plist @@ -74,6 +74,20 @@ CFBundleTypeRole None + + CFBundleTypeExtensions + + sbproj + + CFBundleTypeIconFile + ccbproj.icns + CFBundleTypeName + SpriteBuilder Project + CFBundleTypeRole + Editor + NSDocumentClass + AppDelegate + CFBundleExecutable ${EXECUTABLE_NAME} diff --git a/Support/PROJECTNAME.spritebuilder/PROJECTNAME.ccbproj b/Support/PROJECTNAME.spritebuilder/PROJECTNAME.sbproj similarity index 100% rename from Support/PROJECTNAME.spritebuilder/PROJECTNAME.ccbproj rename to Support/PROJECTNAME.spritebuilder/PROJECTNAME.sbproj From b96fa0c3ade512a9d7d04b117cea8e82231fbada Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Thu, 19 Feb 2015 15:08:03 -0600 Subject: [PATCH 17/20] Fixes for opening .sbproj, better error display when failing to load a project. --- SpriteBuilder/ccBuilder/AppDelegate.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SpriteBuilder/ccBuilder/AppDelegate.m b/SpriteBuilder/ccBuilder/AppDelegate.m index 0dcce19b3..afe488e1e 100644 --- a/SpriteBuilder/ccBuilder/AppDelegate.m +++ b/SpriteBuilder/ccBuilder/AppDelegate.m @@ -1696,7 +1696,7 @@ - (BOOL)openProjectWithProjectPath:(NSString *)projectPath //Find .ccbproj file NSArray *projectContents = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:projectPath error:nil]; - NSPredicate *ccbprojExtension = [NSPredicate predicateWithFormat:@"SELF ENDSWITH '.ccbproj'"]; + NSPredicate *ccbprojExtension = [NSPredicate predicateWithFormat:@"SELF ENDSWITH '.ccbproj' OR SELF ENDSWITH '.sbproj'"]; NSString *ccbprojFileName = (NSString*)[[projectContents filteredArrayUsingPredicate:ccbprojExtension] firstObject]; projectPath = [projectPath stringByAppendingPathComponent:ccbprojFileName]; @@ -1705,7 +1705,7 @@ - (BOOL)openProjectWithProjectPath:(NSString *)projectPath NSMutableDictionary* projectDict = [NSMutableDictionary dictionaryWithContentsOfFile:projectPath]; if (!projectDict) { - [self modalDialogTitle:@"Invalid Project File" message:@"Failed to open the project. File may be missing or invalid."]; + [self modalDialogTitle:@"Invalid Project File" message:[NSString stringWithFormat:@"Failed to open the project. File may be missing or invalid. Attempted to open: %@", projectPath]]; return NO; } From 6b20cd10511b92955728891a5126cff0d28a9386 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Thu, 19 Feb 2015 15:52:55 -0600 Subject: [PATCH 18/20] Update unit test assets. All tests are passing! --- .../{AnimationTest1.ccb => AnimationTest1.sb} | 0 .../{AnimationTest2.ccb => AnimationTest2.sb} | 0 .../{AnimationTest3.ccb => AnimationTest3.sb} | 0 .../{AnimationTest4.ccb => AnimationTest4.sb} | 0 .../{AnimationTest5.ccb => AnimationTest5.sb} | 0 .../{EffectTest1.ccb => EffectTest1.sb} | 0 ...er_bmfont.ccb => test_ccbreader_bmfont.sb} | 0 ...layout.ccb => test_ccbreader_boxlayout.sb} | 0 ...er_button.ccb => test_ccbreader_button.sb} | 0 ...ornode.ccb => test_ccbreader_colornode.sb} | 0 ...tnode.ccb => test_ccbreader_effectnode.sb} | 0 ...abeltff.ccb => test_ccbreader_labeltff.sb} | 0 ...est_ccbreader_migration_version_4_to_5.sb} | 0 ...reader_node.ccb => test_ccbreader_node.sb} | 0 ...ader_node_customClass_customProperties.sb} | 0 ...ent.ccb => test_ccbreader_nodegradient.sb} | 0 ... test_ccbreader_particlesystem_gravity.sb} | 0 ...> test_ccbreader_particlesystem_radial.sb} | 0 ...lview.ccb => test_ccbreader_scrollview.sb} | 0 ...er_slider.ccb => test_ccbreader_slider.sb} | 0 ...er_sprite.ccb => test_ccbreader_sprite.sb} | 0 ...ice.ccb => test_ccbreader_sprite9slice.sb} | 0 ..._subfile.ccb => test_ccbreader_subfile.sb} | 0 ...tfield.ccb => test_ccbreader_textfield.sb} | 0 .../SpriteBuilder.xcodeproj/project.pbxproj | 192 +++++++++--------- 25 files changed, 96 insertions(+), 96 deletions(-) rename SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/{AnimationTest1.ccb => AnimationTest1.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/{AnimationTest2.ccb => AnimationTest2.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/{AnimationTest3.ccb => AnimationTest3.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/{AnimationTest4.ccb => AnimationTest4.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/{AnimationTest5.ccb => AnimationTest5.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/{EffectTest1.ccb => EffectTest1.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_bmfont.ccb => test_ccbreader_bmfont.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_boxlayout.ccb => test_ccbreader_boxlayout.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_button.ccb => test_ccbreader_button.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_colornode.ccb => test_ccbreader_colornode.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_effectnode.ccb => test_ccbreader_effectnode.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_labeltff.ccb => test_ccbreader_labeltff.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_migration_version_4_to_5.ccb => test_ccbreader_migration_version_4_to_5.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_node.ccb => test_ccbreader_node.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_node_customClass_customProperties.ccb => test_ccbreader_node_customClass_customProperties.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_nodegradient.ccb => test_ccbreader_nodegradient.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_particlesystem_gravity.ccb => test_ccbreader_particlesystem_gravity.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_particlesystem_radial.ccb => test_ccbreader_particlesystem_radial.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_scrollview.ccb => test_ccbreader_scrollview.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_slider.ccb => test_ccbreader_slider.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_sprite.ccb => test_ccbreader_sprite.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_sprite9slice.ccb => test_ccbreader_sprite9slice.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_subfile.ccb => test_ccbreader_subfile.sb} (100%) rename SpriteBuilder/SpriteBuilder Tests/Testing Resources/{test_ccbreader_textfield.ccb => test_ccbreader_textfield.sb} (100%) diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest1.ccb b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest1.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest1.ccb rename to SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest1.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest2.ccb b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest2.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest2.ccb rename to SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest2.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest3.ccb b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest3.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest3.ccb rename to SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest3.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest4.ccb b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest4.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest4.ccb rename to SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest4.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest5.ccb b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest5.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest5.ccb rename to SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest5.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/EffectTest1.ccb b/SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/EffectTest1.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/EffectTest1.ccb rename to SpriteBuilder/SpriteBuilder Tests/SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/EffectTest1.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_bmfont.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_bmfont.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_bmfont.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_bmfont.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_boxlayout.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_boxlayout.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_boxlayout.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_boxlayout.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_button.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_button.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_button.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_button.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_colornode.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_colornode.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_colornode.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_colornode.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_effectnode.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_effectnode.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_effectnode.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_effectnode.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_labeltff.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_labeltff.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_labeltff.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_labeltff.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_migration_version_4_to_5.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_migration_version_4_to_5.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_migration_version_4_to_5.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_migration_version_4_to_5.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node_customClass_customProperties.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node_customClass_customProperties.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node_customClass_customProperties.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_node_customClass_customProperties.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_nodegradient.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_nodegradient.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_nodegradient.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_nodegradient.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_gravity.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_gravity.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_gravity.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_gravity.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_radial.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_radial.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_radial.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_particlesystem_radial.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_scrollview.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_scrollview.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_scrollview.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_scrollview.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_slider.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_slider.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_slider.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_slider.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite9slice.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite9slice.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite9slice.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_sprite9slice.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_subfile.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_subfile.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_subfile.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_subfile.sb diff --git a/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_textfield.ccb b/SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_textfield.sb similarity index 100% rename from SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_textfield.ccb rename to SpriteBuilder/SpriteBuilder Tests/Testing Resources/test_ccbreader_textfield.sb diff --git a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj index f9b1319f3..202d75384 100644 --- a/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj +++ b/SpriteBuilder/SpriteBuilder.xcodeproj/project.pbxproj @@ -26,6 +26,30 @@ 5BA3DC36192110BA0055DD96 /* GuideGridSizeWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BA3DC31192108AB0055DD96 /* GuideGridSizeWindow.xib */; }; 5BB9A3551A038C59008184AE /* ResourceDuplicateCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BB9A3541A038C59008184AE /* ResourceDuplicateCommand.m */; }; 5BBEC3601A011D8D00FBA08B /* InspectorTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BBEC35F1A011D8D00FBA08B /* InspectorTextView.m */; }; + 752A2BDF1A9691BF00B6F135 /* test_ccbreader_bmfont.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BCD1A9691BF00B6F135 /* test_ccbreader_bmfont.sb */; }; + 752A2BE01A9691BF00B6F135 /* test_ccbreader_boxlayout.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BCE1A9691BF00B6F135 /* test_ccbreader_boxlayout.sb */; }; + 752A2BE11A9691BF00B6F135 /* test_ccbreader_button.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BCF1A9691BF00B6F135 /* test_ccbreader_button.sb */; }; + 752A2BE21A9691BF00B6F135 /* test_ccbreader_colornode.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD01A9691BF00B6F135 /* test_ccbreader_colornode.sb */; }; + 752A2BE31A9691BF00B6F135 /* test_ccbreader_effectnode.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD11A9691BF00B6F135 /* test_ccbreader_effectnode.sb */; }; + 752A2BE41A9691BF00B6F135 /* test_ccbreader_labeltff.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD21A9691BF00B6F135 /* test_ccbreader_labeltff.sb */; }; + 752A2BE51A9691BF00B6F135 /* test_ccbreader_migration_version_4_to_5.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD31A9691BF00B6F135 /* test_ccbreader_migration_version_4_to_5.sb */; }; + 752A2BE61A9691BF00B6F135 /* test_ccbreader_node_customClass_customProperties.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD41A9691BF00B6F135 /* test_ccbreader_node_customClass_customProperties.sb */; }; + 752A2BE71A9691BF00B6F135 /* test_ccbreader_node.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD51A9691BF00B6F135 /* test_ccbreader_node.sb */; }; + 752A2BE81A9691BF00B6F135 /* test_ccbreader_nodegradient.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD61A9691BF00B6F135 /* test_ccbreader_nodegradient.sb */; }; + 752A2BE91A9691BF00B6F135 /* test_ccbreader_particlesystem_gravity.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD71A9691BF00B6F135 /* test_ccbreader_particlesystem_gravity.sb */; }; + 752A2BEA1A9691BF00B6F135 /* test_ccbreader_particlesystem_radial.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD81A9691BF00B6F135 /* test_ccbreader_particlesystem_radial.sb */; }; + 752A2BEB1A9691BF00B6F135 /* test_ccbreader_scrollview.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BD91A9691BF00B6F135 /* test_ccbreader_scrollview.sb */; }; + 752A2BEC1A9691BF00B6F135 /* test_ccbreader_slider.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BDA1A9691BF00B6F135 /* test_ccbreader_slider.sb */; }; + 752A2BED1A9691BF00B6F135 /* test_ccbreader_sprite.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BDB1A9691BF00B6F135 /* test_ccbreader_sprite.sb */; }; + 752A2BEE1A9691BF00B6F135 /* test_ccbreader_sprite9slice.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BDC1A9691BF00B6F135 /* test_ccbreader_sprite9slice.sb */; }; + 752A2BEF1A9691BF00B6F135 /* test_ccbreader_subfile.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BDD1A9691BF00B6F135 /* test_ccbreader_subfile.sb */; }; + 752A2BF01A9691BF00B6F135 /* test_ccbreader_textfield.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BDE1A9691BF00B6F135 /* test_ccbreader_textfield.sb */; }; + 752A2BFA1A96924500B6F135 /* AnimationTest1.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BF41A96924500B6F135 /* AnimationTest1.sb */; }; + 752A2BFB1A96924500B6F135 /* AnimationTest2.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BF51A96924500B6F135 /* AnimationTest2.sb */; }; + 752A2BFC1A96924500B6F135 /* AnimationTest3.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BF61A96924500B6F135 /* AnimationTest3.sb */; }; + 752A2BFD1A96924500B6F135 /* AnimationTest4.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BF71A96924500B6F135 /* AnimationTest4.sb */; }; + 752A2BFE1A96924500B6F135 /* AnimationTest5.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BF81A96924500B6F135 /* AnimationTest5.sb */; }; + 752A2BFF1A96924500B6F135 /* EffectTest1.sb in Resources */ = {isa = PBXBuildFile; fileRef = 752A2BF91A96924500B6F135 /* EffectTest1.sb */; }; 77055FB513D0E5CA009DD63A /* logo-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 77055FB313D0E5CA009DD63A /* logo-icon.png */; }; 77055FB613D0E5CA009DD63A /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 77055FB413D0E5CA009DD63A /* logo.png */; }; 77156DB1137F0351005EF746 /* CCBSpriteSheetParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 77156DB0137F0351005EF746 /* CCBSpriteSheetParser.m */; }; @@ -259,7 +283,6 @@ 92053DB6197F096000AA93AD /* EffectBloomControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 92053DB3197F096000AA93AD /* EffectBloomControl.m */; }; 92053DB8197F097F00AA93AD /* effect-bloom.png in Resources */ = {isa = PBXBuildFile; fileRef = 92053DB7197F097F00AA93AD /* effect-bloom.png */; }; 920994BB19870EC40006F38D /* CCBReader_EffectsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 920994BA19870EC40006F38D /* CCBReader_EffectsTest.m */; }; - 920994C119870EF90006F38D /* EffectTest1.ccb in Resources */ = {isa = PBXBuildFile; fileRef = 920994BD19870EF90006F38D /* EffectTest1.ccb */; }; 920994C219870EF90006F38D /* cartoon_house.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 920994BE19870EF90006F38D /* cartoon_house.jpg */; }; 920994C319870EF90006F38D /* ShinyBallColor.png in Resources */ = {isa = PBXBuildFile; fileRef = 920994BF19870EF90006F38D /* ShinyBallColor.png */; }; 920994C419870EF90006F38D /* ShinyBallNormals.png in Resources */ = {isa = PBXBuildFile; fileRef = 920994C019870EF90006F38D /* ShinyBallNormals.png */; }; @@ -315,8 +338,6 @@ 921EEADD18A5760700D864C2 /* joint-pivot@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 921EEAD518A5760700D864C2 /* joint-pivot@2x.png */; }; 921EEAE018A5884300D864C2 /* SequencerJoints.m in Sources */ = {isa = PBXBuildFile; fileRef = 921EEADF18A5884300D864C2 /* SequencerJoints.m */; }; 921EEB2418ADB7EA00D864C2 /* GeometryUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 921EEB2318ADB7EA00D864C2 /* GeometryUtil.m */; }; - 922CC396194676B600B34854 /* AnimationTest1.ccb in Resources */ = {isa = PBXBuildFile; fileRef = 922CC395194676B600B34854 /* AnimationTest1.ccb */; }; - 922CC3981946873A00B34854 /* AnimationTest2.ccb in Resources */ = {isa = PBXBuildFile; fileRef = 922CC3971946873A00B34854 /* AnimationTest2.ccb */; }; 922E8EFE18C13666008E1764 /* OutletDrawWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 922E8EFD18C13666008E1764 /* OutletDrawWindow.m */; }; 922EAC471958F41E006F2D75 /* CCBPEffectBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = 922EAC461958F41E006F2D75 /* CCBPEffectBrightness.m */; }; 9249983218B7E1F500DE9ADA /* SceneGraph.m in Sources */ = {isa = PBXBuildFile; fileRef = 9249983118B7E1F500DE9ADA /* SceneGraph.m */; }; @@ -422,9 +443,6 @@ 92F0961918F8855A00D47A94 /* inspector-body-goto@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 92F0961518F8855A00D47A94 /* inspector-body-goto@2x.png */; }; 92F12E4E18847BC800AB8F32 /* seq-keyframe-x4-sel.png in Resources */ = {isa = PBXBuildFile; fileRef = 80B149BC183D4D280085935B /* seq-keyframe-x4-sel.png */; }; 92F64B78199C14E300769BB5 /* SpriteBuilder 1.3 Beta.icns in Resources */ = {isa = PBXBuildFile; fileRef = 92F64B77199C14E300769BB5 /* SpriteBuilder 1.3 Beta.icns */; }; - 92F85F34194F6AD80076B343 /* AnimationTest3.ccb in Resources */ = {isa = PBXBuildFile; fileRef = 92F85F33194F6AD80076B343 /* AnimationTest3.ccb */; }; - 92F85F37194F70CA0076B343 /* AnimationTest4.ccb in Resources */ = {isa = PBXBuildFile; fileRef = 92F85F36194F70CA0076B343 /* AnimationTest4.ccb */; }; - 92F85F3C194F8A4A0076B343 /* AnimationTest5.ccb in Resources */ = {isa = PBXBuildFile; fileRef = 92F85F3B194F8A4A0076B343 /* AnimationTest5.ccb */; }; 98C392F0FA6E4C385A9B7BDA /* NSKeyboardForwardingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 98C39A979A6BFC23DB610BDE /* NSKeyboardForwardingView.m */; }; A09AB6F714E993AA009C8B91 /* fps_images.png in Resources */ = {isa = PBXBuildFile; fileRef = A09AB6F614E993AA009C8B91 /* fps_images.png */; }; B7083DF317B1C363006628C7 /* LocalizationEditorWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = B7083DF217B1C363006628C7 /* LocalizationEditorWindow.xib */; }; @@ -850,9 +868,7 @@ E525F0B45E1523153C200B71 /* FileSystemTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FC7DE2AC8E54CEBAD194 /* FileSystemTestCase.m */; }; E525F0BD99E8E797E5F4278F /* ResourcePropertiesMigrator_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FAE2C72CA11398491070 /* ResourcePropertiesMigrator_Tests.m */; }; E525F0CA1647993A7388B7BC /* InspectorStringSimple.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FA43EE7D1C6B7C52E601 /* InspectorStringSimple.m */; }; - E525F0D503EEE8DB1EE506A3 /* test_ccbreader_effectnode.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FFF365C597A1BE609FBC /* test_ccbreader_effectnode.ccb */; }; E525F0EA925087B3D2ABE8D3 /* ResourceNewPackageCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FDFD10EE6761E4E94BED /* ResourceNewPackageCommand.m */; }; - E525F0F3AE0A436DC488B7D0 /* test_ccbreader_colornode.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FB04170EA24EB855A135 /* test_ccbreader_colornode.ccb */; }; E525F12B1E4605EB494FA44C /* PackageMigrationController.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F7254C3A84AA7585A1F8 /* PackageMigrationController.m */; }; E525F165B4E19784684E39D4 /* PublishUtil_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FA2C90028FB3D047213C /* PublishUtil_Tests.m */; }; E525F1775124A78C8A2FFE99 /* InspectorSize.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F4BF41919531FA401AC5 /* InspectorSize.m */; }; @@ -876,7 +892,6 @@ E525F2C0B3311DCAEC86C6B0 /* PublishImageOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FC7FEB1B9D2A5F7FFEA5 /* PublishImageOperation.m */; }; E525F2CA0ED42F21A4777F2E /* InspectorPopoverFloat.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FF4F0648F14C369A8E7B /* InspectorPopoverFloat.xib */; }; E525F2D49FBDA5CF8C8F0026 /* InspectorFlip.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FE849808293F2D7051BA /* InspectorFlip.m */; }; - E525F2EE21B854D48D538E8B /* test_ccbreader_node_customClass_customProperties.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FEDBFC68A96C09F6BCC9 /* test_ccbreader_node_customClass_customProperties.ccb */; }; E525F30359F75816D1F178F1 /* PublishUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FE25558D5B40E8284D62 /* PublishUtil.m */; }; E525F3051C62E3CBA69E877A /* InspectorIntegerLabeled.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F90E4BCE3BA5130B8E9D /* InspectorIntegerLabeled.xib */; }; E525F308447A45DFEE6C23EE /* ProjectMigrator.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F9C63E463EE451384EBB /* ProjectMigrator.m */; }; @@ -906,10 +921,8 @@ E525F455AC1D4C9B7F74596E /* FormatConvert_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F0E08A79DE5698E23CD6 /* FormatConvert_Tests.m */; }; E525F45C0B173D2FF63B9573 /* InspectorFlip.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F0021A81F90852D0875E /* InspectorFlip.xib */; }; E525F45CD322A0BCB1A7EDBF /* ResourcePropertiesMigrator.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F76017FD450D7F946CEA /* ResourcePropertiesMigrator.m */; }; - E525F45EAC76C2CF0CAA2DFA /* test_ccbreader_sprite.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FA8C46273CCDDB0B9B91 /* test_ccbreader_sprite.ccb */; }; E525F45F2E20CA8B27C0F866 /* InspectorBlockCCControl.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F7A071A64D388A087E0F /* InspectorBlockCCControl.xib */; }; E525F46241CE0EC990F40A75 /* InspectorPointLock.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FA6634EE8E705E1E1A0B /* InspectorPointLock.xib */; }; - E525F4675E32F33E1962C71B /* test_ccbreader_nodegradient.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525F531AB1A136BD0D0F6F8 /* test_ccbreader_nodegradient.ccb */; }; E525F46FC0F80AEC8AA43D48 /* PackageRemover_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FE05E5E4D72C7A63437A /* PackageRemover_Tests.m */; }; E525F47301A5C8C234262F36 /* PackageRemover.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F0DCE4278ED8AE6D7491 /* PackageRemover.m */; }; E525F473DCC5E8F4A66D4D33 /* InspectorFontTTF.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FA39177A6B3C303B9DA6 /* InspectorFontTTF.m */; }; @@ -924,19 +937,15 @@ E525F50E27715B344266949A /* ResourceManager+Publishing.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F984FC2B05C07E7991CD /* ResourceManager+Publishing.m */; }; E525F50F98A675866A7F0B15 /* InspectorBlockCCControl.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FF91995A6E0CFB8E29BD /* InspectorBlockCCControl.m */; }; E525F519BAA5EC36A4DE0C7C /* MoveFileCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F3482D555C2E5CDC4A6F /* MoveFileCommand.m */; }; - E525F52862358F064F038B67 /* test_ccbreader_node.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525F26DC99AC95FFAE4E7C8 /* test_ccbreader_node.ccb */; }; E525F54E815C9791D778E3BA /* InspectorAnimation.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FC054F765C06313A3385 /* InspectorAnimation.m */; }; E525F55709C7B6FCB64695FA /* RMDirectory_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F195694A84DD7EDEC25E /* RMDirectory_Tests.m */; }; E525F560E9CD0BFCB143ACC0 /* InspectorByte.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F33640CEA0B8E13CB7CA /* InspectorByte.xib */; }; E525F57D9C6C716295683654 /* PackageMigrator_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F0219F49F375C2F5DED2 /* PackageMigrator_Tests.m */; }; E525F598C4D71DC6330D2F7F /* InspectorPhysicsUnavailable.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F377E4B3F3DF3FE57AF5 /* InspectorPhysicsUnavailable.xib */; }; - E525F5C7E24AE5085670D43B /* test_ccbreader_textfield.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FE7458F3960493FBF8D6 /* test_ccbreader_textfield.ccb */; }; - E525F5C98360B005AC6E8DBE /* test_ccbreader_labeltff.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525F0C142266AD2AB2EEB4B /* test_ccbreader_labeltff.ccb */; }; E525F5CB1DA42E6720A6476E /* PropertyInspectorTemplateCollectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F0DC68CB5BE68E2E4233 /* PropertyInspectorTemplateCollectionView.m */; }; E525F5E6EF1FB917093D1F60 /* InspectorStringSimple.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F12EA995AE91DCC34059 /* InspectorStringSimple.xib */; }; E525F5E7563958DE71C9B4AE /* ResourceExportPackageCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F0424E2063AF911B0692 /* ResourceExportPackageCommand.m */; }; E525F5E78A703F1381486AA8 /* InspectorColor4.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FF599E666FBB986616AF /* InspectorColor4.xib */; }; - E525F5F14EA780789D4B1E4C /* test_ccbreader_scrollview.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525F907C5BC9418418D8181 /* test_ccbreader_scrollview.ccb */; }; E525F5F8C06CCB481FC77BEC /* MoveFileCommand_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FDF4D554770EFA28EE37 /* MoveFileCommand_Tests.m */; }; E525F622A96F0C31CACF1883 /* InspectoreController_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FC53AA00AC664A9E5D75 /* InspectoreController_Tests.m */; }; E525F634C2EE9B50F56B0E27 /* InspectorSeparatorSub.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FF364C63BB5CD36B6E1D /* InspectorSeparatorSub.m */; }; @@ -950,8 +959,6 @@ E525F72F2963947D91C8567B /* FileSystemTestCase+Images.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F2F32EC9F70210361E7D /* FileSystemTestCase+Images.m */; }; E525F737F211D45673D7BC62 /* PackageImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FF96D86C4DDC63B9BF63 /* PackageImporter.m */; }; E525F73E5E09F387AE34D519 /* InspectorPosition.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FF473922B627A6A884A7 /* InspectorPosition.xib */; }; - E525F7417672EF139D91F2BB /* test_ccbreader_slider.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FBD96C7FD372B58D4FD8 /* test_ccbreader_slider.ccb */; }; - E525F76F40CE2A23E80DC6D9 /* test_ccbreader_migration_version_4_to_5.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525F4A8257E15BC525C169B /* test_ccbreader_migration_version_4_to_5.ccb */; }; E525F7955AC7103E961D6553 /* PluginNode_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FC789866B6FA119F827F /* PluginNode_Tests.m */; }; E525F7A003FECE9F026E6272 /* InspectorFntFile.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F2BBA2DFE1F0E3A4E3A4 /* InspectorFntFile.m */; }; E525F7A38F87B899A18CA645 /* InspectorFloatXY.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F859D5D885670A69CAA5 /* InspectorFloatXY.m */; }; @@ -968,7 +975,6 @@ E525F8CC32EB23EC8FC384F3 /* InspectorPosition.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F2590AF8747283B8D25D /* InspectorPosition.m */; }; E525F90784006C34BD20E775 /* RMPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F49BD7988117B20F261D /* RMPackage.m */; }; E525F91C915E02FFF36E4B28 /* CCBDocumentDataCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FA7CCCE20F5956560452 /* CCBDocumentDataCreator.m */; }; - E525F91F6C8A910FBCFE6766 /* test_ccbreader_particlesystem_gravity.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FA8DE3F7445926977690 /* test_ccbreader_particlesystem_gravity.ccb */; }; E525F93359F8368EAE1A2EB8 /* PreviewView_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FEA356C07ED52CF1FCCA /* PreviewView_Tests.m */; }; E525F939AAC25DF9B7276558 /* InspectorByte.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FC30968813B67FE4F531 /* InspectorByte.m */; }; E525F94BC8F398BA7E428344 /* InspectorFloatCheck.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F29361AA6B48C33259EA /* InspectorFloatCheck.m */; }; @@ -988,18 +994,15 @@ E525FA53ED13870D020579B8 /* CCBPublisher.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FFEB091D46AB06B02BF1 /* CCBPublisher.m */; }; E525FA5D4791EB730859BF2C /* ProjectSettings+Convenience.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FCD604B9708D96E9EE11 /* ProjectSettings+Convenience.m */; }; E525FA6349C648C70C3F65DC /* PublishSoundFileOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F6FD3B484B1762858AEB /* PublishSoundFileOperation.m */; }; - E525FA7356DE54DD30FD00A9 /* test_ccbreader_subfile.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FA7B7D1DBB27B574BA16 /* test_ccbreader_subfile.ccb */; }; E525FA948965CBD67857C6F6 /* CCBPublisherController.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F7FF46AF3A6A44E16D69 /* CCBPublisherController.m */; }; E525FAA332D8E00D89DF1215 /* InspectorCCBFile.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FFE261905E5B939DC1F1 /* InspectorCCBFile.xib */; }; E525FAC90C0458232F35C64C /* RemoveFileCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F5A87B18967058D36E9D /* RemoveFileCommand.m */; }; E525FACB3FFF18C4D4AC13FF /* RMSpriteFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F7D66E8C3826418D67AE /* RMSpriteFrame.m */; }; E525FACCFCFDC3FE00EB9A6B /* PackageUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F86B6E089F4C7ED63ADD /* PackageUtil.m */; }; - E525FAD69A58D49F8DD03730 /* test_ccbreader_bmfont.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FA9BFE2369CF195C9768 /* test_ccbreader_bmfont.ccb */; }; E525FB0F3B78CEE08D44752B /* MailingListWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F870492449C3158CD9ED /* MailingListWindow.m */; }; E525FB20D3C6755CC64987B1 /* InspectorDegrees.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F799DEF1619721810E6E /* InspectorDegrees.xib */; }; E525FB27722F4E158CC501C5 /* InspectorNodeReference.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F2016B3DB7DF1651B605 /* InspectorNodeReference.m */; }; E525FB30A10E77E6C59149A6 /* InspectorScaleLock.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FCDD7A52D2DE6BD2D6D4 /* InspectorScaleLock.xib */; }; - E525FB73743B8CF39195EC9F /* test_ccbreader_sprite9slice.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FD7B16D1386D7031A87E /* test_ccbreader_sprite9slice.ccb */; }; E525FB7B0CB67BE80AAFB31F /* OptimizeImageWithOptiPNGOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F8D13D187525150C6EA7 /* OptimizeImageWithOptiPNGOperation.m */; }; E525FB8491D3CC4B8B0D536F /* NSNumber+ImageResolutions_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FEFBAEFBE0162647D84C /* NSNumber+ImageResolutions_Tests.m */; }; E525FB8A7250188137051AF3 /* InspectorTexture.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FB84B7161C23D44036DB /* InspectorTexture.xib */; }; @@ -1012,7 +1015,6 @@ E525FBF9C805E185C3F609B9 /* InspectorInteger.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F173545F6AA131BE9DE6 /* InspectorInteger.xib */; }; E525FBFD616A1BE9F86C2312 /* PublishOSSettings_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FB3851A1B28013282F4C /* PublishOSSettings_Tests.m */; }; E525FC0A0C9C32BEF65F349A /* ImageFormatAndPropertiesHelper_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F935F75CEEC73F182FBD /* ImageFormatAndPropertiesHelper_Tests.m */; }; - E525FC1B07784CC895AF4565 /* test_ccbreader_button.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FB12FF11EC4A8E76B22B /* test_ccbreader_button.ccb */; }; E525FC20A2FC407CCFE76052 /* InspectorSpriteFrame.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F6E05240A9D8362DCAC3 /* InspectorSpriteFrame.m */; }; E525FC31D70B5FC45A92D878 /* InspectorPointLock.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FB412FD4D7DCB9F0F248 /* InspectorPointLock.m */; }; E525FC3487265AE7715CE955 /* ObserverTestHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F3F446FE40F0B87D829F /* ObserverTestHelper.m */; }; @@ -1024,7 +1026,6 @@ E525FC693A6A8123E2B47943 /* CCBDictionaryMigrator_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FA7818B4C0D6C068B81A /* CCBDictionaryMigrator_Tests.m */; }; E525FC7C4CC9DF569C8C7461 /* InspectorPopoverPosition.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F25365C18CD517E444D2 /* InspectorPopoverPosition.xib */; }; E525FC83AD6818E028635AC9 /* MailingListWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525FD2158199F3168E4AD1E /* MailingListWindow.xib */; }; - E525FC88A571A9D6A1DA7482 /* test_ccbreader_particlesystem_radial.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525F7E311C08B1F3B5BCA6E /* test_ccbreader_particlesystem_radial.ccb */; }; E525FC8E53C200B5CBB844BF /* RMPackage_Tests.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FDD3F471141E09E46C88 /* RMPackage_Tests.m */; }; E525FCCB0F98F23FF4F4A83B /* MiscConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F60141EECA8FC9DF3034 /* MiscConstants.m */; }; E525FCD21C3519D61A86ACEF /* PackageRenamer.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FB678B5AF8D31E5EA1C1 /* PackageRenamer.m */; }; @@ -1048,7 +1049,6 @@ E525FE4E98094590DEF34EF8 /* CCBPublisherCacheCleaner.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F13FEF3757012A4E0DDE /* CCBPublisherCacheCleaner.m */; }; E525FF00EF056E6904CAB106 /* InspectorController.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F8027C3E43F222BD84A5 /* InspectorController.m */; }; E525FF15523F47E23FC1A6AB /* ResourceNewFileCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F62CB14FA52E5EBC0BDC /* ResourceNewFileCommand.m */; }; - E525FF40BA6323ED6F98E6E6 /* test_ccbreader_boxlayout.ccb in Resources */ = {isa = PBXBuildFile; fileRef = E525FF51FD57B47165E67C05 /* test_ccbreader_boxlayout.ccb */; }; E525FF5E533A11756767D753 /* PublishRegularFileOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = E525FF2CEC6DF0EB5FFCA742 /* PublishRegularFileOperation.m */; }; E525FF5FB1CCCDABE19542EC /* ResourceCommandController.m in Sources */ = {isa = PBXBuildFile; fileRef = E525F9DCAC90DFA3438D22FD /* ResourceCommandController.m */; }; E525FF63460A0C637890856F /* InspectorString.xib in Resources */ = {isa = PBXBuildFile; fileRef = E525F441BF8BA2627B1411F5 /* InspectorString.xib */; }; @@ -1347,6 +1347,30 @@ 5BB9A3541A038C59008184AE /* ResourceDuplicateCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResourceDuplicateCommand.m; sourceTree = ""; }; 5BBEC35E1A011D8D00FBA08B /* InspectorTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorTextView.h; sourceTree = ""; }; 5BBEC35F1A011D8D00FBA08B /* InspectorTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorTextView.m; sourceTree = ""; }; + 752A2BCD1A9691BF00B6F135 /* test_ccbreader_bmfont.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_bmfont.sb; sourceTree = ""; }; + 752A2BCE1A9691BF00B6F135 /* test_ccbreader_boxlayout.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_boxlayout.sb; sourceTree = ""; }; + 752A2BCF1A9691BF00B6F135 /* test_ccbreader_button.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_button.sb; sourceTree = ""; }; + 752A2BD01A9691BF00B6F135 /* test_ccbreader_colornode.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_colornode.sb; sourceTree = ""; }; + 752A2BD11A9691BF00B6F135 /* test_ccbreader_effectnode.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_effectnode.sb; sourceTree = ""; }; + 752A2BD21A9691BF00B6F135 /* test_ccbreader_labeltff.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_labeltff.sb; sourceTree = ""; }; + 752A2BD31A9691BF00B6F135 /* test_ccbreader_migration_version_4_to_5.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_migration_version_4_to_5.sb; sourceTree = ""; }; + 752A2BD41A9691BF00B6F135 /* test_ccbreader_node_customClass_customProperties.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_node_customClass_customProperties.sb; sourceTree = ""; }; + 752A2BD51A9691BF00B6F135 /* test_ccbreader_node.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_node.sb; sourceTree = ""; }; + 752A2BD61A9691BF00B6F135 /* test_ccbreader_nodegradient.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_nodegradient.sb; sourceTree = ""; }; + 752A2BD71A9691BF00B6F135 /* test_ccbreader_particlesystem_gravity.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_particlesystem_gravity.sb; sourceTree = ""; }; + 752A2BD81A9691BF00B6F135 /* test_ccbreader_particlesystem_radial.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_particlesystem_radial.sb; sourceTree = ""; }; + 752A2BD91A9691BF00B6F135 /* test_ccbreader_scrollview.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_scrollview.sb; sourceTree = ""; }; + 752A2BDA1A9691BF00B6F135 /* test_ccbreader_slider.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_slider.sb; sourceTree = ""; }; + 752A2BDB1A9691BF00B6F135 /* test_ccbreader_sprite.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_sprite.sb; sourceTree = ""; }; + 752A2BDC1A9691BF00B6F135 /* test_ccbreader_sprite9slice.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_sprite9slice.sb; sourceTree = ""; }; + 752A2BDD1A9691BF00B6F135 /* test_ccbreader_subfile.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_subfile.sb; sourceTree = ""; }; + 752A2BDE1A9691BF00B6F135 /* test_ccbreader_textfield.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = test_ccbreader_textfield.sb; sourceTree = ""; }; + 752A2BF41A96924500B6F135 /* AnimationTest1.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest1.sb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest1.sb"; sourceTree = ""; }; + 752A2BF51A96924500B6F135 /* AnimationTest2.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest2.sb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest2.sb"; sourceTree = ""; }; + 752A2BF61A96924500B6F135 /* AnimationTest3.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest3.sb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest3.sb"; sourceTree = ""; }; + 752A2BF71A96924500B6F135 /* AnimationTest4.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest4.sb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest4.sb"; sourceTree = ""; }; + 752A2BF81A96924500B6F135 /* AnimationTest5.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest5.sb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest5.sb"; sourceTree = ""; }; + 752A2BF91A96924500B6F135 /* EffectTest1.sb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = EffectTest1.sb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/EffectTest1.sb"; sourceTree = ""; }; 77055FB313D0E5CA009DD63A /* logo-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo-icon.png"; sourceTree = ""; }; 77055FB413D0E5CA009DD63A /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = ""; }; 77156DAF137F0351005EF746 /* CCBSpriteSheetParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBSpriteSheetParser.h; sourceTree = ""; }; @@ -1684,7 +1708,6 @@ 92053DB3197F096000AA93AD /* EffectBloomControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EffectBloomControl.m; path = ccBuilder/EffectBloomControl.m; sourceTree = ""; }; 92053DB7197F097F00AA93AD /* effect-bloom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "effect-bloom.png"; path = "Resources/effect-bloom.png"; sourceTree = ""; }; 920994BA19870EC40006F38D /* CCBReader_EffectsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBReader_EffectsTest.m; sourceTree = ""; }; - 920994BD19870EF90006F38D /* EffectTest1.ccb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = EffectTest1.ccb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/EffectTest1.ccb"; sourceTree = ""; }; 920994BE19870EF90006F38D /* cartoon_house.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = cartoon_house.jpg; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/ccbResources/resources-auto/cartoon_house.jpg"; sourceTree = ""; }; 920994BF19870EF90006F38D /* ShinyBallColor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ShinyBallColor.png; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/ccbResources/resources-auto/ShinyBallColor.png"; sourceTree = ""; }; 920994C019870EF90006F38D /* ShinyBallNormals.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ShinyBallNormals.png; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/ccbResources/resources-auto/ShinyBallNormals.png"; sourceTree = ""; }; @@ -1750,8 +1773,6 @@ 921EEADF18A5884300D864C2 /* SequencerJoints.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SequencerJoints.m; sourceTree = ""; }; 921EEB2218ADB7EA00D864C2 /* GeometryUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeometryUtil.h; sourceTree = ""; }; 921EEB2318ADB7EA00D864C2 /* GeometryUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeometryUtil.m; sourceTree = ""; }; - 922CC395194676B600B34854 /* AnimationTest1.ccb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest1.ccb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest1.ccb"; sourceTree = ""; }; - 922CC3971946873A00B34854 /* AnimationTest2.ccb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest2.ccb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest2.ccb"; sourceTree = ""; }; 922E8EFC18C13666008E1764 /* OutletDrawWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OutletDrawWindow.h; path = ccBuilder/OutletDrawWindow.h; sourceTree = SOURCE_ROOT; }; 922E8EFD18C13666008E1764 /* OutletDrawWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OutletDrawWindow.m; path = ccBuilder/OutletDrawWindow.m; sourceTree = SOURCE_ROOT; }; 922EAC451958F41E006F2D75 /* CCBPEffectBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCBPEffectBrightness.h; path = ccBuilder/CCBPEffectBrightness.h; sourceTree = ""; }; @@ -1887,9 +1908,6 @@ 92F0961418F8855A00D47A94 /* inspector-body-goto-hi@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "inspector-body-goto-hi@2x.png"; sourceTree = ""; }; 92F0961518F8855A00D47A94 /* inspector-body-goto@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "inspector-body-goto@2x.png"; sourceTree = ""; }; 92F64B77199C14E300769BB5 /* SpriteBuilder 1.3 Beta.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "SpriteBuilder 1.3 Beta.icns"; sourceTree = SOURCE_ROOT; }; - 92F85F33194F6AD80076B343 /* AnimationTest3.ccb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest3.ccb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest3.ccb"; sourceTree = ""; }; - 92F85F36194F70CA0076B343 /* AnimationTest4.ccb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest4.ccb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest4.ccb"; sourceTree = ""; }; - 92F85F3B194F8A4A0076B343 /* AnimationTest5.ccb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; name = AnimationTest5.ccb; path = "SpriteBuilderTestProject.spritebuilder/SpriteBuilder Resources/AnimationTest5.ccb"; sourceTree = ""; }; 98C3964FFF8C4E1070E390F8 /* NSKeyboardForwardingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSKeyboardForwardingView.h; sourceTree = ""; }; 98C39A979A6BFC23DB610BDE /* NSKeyboardForwardingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSKeyboardForwardingView.m; sourceTree = ""; }; A09AB6F614E993AA009C8B91 /* fps_images.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = fps_images.png; path = "libs/cocos2d-iphone/Resources/Fonts/fps_images.png"; sourceTree = SOURCE_ROOT; }; @@ -2498,7 +2516,6 @@ E525F0AF452CAF5998D6381A /* InspectorCustomEdit.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorCustomEdit.xib; sourceTree = ""; }; E525F0BBB9C50B0BD24915DE /* InspectorColor3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorColor3.h; sourceTree = ""; }; E525F0BC44FE0FDD5840BDC8 /* ResourceTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceTypes.h; sourceTree = ""; }; - E525F0C142266AD2AB2EEB4B /* test_ccbreader_labeltff.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_labeltff.ccb; sourceTree = ""; }; E525F0CC240D4588175A2329 /* CCBPublisher.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBPublisher.h; sourceTree = ""; }; E525F0DC68CB5BE68E2E4233 /* PropertyInspectorTemplateCollectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PropertyInspectorTemplateCollectionView.m; sourceTree = ""; }; E525F0DCE4278ED8AE6D7491 /* PackageRemover.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PackageRemover.m; sourceTree = ""; }; @@ -2546,7 +2563,6 @@ E525F25365C18CD517E444D2 /* InspectorPopoverPosition.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorPopoverPosition.xib; sourceTree = ""; }; E525F2590AF8747283B8D25D /* InspectorPosition.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorPosition.m; sourceTree = ""; }; E525F25FB682AC78F068A57C /* CCBPublisherCacheCleaner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBPublisherCacheCleaner.h; sourceTree = ""; }; - E525F26DC99AC95FFAE4E7C8 /* test_ccbreader_node.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_node.ccb; sourceTree = ""; }; E525F29361AA6B48C33259EA /* InspectorFloatCheck.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorFloatCheck.m; sourceTree = ""; }; E525F293C77C212C2DB614E1 /* InspectorTexture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorTexture.m; sourceTree = ""; }; E525F293EA6B75042C82A01F /* RemoveFileCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RemoveFileCommand.h; sourceTree = ""; }; @@ -2589,7 +2605,6 @@ E525F4903068E78680732248 /* SemanticVersioning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SemanticVersioning.h; sourceTree = ""; }; E525F49BD7988117B20F261D /* RMPackage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMPackage.m; sourceTree = ""; }; E525F4A044BFAAB8869AD973 /* InspectorFontTTF.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFontTTF.h; sourceTree = ""; }; - E525F4A8257E15BC525C169B /* test_ccbreader_migration_version_4_to_5.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_migration_version_4_to_5.ccb; sourceTree = ""; }; E525F4BF41919531FA401AC5 /* InspectorSize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorSize.m; sourceTree = ""; }; E525F4E062545A8BB45D80D5 /* InspectorCheck.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCheck.h; sourceTree = ""; }; E525F4E2F17ADF7C24EE84DF /* RemoveFileCommand_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RemoveFileCommand_Tests.m; sourceTree = ""; }; @@ -2597,7 +2612,6 @@ E525F50315A73CE3734277F2 /* InspectorFloatXY.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFloatXY.h; sourceTree = ""; }; E525F510AE325C5A3DF41DA3 /* FileSystemTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileSystemTestCase.h; sourceTree = ""; }; E525F51E61767602F66107B1 /* InspectorIntegerLabeled.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorIntegerLabeled.m; sourceTree = ""; }; - E525F531AB1A136BD0D0F6F8 /* test_ccbreader_nodegradient.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_nodegradient.ccb; sourceTree = ""; }; E525F548A11D0FDEAE37BAB5 /* InspectorBlock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBlock.h; sourceTree = ""; }; E525F555049710FF6F9C655F /* InspectorSeparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorSeparator.h; sourceTree = ""; }; E525F563B38B9F934F699449 /* InspectorSeparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorSeparator.m; sourceTree = ""; }; @@ -2643,7 +2657,6 @@ E525F7C98F4B58F4520B89FC /* PackageImporter_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PackageImporter_Tests.m; sourceTree = ""; }; E525F7CF0712D692E773D013 /* ResourceToggleSmartSpriteSheetCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceToggleSmartSpriteSheetCommand.h; sourceTree = ""; }; E525F7D66E8C3826418D67AE /* RMSpriteFrame.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMSpriteFrame.m; sourceTree = ""; }; - E525F7E311C08B1F3B5BCA6E /* test_ccbreader_particlesystem_radial.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_particlesystem_radial.ccb; sourceTree = ""; }; E525F7E5C3F70DFC88E438B2 /* InspectorPoint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorPoint.m; sourceTree = ""; }; E525F7EE37BDD5941E6C0AC9 /* PublishRenamedFilesLookup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PublishRenamedFilesLookup.m; sourceTree = ""; }; E525F7FDEB6E06727F3674DC /* OptimizeImageWithOptiPNGOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptimizeImageWithOptiPNGOperation.h; sourceTree = ""; }; @@ -2677,7 +2690,6 @@ E525F8D13D187525150C6EA7 /* OptimizeImageWithOptiPNGOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OptimizeImageWithOptiPNGOperation.m; sourceTree = ""; }; E525F8D24C0C5FA581D7E9B8 /* PublishingFinishedDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublishingFinishedDelegate.h; sourceTree = ""; }; E525F8EEB5893680A0B28A27 /* InspectorCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCustom.h; sourceTree = ""; }; - E525F907C5BC9418418D8181 /* test_ccbreader_scrollview.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_scrollview.ccb; sourceTree = ""; }; E525F90876BE1677B68F8373 /* NSError+SBErrors.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+SBErrors.m"; sourceTree = ""; }; E525F90B1FAB88CFFA07BA6E /* InspectorPopoverScaleLock.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorPopoverScaleLock.xib; sourceTree = ""; }; E525F90E4BCE3BA5130B8E9D /* InspectorIntegerLabeled.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorIntegerLabeled.xib; sourceTree = ""; }; @@ -2713,22 +2725,16 @@ E525FA6F3FA1EC682616EB41 /* CCBPublisherController_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBPublisherController_Tests.m; sourceTree = ""; }; E525FA71E014DDED2AFE71EF /* NSString+Misc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Misc.m"; sourceTree = ""; }; E525FA7818B4C0D6C068B81A /* CCBDictionaryMigrator_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBDictionaryMigrator_Tests.m; sourceTree = ""; }; - E525FA7B7D1DBB27B574BA16 /* test_ccbreader_subfile.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_subfile.ccb; sourceTree = ""; }; E525FA7CCCE20F5956560452 /* CCBDocumentDataCreator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBDocumentDataCreator.m; sourceTree = ""; }; E525FA80E35B4E390DA01A9F /* InspectorColor4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorColor4.h; sourceTree = ""; }; E525FA8328B2749A80A9BB95 /* CCAnimation_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCAnimation_Tests.m; sourceTree = ""; }; - E525FA8C46273CCDDB0B9B91 /* test_ccbreader_sprite.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_sprite.ccb; sourceTree = ""; }; - E525FA8DE3F7445926977690 /* test_ccbreader_particlesystem_gravity.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_particlesystem_gravity.ccb; sourceTree = ""; }; - E525FA9BFE2369CF195C9768 /* test_ccbreader_bmfont.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_bmfont.ccb; sourceTree = ""; }; E525FA9EF0F4D52A34755230 /* InspectorCheck.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorCheck.xib; sourceTree = ""; }; E525FACAFF47151E5CC2C512 /* PackageExporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PackageExporter.m; sourceTree = ""; }; E525FAE2C72CA11398491070 /* ResourcePropertiesMigrator_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResourcePropertiesMigrator_Tests.m; sourceTree = ""; }; E525FAF305E29FFBA1ADF131 /* RMAnimation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMAnimation.h; sourceTree = ""; }; E525FAFB93A1F09355692BB1 /* CCBDictionaryMigrationStepVersion4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBDictionaryMigrationStepVersion4.h; sourceTree = ""; }; - E525FB04170EA24EB855A135 /* test_ccbreader_colornode.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_colornode.ccb; sourceTree = ""; }; E525FB10982384F8E0C0E079 /* PublishSpriteSheetOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublishSpriteSheetOperation.h; sourceTree = ""; }; E525FB122597817578F84A85 /* MiscConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MiscConstants.h; sourceTree = ""; }; - E525FB12FF11EC4A8E76B22B /* test_ccbreader_button.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_button.ccb; sourceTree = ""; }; E525FB1366B0FD0B12AC1EDA /* InspectorBlockCCControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBlockCCControl.h; sourceTree = ""; }; E525FB189F069AB001586F6C /* InspectorCodeConnectionsJS.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorCodeConnectionsJS.xib; sourceTree = ""; }; E525FB2C511229C00D261998 /* InspectorEnabledFloat.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorEnabledFloat.xib; sourceTree = ""; }; @@ -2740,7 +2746,6 @@ E525FB99E57002A960DF1E18 /* InspectorFloat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFloat.h; sourceTree = ""; }; E525FBCE41C4F05F5A7AB421 /* InspectorSize.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorSize.xib; sourceTree = ""; }; E525FBCE967B17EDFEA5EDB8 /* NSString+Publishing_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+Publishing_Tests.m"; sourceTree = ""; }; - E525FBD96C7FD372B58D4FD8 /* test_ccbreader_slider.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_slider.ccb; sourceTree = ""; }; E525FBEA7BBBE5081391D9E0 /* SBPackageSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SBPackageSettings.m; sourceTree = ""; }; E525FBEDE030873F8A1A3A0B /* RMSpriteFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RMSpriteFrame.h; sourceTree = ""; }; E525FBFAF37ED551810B58A5 /* PackageImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PackageImporter.h; sourceTree = ""; }; @@ -2785,7 +2790,6 @@ E525FD5B0F64DC8D7BC147CF /* InspectorCodeConnectionsJS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorCodeConnectionsJS.m; sourceTree = ""; }; E525FD702E268242A41C54F4 /* PackageExporter_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PackageExporter_Tests.m; sourceTree = ""; }; E525FD7A50FBA15D21819682 /* PublishBaseOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PublishBaseOperation.h; sourceTree = ""; }; - E525FD7B16D1386D7031A87E /* test_ccbreader_sprite9slice.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; name = test_ccbreader_sprite9slice.ccb; path = "Testing Resources/test_ccbreader_sprite9slice.ccb"; sourceTree = ""; }; E525FD8E1D01D1EDBB7B7E5E /* ResourceOpenInExternalEditorCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResourceOpenInExternalEditorCommand.m; sourceTree = ""; }; E525FD97778D165E7455E7F6 /* InspectorScaleLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorScaleLock.h; sourceTree = ""; }; E525FDB29C5EE936AB40BE96 /* DateCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateCache.h; sourceTree = ""; }; @@ -2806,7 +2810,6 @@ E525FE520C891B3D37F5F564 /* InspectorStartStop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorStartStop.h; sourceTree = ""; }; E525FE561C3F2F72AC9FD31B /* InspectorCustom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorCustom.m; sourceTree = ""; }; E525FE6EEA14481321CC29E3 /* InspectorSpriteFrame.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorSpriteFrame.xib; sourceTree = ""; }; - E525FE7458F3960493FBF8D6 /* test_ccbreader_textfield.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_textfield.ccb; sourceTree = ""; }; E525FE7743A319577492F8FE /* InspectorCCBFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorCCBFile.h; sourceTree = ""; }; E525FE7D2E12F6004546A65F /* InspectorBlock.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorBlock.xib; sourceTree = ""; }; E525FE80A18731AAFB1A6C36 /* PreviewBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewBaseViewController.h; sourceTree = ""; }; @@ -2819,7 +2822,6 @@ E525FEBD04EA72B634654F33 /* InspectorSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorSize.h; sourceTree = ""; }; E525FEBFE86C6D193DBB8D1E /* ResourceDeleteCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceDeleteCommand.h; sourceTree = ""; }; E525FED28257D82C09E2EB7B /* InspectorPopoverDegrees.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorPopoverDegrees.xib; sourceTree = ""; }; - E525FEDBFC68A96C09F6BCC9 /* test_ccbreader_node_customClass_customProperties.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_node_customClass_customProperties.ccb; sourceTree = ""; }; E525FEFB9DD4C68B41FF4F1F /* ruler-numbers.fnt */ = {isa = PBXFileReference; lastKnownFileType = file.fnt; path = "ruler-numbers.fnt"; sourceTree = ""; }; E525FEFBAEFBE0162647D84C /* NSNumber+ImageResolutions_Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSNumber+ImageResolutions_Tests.m"; sourceTree = ""; }; E525FF18D2784BB119B2882A /* RMResource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RMResource.m; sourceTree = ""; }; @@ -2831,7 +2833,6 @@ E525FF364C63BB5CD36B6E1D /* InspectorSeparatorSub.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorSeparatorSub.m; sourceTree = ""; }; E525FF473922B627A6A884A7 /* InspectorPosition.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorPosition.xib; sourceTree = ""; }; E525FF4F0648F14C369A8E7B /* InspectorPopoverFloat.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorPopoverFloat.xib; sourceTree = ""; }; - E525FF51FD57B47165E67C05 /* test_ccbreader_boxlayout.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_boxlayout.ccb; sourceTree = ""; }; E525FF599E666FBB986616AF /* InspectorColor4.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorColor4.xib; sourceTree = ""; }; E525FF91995A6E0CFB8E29BD /* InspectorBlockCCControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectorBlockCCControl.m; sourceTree = ""; }; E525FF96D86C4DDC63B9BF63 /* PackageImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PackageImporter.m; sourceTree = ""; }; @@ -2841,7 +2842,6 @@ E525FFCF01C9BDA997422221 /* CCBDictionaryMigrator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBDictionaryMigrator.h; sourceTree = ""; }; E525FFE261905E5B939DC1F1 /* InspectorCCBFile.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = InspectorCCBFile.xib; sourceTree = ""; }; E525FFEB091D46AB06B02BF1 /* CCBPublisher.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCBPublisher.m; sourceTree = ""; }; - E525FFF365C597A1BE609FBC /* test_ccbreader_effectnode.ccb */ = {isa = PBXFileReference; lastKnownFileType = file.ccb; path = test_ccbreader_effectnode.ccb; sourceTree = ""; }; FA98CFC1154E7D1C006E58C5 /* ccbpublish */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ccbpublish; sourceTree = BUILT_PRODUCTS_DIR; }; FA98CFC3154E7D1C006E58C5 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; FA98CFC6154E7D1C006E58C5 /* ccbpublish.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ccbpublish.m; sourceTree = ""; }; @@ -4359,12 +4359,12 @@ 920994BE19870EF90006F38D /* cartoon_house.jpg */, 920994BF19870EF90006F38D /* ShinyBallColor.png */, 920994C019870EF90006F38D /* ShinyBallNormals.png */, - 920994BD19870EF90006F38D /* EffectTest1.ccb */, - 92F85F3B194F8A4A0076B343 /* AnimationTest5.ccb */, - 92F85F36194F70CA0076B343 /* AnimationTest4.ccb */, - 92F85F33194F6AD80076B343 /* AnimationTest3.ccb */, - 922CC3971946873A00B34854 /* AnimationTest2.ccb */, - 922CC395194676B600B34854 /* AnimationTest1.ccb */, + 752A2BF91A96924500B6F135 /* EffectTest1.sb */, + 752A2BF41A96924500B6F135 /* AnimationTest1.sb */, + 752A2BF51A96924500B6F135 /* AnimationTest2.sb */, + 752A2BF61A96924500B6F135 /* AnimationTest3.sb */, + 752A2BF71A96924500B6F135 /* AnimationTest4.sb */, + 752A2BF81A96924500B6F135 /* AnimationTest5.sb */, ); name = Resources; sourceTree = ""; @@ -5858,23 +5858,24 @@ E525FC9645E2BF20C2460ED6 /* Testing Resources */ = { isa = PBXGroup; children = ( - E525FE7458F3960493FBF8D6 /* test_ccbreader_textfield.ccb */, - E525FBD96C7FD372B58D4FD8 /* test_ccbreader_slider.ccb */, - E525F531AB1A136BD0D0F6F8 /* test_ccbreader_nodegradient.ccb */, - E525F4A8257E15BC525C169B /* test_ccbreader_migration_version_4_to_5.ccb */, - E525F26DC99AC95FFAE4E7C8 /* test_ccbreader_node.ccb */, - E525FB04170EA24EB855A135 /* test_ccbreader_colornode.ccb */, - E525FF51FD57B47165E67C05 /* test_ccbreader_boxlayout.ccb */, - E525FEDBFC68A96C09F6BCC9 /* test_ccbreader_node_customClass_customProperties.ccb */, - E525FFF365C597A1BE609FBC /* test_ccbreader_effectnode.ccb */, - E525F907C5BC9418418D8181 /* test_ccbreader_scrollview.ccb */, - E525FA7B7D1DBB27B574BA16 /* test_ccbreader_subfile.ccb */, - E525FA8C46273CCDDB0B9B91 /* test_ccbreader_sprite.ccb */, - E525FA9BFE2369CF195C9768 /* test_ccbreader_bmfont.ccb */, - E525FB12FF11EC4A8E76B22B /* test_ccbreader_button.ccb */, - E525FA8DE3F7445926977690 /* test_ccbreader_particlesystem_gravity.ccb */, - E525F7E311C08B1F3B5BCA6E /* test_ccbreader_particlesystem_radial.ccb */, - E525F0C142266AD2AB2EEB4B /* test_ccbreader_labeltff.ccb */, + 752A2BCD1A9691BF00B6F135 /* test_ccbreader_bmfont.sb */, + 752A2BCE1A9691BF00B6F135 /* test_ccbreader_boxlayout.sb */, + 752A2BCF1A9691BF00B6F135 /* test_ccbreader_button.sb */, + 752A2BD01A9691BF00B6F135 /* test_ccbreader_colornode.sb */, + 752A2BD11A9691BF00B6F135 /* test_ccbreader_effectnode.sb */, + 752A2BD21A9691BF00B6F135 /* test_ccbreader_labeltff.sb */, + 752A2BD31A9691BF00B6F135 /* test_ccbreader_migration_version_4_to_5.sb */, + 752A2BD41A9691BF00B6F135 /* test_ccbreader_node_customClass_customProperties.sb */, + 752A2BD51A9691BF00B6F135 /* test_ccbreader_node.sb */, + 752A2BD61A9691BF00B6F135 /* test_ccbreader_nodegradient.sb */, + 752A2BD71A9691BF00B6F135 /* test_ccbreader_particlesystem_gravity.sb */, + 752A2BD81A9691BF00B6F135 /* test_ccbreader_particlesystem_radial.sb */, + 752A2BD91A9691BF00B6F135 /* test_ccbreader_scrollview.sb */, + 752A2BDA1A9691BF00B6F135 /* test_ccbreader_slider.sb */, + 752A2BDB1A9691BF00B6F135 /* test_ccbreader_sprite.sb */, + 752A2BDC1A9691BF00B6F135 /* test_ccbreader_sprite9slice.sb */, + 752A2BDD1A9691BF00B6F135 /* test_ccbreader_subfile.sb */, + 752A2BDE1A9691BF00B6F135 /* test_ccbreader_textfield.sb */, ); path = "Testing Resources"; sourceTree = ""; @@ -5905,7 +5906,6 @@ E525F10140E3181E71A2CEF6 /* CCBDictionaryReader_Tests.m */, E525FA7818B4C0D6C068B81A /* CCBDictionaryMigrator_Tests.m */, E525FF1A156E5EA62580F43D /* CCBDictionaryMigrationStepVersion4_Tests.m */, - E525FD7B16D1386D7031A87E /* test_ccbreader_sprite9slice.ccb */, ); name = "Document Readers & Writers"; sourceTree = ""; @@ -6940,45 +6940,45 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 922CC3981946873A00B34854 /* AnimationTest2.ccb in Resources */, + 752A2BEE1A9691BF00B6F135 /* test_ccbreader_sprite9slice.sb in Resources */, + 752A2BFE1A96924500B6F135 /* AnimationTest5.sb in Resources */, + 752A2BE21A9691BF00B6F135 /* test_ccbreader_colornode.sb in Resources */, + 752A2BFF1A96924500B6F135 /* EffectTest1.sb in Resources */, 833A5C52192B48CB001837B3 /* InfoPlist.strings in Resources */, + 752A2BE31A9691BF00B6F135 /* test_ccbreader_effectnode.sb in Resources */, + 752A2BDF1A9691BF00B6F135 /* test_ccbreader_bmfont.sb in Resources */, B7E6BB6919F86A9800619A58 /* ui-nopreview@2x.png in Resources */, + 752A2BEF1A9691BF00B6F135 /* test_ccbreader_subfile.sb in Resources */, B7E6BB5119F868F000619A58 /* sel-round@2x.png in Resources */, - 922CC396194676B600B34854 /* AnimationTest1.ccb in Resources */, + 752A2BE81A9691BF00B6F135 /* test_ccbreader_nodegradient.sb in Resources */, + 752A2BE71A9691BF00B6F135 /* test_ccbreader_node.sb in Resources */, 83599E9A1975470D008283EC /* photoshop.psd in Resources */, B7E6BB5319F868F000619A58 /* select-corner@2x.png in Resources */, - 92F85F3C194F8A4A0076B343 /* AnimationTest5.ccb in Resources */, 837D2E731A0D07F0009918B7 /* greyscale.png in Resources */, + 752A2BE91A9691BF00B6F135 /* test_ccbreader_particlesystem_gravity.sb in Resources */, 920994C419870EF90006F38D /* ShinyBallNormals.png in Resources */, 920994C319870EF90006F38D /* ShinyBallColor.png in Resources */, B7E6BB5B19F868F000619A58 /* seq-timedisplay-bg@2x.png in Resources */, 920994C219870EF90006F38D /* cartoon_house.jpg in Resources */, + 752A2BEA1A9691BF00B6F135 /* test_ccbreader_particlesystem_radial.sb in Resources */, + 752A2BE11A9691BF00B6F135 /* test_ccbreader_button.sb in Resources */, + 752A2BED1A9691BF00B6F135 /* test_ccbreader_sprite.sb in Resources */, B7E6BB5719F868F000619A58 /* select-pt@2x.png in Resources */, + 752A2BFD1A96924500B6F135 /* AnimationTest4.sb in Resources */, 830B39B0197032F400218021 /* blank.wav in Resources */, + 752A2BFB1A96924500B6F135 /* AnimationTest2.sb in Resources */, + 752A2BFC1A96924500B6F135 /* AnimationTest3.sb in Resources */, B7E6BB5919F868F000619A58 /* seq-scaleslide-bg@2x.png in Resources */, + 752A2BEC1A9691BF00B6F135 /* test_ccbreader_slider.sb in Resources */, B7E6BB4F19F868F000619A58 /* doc-particlesystem@2x.png in Resources */, - 920994C119870EF90006F38D /* EffectTest1.ccb in Resources */, - 92F85F37194F70CA0076B343 /* AnimationTest4.ccb in Resources */, - 92F85F34194F6AD80076B343 /* AnimationTest3.ccb in Resources */, + 752A2BFA1A96924500B6F135 /* AnimationTest1.sb in Resources */, + 752A2BE01A9691BF00B6F135 /* test_ccbreader_boxlayout.sb in Resources */, B7E6BB5519F868F000619A58 /* select-physics-corner@2x.png in Resources */, - E525FB73743B8CF39195EC9F /* test_ccbreader_sprite9slice.ccb in Resources */, - E525F5C7E24AE5085670D43B /* test_ccbreader_textfield.ccb in Resources */, - E525F7417672EF139D91F2BB /* test_ccbreader_slider.ccb in Resources */, - E525F4675E32F33E1962C71B /* test_ccbreader_nodegradient.ccb in Resources */, - E525F76F40CE2A23E80DC6D9 /* test_ccbreader_migration_version_4_to_5.ccb in Resources */, - E525F52862358F064F038B67 /* test_ccbreader_node.ccb in Resources */, - E525F0F3AE0A436DC488B7D0 /* test_ccbreader_colornode.ccb in Resources */, - E525FF40BA6323ED6F98E6E6 /* test_ccbreader_boxlayout.ccb in Resources */, - E525F2EE21B854D48D538E8B /* test_ccbreader_node_customClass_customProperties.ccb in Resources */, - E525F0D503EEE8DB1EE506A3 /* test_ccbreader_effectnode.ccb in Resources */, - E525F5F14EA780789D4B1E4C /* test_ccbreader_scrollview.ccb in Resources */, - E525FA7356DE54DD30FD00A9 /* test_ccbreader_subfile.ccb in Resources */, - E525F45EAC76C2CF0CAA2DFA /* test_ccbreader_sprite.ccb in Resources */, - E525FAD69A58D49F8DD03730 /* test_ccbreader_bmfont.ccb in Resources */, - E525FC1B07784CC895AF4565 /* test_ccbreader_button.ccb in Resources */, - E525F91F6C8A910FBCFE6766 /* test_ccbreader_particlesystem_gravity.ccb in Resources */, - E525FC88A571A9D6A1DA7482 /* test_ccbreader_particlesystem_radial.ccb in Resources */, - E525F5C98360B005AC6E8DBE /* test_ccbreader_labeltff.ccb in Resources */, + 752A2BE41A9691BF00B6F135 /* test_ccbreader_labeltff.sb in Resources */, + 752A2BE61A9691BF00B6F135 /* test_ccbreader_node_customClass_customProperties.sb in Resources */, + 752A2BF01A9691BF00B6F135 /* test_ccbreader_textfield.sb in Resources */, + 752A2BEB1A9691BF00B6F135 /* test_ccbreader_scrollview.sb in Resources */, + 752A2BE51A9691BF00B6F135 /* test_ccbreader_migration_version_4_to_5.sb in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; From 4df4c2cf3f7cebda8fedb85627728892941b2286 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Fri, 20 Feb 2015 11:07:45 -0600 Subject: [PATCH 19/20] update cocos2d submodule to point at the correct cocos2d commit in a pull request so the tests can run. --- SpriteBuilder/libs/cocos2d-iphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SpriteBuilder/libs/cocos2d-iphone b/SpriteBuilder/libs/cocos2d-iphone index 39b47877e..bed170b07 160000 --- a/SpriteBuilder/libs/cocos2d-iphone +++ b/SpriteBuilder/libs/cocos2d-iphone @@ -1 +1 @@ -Subproject commit 39b47877e855a2c5443e5f6e1f60b7bbb535b9be +Subproject commit bed170b07f07033f04feb9d6e8356232160a7cae From 414d2ceb5f5a7c2e312262e51ea50ea3b26aa8d9 Mon Sep 17 00:00:00 2001 From: Andy Korth Date: Mon, 23 Feb 2015 14:29:50 -0600 Subject: [PATCH 20/20] Fix issue caused by rebase merge conflicts --- SpriteBuilder/ccBuilder/CCBProjectCreator.m | 24 --------------------- 1 file changed, 24 deletions(-) diff --git a/SpriteBuilder/ccBuilder/CCBProjectCreator.m b/SpriteBuilder/ccBuilder/CCBProjectCreator.m index ad4ff1303..a9774c840 100644 --- a/SpriteBuilder/ccBuilder/CCBProjectCreator.m +++ b/SpriteBuilder/ccBuilder/CCBProjectCreator.m @@ -202,30 +202,6 @@ - (void)replace:(NSDictionary *)substitutions in:(NSString *)fileName } } -- (void)replace:(NSDictionary *)substitutions in:(NSString *)fileName -{ - NSFileManager *fm = [NSFileManager defaultManager]; - NSString *resultFilename = [NSString stringWithString:fileName]; - - for( NSString*key in substitutions.allKeys) - { - resultFilename = [resultFilename stringByReplacingOccurrencesOfString:key withString:substitutions[key]]; - } - - BOOL renameRequired = ![resultFilename isEqualToString:fileName]; - if(renameRequired) - { - NSError *error; - [fm moveItemAtPath:fileName toPath:resultFilename error:&error]; - NSAssert(!error, @"error occurred renaming %@ - %@", fileName, [error description]); - } - - for( NSString*key in substitutions.allKeys) - { - [self setName:substitutions[key] inFile:resultFilename search:key]; - } -} - - (void)setName:(NSString *)name inFile:(NSString *)fileName search:(NSString *)searchStr { NSMutableData *fileData = [NSMutableData dataWithContentsOfFile:fileName];