Merge branch 'combined_projects' into develop

slembcke · slembcke · commit 426e6a6de70d · 2014-10-13T13:50:19.000-05:00
diff --git a/UnitTests/CCPackageCocos2dEnablerTests.m b/UnitTests/CCPackageCocos2dEnablerTests.m
@@ -67,8 +67,7 @@ - (void)testDisablePackage
     XCTAssertFalse([self isPackageInSearchPath]);
 
     // Can't use [CCSprite spriteWithImageNamed:@"boredSmiley.png"], assertion exception is screwing up test result
-    CGFloat *scale;
-    NSString *path = [[CCFileUtils sharedFileUtils] fullPathForFilename:@"boredSmiley.png" contentScale:&scale];
+    NSString *path = [[CCFileUtils sharedFileUtils] fullPathForFilename:@"boredSmiley.png" contentScale:NULL];
     XCTAssertNil(path);
 }
 
diff --git a/UnitTests/CCPackageDownloadTests.m b/UnitTests/CCPackageDownloadTests.m
@@ -14,6 +14,10 @@
 #import "CCDirector.h"
 #import "AppDelegate.h"
 
+@interface CCPackageDownload()
+- (NSString *)createTempName;
+@end
+
 static NSUInteger __fileDownloadSize = 0;
 static BOOL __support_range_request = YES;
 
@@ -143,7 +147,7 @@ - (void)setUp
     self.downloadReturned = NO;
     self.downloadError = nil;
     self.downloadSuccessful = NO;
-    self.shouldOverwriteDownloadedFile;
+    [self shouldOverwriteDownloadedFile];
 
     self.package = [[CCPackage alloc] initWithName:@"testpackage"
                                         resolution:@"phonehd"
@@ -307,7 +311,7 @@ - (void)testPauseDownload
 
     XCTAssertEqual(_package.status, CCPackageStatusDownloadPaused);
     NSFileManager *fileManager = [NSFileManager defaultManager];
-    NSString *tempName = [_download performSelector:@selector(createTempName)];
+    NSString *tempName = [_download createTempName];
 
     BOOL success = [fileManager fileExistsAtPath:[[_localURL.path stringByDeletingLastPathComponent] stringByAppendingPathComponent:tempName]]
                    || [fileManager fileExistsAtPath:_download.localURL.path];
@@ -341,7 +345,7 @@ - (void)setupPartialDownloadOnDisk
     NSString *fileName = [_package.remoteURL lastPathComponent];
     NSString *pathToPackage = [[NSBundle mainBundle] pathForResource:[NSString stringWithFormat:@"Resources-shared/Packages/%@", fileName] ofType:nil];
     NSData *data = [[NSData dataWithContentsOfFile:pathToPackage] subdataWithRange:NSMakeRange(0, 5000)];
-    NSString *tempName = [_download performSelector:@selector(createTempName)];
+    NSString *tempName = [_download createTempName];
     [data writeToFile:[[_localURL.path stringByDeletingLastPathComponent] stringByAppendingPathComponent:tempName] atomically:YES];
 }
 
diff --git a/cocos2d-tests.xcodeproj/project.pbxproj b/cocos2d-tests.xcodeproj/project.pbxproj
diff --git a/cocos2d-ui-tests/MetalShaders/TestShaders.metal b/cocos2d-ui-tests/MetalShaders/TestShaders.metal
diff --git a/cocos2d.xcodeproj/project.pbxproj b/cocos2d.xcodeproj/project.pbxproj
@@ -441,7 +441,6 @@
 		7A97912A19E646D8001FFC4D /* libObjectiveChipmunk-Android.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A40377B19E36EFF007B6E8F /* libObjectiveChipmunk-Android.a */; };
 		7A97912B19E646F9001FFC4D /* libSSZipArchiveAndroid.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7A40378319E36EFF007B6E8F /* libSSZipArchiveAndroid.a */; };
 		83409E4919D5BADC004B7EB9 /* libSSZipArchive.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 83409E3619D5B791004B7EB9 /* libSSZipArchive.a */; };
-		83B7DB7B19D32FD800B9A452 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E1A88D19C8C19D000A3BCA /* libz.dylib */; };
 		83E1A86219C8ACA0000A3BCA /* CCPackage.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E1A85A19C8ACA0000A3BCA /* CCPackage.h */; };
 		83E1A86319C8ACA0000A3BCA /* CCPackage.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E1A85B19C8ACA0000A3BCA /* CCPackage.m */; };
 		83E1A86419C8ACA0000A3BCA /* CCPackageConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E1A85C19C8ACA0000A3BCA /* CCPackageConstants.h */; };
@@ -1484,7 +1483,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				83409E4919D5BADC004B7EB9 /* libSSZipArchive.a in Frameworks */,
-				83B7DB7B19D32FD800B9A452 /* libz.dylib in Frameworks */,
 				FC64014019C79716003E595A /* libObjectAL.a in Frameworks */,
 				D3903B1A19952ABD003AA81A /* Metal.framework in Frameworks */,
 				D24FAEEC198014B90043E27D /* GLKit.framework in Frameworks */,
diff --git a/cocos2d/CCPackageCocos2dEnabler.m b/cocos2d/CCPackageCocos2dEnabler.m
@@ -16,7 +16,7 @@ - (BOOL)isPackagInSearchPath:(CCPackage *)package
 
 - (void)enablePackages:(NSArray *)packages
 {
-    if ([self addPackagestoSearchPath:packages]);
+    if ([self addPackagestoSearchPath:packages])
     {
         CCLOGINFO(@"[PACKAGE/INSTALL][INFO] Enable packages - Search path: %@", [CCFileUtils sharedFileUtils].searchPath);
 
diff --git a/cocos2d/CCPackageDownload.m b/cocos2d/CCPackageDownload.m
@@ -280,7 +280,7 @@ - (BOOL)createFileHandle:(NSError **)error
 
     if (!fileHandle)
     {
-        CCLOG(@"[PACKAGE/DOWNLOAD][ERROR] %@, cannot open file for writing download %@", error, _tempPath);
+        CCLOG(@"[PACKAGE/DOWNLOAD][ERROR] %@, cannot open file for writing download %@", *error, _tempPath);
         return NO;
     }
 
diff --git a/cocos2d/CCPackageHelper.h b/cocos2d/CCPackageHelper.h
@@ -22,4 +22,4 @@
  */
 + (NSString *)defaultResolution;
 
-@end
+@end
diff --git a/cocos2d/CCPackage_private.h b/cocos2d/CCPackage_private.h
@@ -15,4 +15,4 @@
 @property (nonatomic, readwrite) BOOL enableOnDownload;
 @property (nonatomic, readwrite) CCPackageStatus status;
 
-@end
+@end
diff --git a/cocos2d/CCRendererBasicTypes.h b/cocos2d/CCRendererBasicTypes.h
@@ -89,17 +89,17 @@ CCRenderBufferSetLine(CCRenderBuffer buffer, int index, GLushort a, GLushort b)
 
 
 /// Key used to set the source color factor for [CCBlendMode blendModeWithOptions:].
-extern const NSString *CCBlendFuncSrcColor;
+extern NSString * const CCBlendFuncSrcColor;
 /// Key used to set the destination color factor for [CCBlendMode blendModeWithOptions:].
-extern const NSString *CCBlendFuncDstColor;
+extern NSString * const CCBlendFuncDstColor;
 /// Key used to set the color equation for [CCBlendMode blendModeWithOptions:].
-extern const NSString *CCBlendEquationColor;
+extern NSString * const CCBlendEquationColor;
 /// Key used to set the source alpha factor for [CCBlendMode blendModeWithOptions:].
-extern const NSString *CCBlendFuncSrcAlpha;
+extern NSString * const CCBlendFuncSrcAlpha;
 /// Key used to set the destination alpha factor for [CCBlendMode blendModeWithOptions:].
-extern const NSString *CCBlendFuncDstAlpha;
+extern NSString * const CCBlendFuncDstAlpha;
 /// Key used to set the alpha equation for [CCBlendMode blendModeWithOptions:].
-extern const NSString *CCBlendEquationAlpha;
+extern NSString * const CCBlendEquationAlpha;
 
 
 /// Blending mode identifiers used with CCNode.blendMode.
diff --git a/cocos2d/CCRendererBasicTypes.m b/cocos2d/CCRendererBasicTypes.m
@@ -28,16 +28,16 @@
 #import "CCCache.h"
 
 //MARK: Blend Option Keys.
-const NSString *CCRenderStateBlendMode = @"CCRenderStateBlendMode";
-const NSString *CCRenderStateShader = @"CCRenderStateShader";
-const NSString *CCRenderStateShaderUniforms = @"CCRenderStateShaderUniforms";
-
-const NSString *CCBlendFuncSrcColor = @"CCBlendFuncSrcColor";
-const NSString *CCBlendFuncDstColor = @"CCBlendFuncDstColor";
-const NSString *CCBlendEquationColor = @"CCBlendEquationColor";
-const NSString *CCBlendFuncSrcAlpha = @"CCBlendFuncSrcAlpha";
-const NSString *CCBlendFuncDstAlpha = @"CCBlendFuncDstAlpha";
-const NSString *CCBlendEquationAlpha = @"CCBlendEquationAlpha";
+NSString * const CCRenderStateBlendMode = @"CCRenderStateBlendMode";
+NSString * const CCRenderStateShader = @"CCRenderStateShader";
+NSString * const CCRenderStateShaderUniforms = @"CCRenderStateShaderUniforms";
+
+NSString * const CCBlendFuncSrcColor = @"CCBlendFuncSrcColor";
+NSString * const CCBlendFuncDstColor = @"CCBlendFuncDstColor";
+NSString * const CCBlendEquationColor = @"CCBlendEquationColor";
+NSString * const CCBlendFuncSrcAlpha = @"CCBlendFuncSrcAlpha";
+NSString * const CCBlendFuncDstAlpha = @"CCBlendFuncDstAlpha";
+NSString * const CCBlendEquationAlpha = @"CCBlendEquationAlpha";
 
 
 //MARK: Blend Modes.
diff --git a/cocos2d/CCShader.h b/cocos2d/CCShader.h
@@ -53,18 +53,18 @@ typedef NS_ENUM(NSUInteger, CCShaderAttribute){
 };
 
 
-extern const NSString *CCShaderUniformDefaultGlobals;
-extern const NSString *CCShaderUniformProjection;
-extern const NSString *CCShaderUniformProjectionInv;
-extern const NSString *CCShaderUniformViewSize;
-extern const NSString *CCShaderUniformViewSizeInPixels;
-extern const NSString *CCShaderUniformTime;
-extern const NSString *CCShaderUniformSinTime;
-extern const NSString *CCShaderUniformCosTime;
-extern const NSString *CCShaderUniformRandom01;
-extern const NSString *CCShaderUniformMainTexture;
-extern const NSString *CCShaderUniformNormalMapTexture;
-extern const NSString *CCShaderUniformAlphaTestValue;
+extern NSString * const CCShaderUniformDefaultGlobals;
+extern NSString * const CCShaderUniformProjection;
+extern NSString * const CCShaderUniformProjectionInv;
+extern NSString * const CCShaderUniformViewSize;
+extern NSString * const CCShaderUniformViewSizeInPixels;
+extern NSString * const CCShaderUniformTime;
+extern NSString * const CCShaderUniformSinTime;
+extern NSString * const CCShaderUniformCosTime;
+extern NSString * const CCShaderUniformRandom01;
+extern NSString * const CCShaderUniformMainTexture;
+extern NSString * const CCShaderUniformNormalMapTexture;
+extern NSString * const CCShaderUniformAlphaTestValue;
 
 
 @interface CCShader : NSObject<NSCopying>
diff --git a/cocos2d/CCShader.m b/cocos2d/CCShader.m
@@ -39,18 +39,18 @@
 #import "CCMetalSupport_Private.h"
 
 
-const NSString *CCShaderUniformDefaultGlobals = @"cc_GlobalUniforms";
-const NSString *CCShaderUniformProjection = @"cc_Projection";
-const NSString *CCShaderUniformProjectionInv = @"cc_ProjectionInv";
-const NSString *CCShaderUniformViewSize = @"cc_ViewSize";
-const NSString *CCShaderUniformViewSizeInPixels = @"cc_ViewSizeInPixels";
-const NSString *CCShaderUniformTime = @"cc_Time";
-const NSString *CCShaderUniformSinTime = @"cc_SinTime";
-const NSString *CCShaderUniformCosTime = @"cc_CosTime";
-const NSString *CCShaderUniformRandom01 = @"cc_Random01";
-const NSString *CCShaderUniformMainTexture = @"cc_MainTexture";
-const NSString *CCShaderUniformNormalMapTexture = @"cc_NormalMapTexture";
-const NSString *CCShaderUniformAlphaTestValue = @"cc_AlphaTestValue";
+NSString * const CCShaderUniformDefaultGlobals = @"cc_GlobalUniforms";
+NSString * const CCShaderUniformProjection = @"cc_Projection";
+NSString * const CCShaderUniformProjectionInv = @"cc_ProjectionInv";
+NSString * const CCShaderUniformViewSize = @"cc_ViewSize";
+NSString * const CCShaderUniformViewSizeInPixels = @"cc_ViewSizeInPixels";
+NSString * const CCShaderUniformTime = @"cc_Time";
+NSString * const CCShaderUniformSinTime = @"cc_SinTime";
+NSString * const CCShaderUniformCosTime = @"cc_CosTime";
+NSString * const CCShaderUniformRandom01 = @"cc_Random01";
+NSString * const CCShaderUniformMainTexture = @"cc_MainTexture";
+NSString * const CCShaderUniformNormalMapTexture = @"cc_NormalMapTexture";
+NSString * const CCShaderUniformAlphaTestValue = @"cc_AlphaTestValue";
 
 
 // Stringify macros
diff --git a/cocos2d/Platforms/iOS/CCGLView.m b/cocos2d/Platforms/iOS/CCGLView.m
@@ -271,7 +271,7 @@ -(BOOL) setupSurfaceWithSharegroup:(EAGLSharegroup*)sharegroup
 	_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2 sharegroup:sharegroup];
 	
 	if(!_context || ![EAGLContext setCurrentContext:_context]){
-		return nil;
+		return NO;
 	}
 #endif
 	
diff --git a/cocos2d/Platforms/iOS/CCMetalSupport.m b/cocos2d/Platforms/iOS/CCMetalSupport.m
@@ -38,7 +38,14 @@ -(instancetype)init
 {
 	if((self = [super init])){
 		_device = MTLCreateSystemDefaultDevice();
-		_library = [_device newDefaultLibrary];
+		
+		// Cannot use default.metallib to avoid clashing with Xcode build magic.
+		// This is part of a workaround due to the iOS simulator not supporting Metal and may go away in the future.
+		NSURL *url = [[NSBundle mainBundle] URLForResource:@"CCShaders.metallib" withExtension:nil];
+		
+		NSError *error = nil;
+		_library = [_device newLibraryWithFile:[url path] error:&error];
+		NSAssert(!error, @"Cannot load default CCShaders.metallib: %@", error);
 		
 		_commandQueue = [_device newCommandQueue];
 		_currentCommandBuffer = [_commandQueue commandBuffer];
diff --git a/cocos2d/Support/CCFileUtils.h b/cocos2d/Support/CCFileUtils.h
@@ -29,17 +29,17 @@
 #import <CoreGraphics/CoreGraphics.h>
 
 // keys used for the suffix or directory dictionaries
-extern NSString const *CCFileUtilsSuffixDefault;
-extern NSString const *CCFileUtilsSuffixiPad;
-extern NSString const *CCFileUtilsSuffixiPadHD;
-extern NSString const *CCFileUtilsSuffixiPhone;
-extern NSString const *CCFileUtilsSuffixiPhoneHD;
-extern NSString const *CCFileUtilsSuffixiPhone5;
-extern NSString const *CCFileUtilsSuffixiPhone5HD;
-extern NSString const *CCFileUtilsSuffixMac;
-extern NSString const *CCFileUtilsSuffixMacHD;
-
-extern NSString const *kCCFileUtilsDefaultSearchPath;
+extern NSString * const CCFileUtilsSuffixDefault;
+extern NSString * const CCFileUtilsSuffixiPad;
+extern NSString * const CCFileUtilsSuffixiPadHD;
+extern NSString * const CCFileUtilsSuffixiPhone;
+extern NSString * const CCFileUtilsSuffixiPhoneHD;
+extern NSString * const CCFileUtilsSuffixiPhone5;
+extern NSString * const CCFileUtilsSuffixiPhone5HD;
+extern NSString * const CCFileUtilsSuffixMac;
+extern NSString * const CCFileUtilsSuffixMacHD;
+
+extern NSString * const kCCFileUtilsDefaultSearchPath;
 
 typedef NS_ENUM(NSUInteger, CCFileUtilsSearchMode) {
 	CCFileUtilsSearchModeSuffix,
diff --git a/cocos2d/Support/CCFileUtils.m b/cocos2d/Support/CCFileUtils.m
@@ -31,18 +31,18 @@
 #import "../ccConfig.h"
 #import "../ccTypes.h"
 
-NSString *CCFileUtilsSuffixDefault = @"default";
-
-NSString *CCFileUtilsSuffixiPad = @"ipad";
-NSString *CCFileUtilsSuffixiPadHD = @"ipadhd";
-NSString *CCFileUtilsSuffixiPhone = @"iphone";
-NSString *CCFileUtilsSuffixiPhoneHD = @"iphonehd";
-NSString *CCFileUtilsSuffixiPhone5 = @"iphone5";
-NSString *CCFileUtilsSuffixiPhone5HD = @"iphone5hd";
-NSString *CCFileUtilsSuffixMac = @"mac";
-NSString *CCFileUtilsSuffixMacHD = @"machd";
-
-NSString *kCCFileUtilsDefaultSearchPath = @"";
+NSString * const CCFileUtilsSuffixDefault = @"default";
+
+NSString * const CCFileUtilsSuffixiPad = @"ipad";
+NSString * const CCFileUtilsSuffixiPadHD = @"ipadhd";
+NSString * const CCFileUtilsSuffixiPhone = @"iphone";
+NSString * const CCFileUtilsSuffixiPhoneHD = @"iphonehd";
+NSString * const CCFileUtilsSuffixiPhone5 = @"iphone5";
+NSString * const CCFileUtilsSuffixiPhone5HD = @"iphone5hd";
+NSString * const CCFileUtilsSuffixMac = @"mac";
+NSString * const CCFileUtilsSuffixMacHD = @"machd";
+
+NSString * const kCCFileUtilsDefaultSearchPath = @"";
 
 #pragma mark - Helper free functions
 
diff --git a/cocos2d/ccMacros.h b/cocos2d/ccMacros.h
@@ -142,7 +142,7 @@ CCRANDOM_ON_UNIT_CIRCLE()
 	while(TRUE){
 		CGPoint p = ccp(CCRANDOM_MINUS1_1(), CCRANDOM_MINUS1_1());
 		CGFloat lsq = ccpLengthSQ(p);
-		if(0.1 < lsq && lsq < 1.0f) return ccpMult(p, 1.0/sqrt(lsq));
+		if(0.1 < lsq && lsq < 1.0) return ccpMult(p, (CGFloat)(1.0/sqrt(lsq)));
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ - (void)testDisablePackage`
`67`	`67`	`XCTAssertFalse([self isPackageInSearchPath]);`
`68`	`68`
`69`	`69`	`// Can't use [CCSprite spriteWithImageNamed:@"boredSmiley.png"], assertion exception is screwing up test result`
`70`		`- CGFloat *scale;`
`71`		`- NSString *path = [[CCFileUtils sharedFileUtils] fullPathForFilename:@"boredSmiley.png" contentScale:&scale];`
	`70`	`+ NSString *path = [[CCFileUtils sharedFileUtils] fullPathForFilename:@"boredSmiley.png" contentScale:NULL];`
`72`	`71`	`XCTAssertNil(path);`
`73`	`72`	`}`
`74`	`73`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ - (BOOL)isPackagInSearchPath:(CCPackage *)package`
`16`	`16`
`17`	`17`	`- (void)enablePackages:(NSArray *)packages`
`18`	`18`	`{`
`19`		`- if ([self addPackagestoSearchPath:packages]);`
	`19`	`+ if ([self addPackagestoSearchPath:packages])`
`20`	`20`	`{`
`21`	`21`	`CCLOGINFO(@"[PACKAGE/INSTALL][INFO] Enable packages - Search path: %@", [CCFileUtils sharedFileUtils].searchPath);`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ - (BOOL)createFileHandle:(NSError **)error`
`280`	`280`
`281`	`281`	`if (!fileHandle)`
`282`	`282`	`{`
`283`		`- CCLOG(@"[PACKAGE/DOWNLOAD][ERROR] %@, cannot open file for writing download %@", error, _tempPath);`
	`283`	`+ CCLOG(@"[PACKAGE/DOWNLOAD][ERROR] %@, cannot open file for writing download %@", *error, _tempPath);`
`284`	`284`	`return NO;`
`285`	`285`	`}`
`286`	`286`
-Original file line number
+Diff line change
  */
 + (NSString *)defaultResolution;
 -@end
 +@end