Merge branch 'v3.1' into develop

slembcke · slembcke · commit 4dacabff6b1c · 2014-07-18T16:39:22.000-05:00
Conflicts:
	cocos2d/CCEffectRenderer.m
diff --git a/cocos2d-ui/CCBReader/CCAnimationManager.m b/cocos2d-ui/CCBReader/CCAnimationManager.m
@@ -85,7 +85,7 @@ -(void) onEnter {
 
 - (void)addNode:(CCNode*)node andSequences:(NSDictionary*)seq
 {
-#ifdef DEBUG
+#if DEBUG
 	//Sanity check sequences;
 	
 	for (NSMutableDictionary* seqNodeProps in seq.allValues) {
diff --git a/cocos2d/CCConfiguration.h b/cocos2d/CCConfiguration.h
@@ -75,7 +75,6 @@ typedef NS_ENUM(NSUInteger, CCDevice) {
 	
 	GLint			_maxTextureSize;
 	BOOL			_supportsPVRTC;
-	BOOL			_supportsNPOT;
 	BOOL			_supportsBGRA8888;
 	BOOL			_supportsDiscardFramebuffer;
 	BOOL			_supportsShareableVAO;
@@ -92,12 +91,6 @@ typedef NS_ENUM(NSUInteger, CCDevice) {
  */
 @property (nonatomic, readonly) GLint maxTextureUnits;
 
-/** Whether or not the GPU supports NPOT (Non Power Of Two) textures.
- OpenGL ES 2.0 already supports NPOT (iOS).
-
- */
-@property (nonatomic, readonly) BOOL supportsNPOT;
-
 /** Whether or not PVR Texture Compressed is supported */
 @property (nonatomic, readonly) BOOL supportsPVRTC;
 
diff --git a/cocos2d/CCConfiguration.m b/cocos2d/CCConfiguration.m
@@ -44,7 +44,6 @@ @implementation CCConfiguration
 
 @synthesize maxTextureSize = _maxTextureSize, maxTextureUnits=_maxTextureUnits;
 @synthesize supportsPVRTC = _supportsPVRTC;
-@synthesize supportsNPOT = _supportsNPOT;
 @synthesize supportsBGRA8888 = _supportsBGRA8888;
 @synthesize supportsDiscardFramebuffer = _supportsDiscardFramebuffer;
 @synthesize supportsShareableVAO = _supportsShareableVAO;
@@ -182,12 +181,6 @@ -(void) getOpenGLvariables
 		glGetIntegerv(GL_MAX_TEXTURE_SIZE, &_maxTextureSize);
 		glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &_maxTextureUnits );
 
-#ifdef __CC_PLATFORM_IOS
-		_supportsNPOT = YES;
-#elif defined(__CC_PLATFORM_MAC)
-		_supportsNPOT = [self checkForGLExtension:@"GL_ARB_texture_non_power_of_two"];
-#endif
-
 		_supportsPVRTC = [self checkForGLExtension:@"GL_IMG_texture_compression_pvrtc"];
 
 		// It seems that somewhere between firmware iOS 3.0 and 4.2 Apple renamed
@@ -222,14 +215,6 @@ -(GLint) maxTextureUnits
 	return _maxTextureUnits;
 }
 
--(BOOL) supportsNPOT
-{
-	if( ! _openGLInitialized )
-		[self getOpenGLvariables];
-
-	return _supportsNPOT;
-}
-
 -(BOOL) supportsPVRTC
 {
 	if( ! _openGLInitialized )
@@ -308,7 +293,6 @@ -(void) dumpInfo
 	printf("cocos2d: GL_MAX_SAMPLES: %d\n", _maxSamplesAllowed);
 	printf("cocos2d: GL supports PVRTC: %s\n", (_supportsPVRTC ? "YES" : "NO") );
 	printf("cocos2d: GL supports BGRA8888 textures: %s\n", (_supportsBGRA8888 ? "YES" : "NO") );
-	printf("cocos2d: GL supports NPOT textures: %s\n", (_supportsNPOT ? "YES" : "NO") );
 	printf("cocos2d: GL supports discard_framebuffer: %s\n", (_supportsDiscardFramebuffer ? "YES" : "NO") );
 	printf("cocos2d: GL supports shareable VAO: %s\n", (_supportsShareableVAO ? "YES" : "NO") );
 	
diff --git a/cocos2d/CCDirector.m b/cocos2d/CCDirector.m
@@ -265,7 +265,7 @@ -(void) calculateDeltaTime
 		_dt = MAX(0,_dt);
 	}
 
-#ifdef DEBUG
+#if DEBUG
 	// If we are debugging our code, prevent big delta time
 	if( _dt > 0.2f )
 		_dt = 1/60.0f;
@@ -864,7 +864,8 @@ -(void) showStats
 			NSString *fpsstr = [[NSString alloc] initWithFormat:@"%.1f", _frameRate];
 			[_FPSLabel setString:fpsstr];
 			
-			NSString *draws = [[NSString alloc] initWithFormat:@"%4lu", (unsigned long)__ccNumberOfDraws];
+			// Subtract one for the stat label's own batch. This caused a lot of confusion on the forums...
+			NSString *draws = [[NSString alloc] initWithFormat:@"%4lu", (unsigned long)__ccNumberOfDraws - 1];
 			[_drawsLabel setString:draws];
 		}
 		
diff --git a/cocos2d/CCDrawNode.m b/cocos2d/CCDrawNode.m
@@ -56,6 +56,9 @@ @implementation CCDrawNode {
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCDrawNode class]) return;
+	
 	SHADER = [[CCShader alloc] initWithFragmentShaderSource:FRAGMENT_SHADER_SOURCE];
 }
 
diff --git a/cocos2d/CCEffectRenderer.m b/cocos2d/CCEffectRenderer.m
@@ -52,26 +52,11 @@ - (BOOL)setupGLResourcesWithSize:(CGSize)size
     
     glPushGroupMarkerEXT(0, "CCEffectRenderTarget: allocateRenderTarget");
     
-	// Textures may need to be a power of two
-	NSUInteger powW;
-	NSUInteger powH;
-    
-	if( [[CCConfiguration sharedConfiguration] supportsNPOT] )
-    {
-		powW = size.width;
-		powH = size.height;
-	}
-    else
-    {
-		powW = CCNextPOT(size.width);
-		powH = CCNextPOT(size.height);
-	}
-    
     static const CCTexturePixelFormat kRenderTargetDefaultPixelFormat = CCTexturePixelFormat_RGBA8888;
     
     // Create a new texture object for use as the color attachment of the new
     // FBO.
-	_texture = [[CCTexture alloc] initWithData:nil pixelFormat:kRenderTargetDefaultPixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:size contentScale:[CCDirector sharedDirector].contentScaleFactor];
+	_texture = [[CCTexture alloc] initWithData:nil pixelFormat:kRenderTargetDefaultPixelFormat pixelsWide:size.width pixelsHigh:size.height contentSizeInPixels:size contentScale:[CCDirector sharedDirector].contentScaleFactor];
 	[_texture setAliasTexParameters];
 	
     // Save the old FBO binding so it can be restored after we create the new
diff --git a/cocos2d/CCNode+Debug.h b/cocos2d/CCNode+Debug.h
@@ -25,7 +25,7 @@
 
 #import "CCNode.h"
 
-#ifdef DEBUG
+#if DEBUG
 
 /** Debugging extensions of CCNode.  They are available when the DEBUG macro is defined at compile time. */
 @interface CCNode (Debug)
diff --git a/cocos2d/CCNode+Debug.m b/cocos2d/CCNode+Debug.m
@@ -26,7 +26,7 @@
 #import "CCNode+Debug.h"
 #import "CCNode_Private.h"
 
-#ifdef DEBUG
+#if DEBUG
 
 @implementation CCNode (Debug)
 
diff --git a/cocos2d/CCPhysicsBody.m b/cocos2d/CCPhysicsBody.m
@@ -514,7 +514,7 @@ -(void)didRemoveFromPhysicsNode:(CCPhysicsNode *)physics
 //The following are properties which we track on the parent nodes in order to update the child nodes.
 NSString *  kDependantProperties[2] = { @"position", @"rotation"};
 
-#ifdef DEBUG
+#if DEBUG
 //The following are properties which cannot be animated. Changing their values after onEnter in unhandled.
 NSString *  kRestrictedProperties[3] = { @"scale", @"scaleX", @"scaleY"};
 #endif
@@ -531,7 +531,7 @@ -(void)trackParentTransformations:(CCPhysicsNode *)physics
             [node addObserver:self forKeyPath:kDependantProperties[i] options:NSKeyValueObservingOptionNew context:nil];
         }
         
-#ifdef DEBUG
+#if DEBUG
         for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)
         {
             [node addObserver:self forKeyPath:kRestrictedProperties[i] options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
@@ -552,7 +552,7 @@ -(void)removeParentTransformTracking:(CCPhysicsNode *)physics
         {
             [node removeObserver:self forKeyPath:kDependantProperties[i]];
         }
-#ifdef DEBUG
+#if DEBUG
         for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)
         {
             [node removeObserver:self forKeyPath:kRestrictedProperties[i]];
@@ -567,7 +567,7 @@ -(void)removeParentTransformTracking:(CCPhysicsNode *)physics
 
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
-#ifdef DEBUG
+#if DEBUG
     for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)
     {
         if([kRestrictedProperties[i] isEqualToString:keyPath])
diff --git a/cocos2d/CCRenderTexture.m b/cocos2d/CCRenderTexture.m
@@ -177,21 +177,8 @@ -(void)create
 
 	glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
 
-	// textures must be power of two
-	NSUInteger powW;
-	NSUInteger powH;
-
-	if( [[CCConfiguration sharedConfiguration] supportsNPOT] ) {
-		powW = pixelW;
-		powH = pixelH;
-	} else {
-		powW = CCNextPOT(pixelW);
-		powH = CCNextPOT(pixelH);
-	}
-
-	void *data = calloc(powW*powH, 4);
-
-	CCTexture *texture = [[CCTexture alloc] initWithData:data pixelFormat:_pixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:CGSizeMake(pixelW, pixelH) contentScale:_contentScale];
+	void *data = calloc(pixelW*pixelH, 4);
+	CCTexture *texture = [[CCTexture alloc] initWithData:data pixelFormat:_pixelFormat pixelsWide:pixelW pixelsHigh:pixelH contentSizeInPixels:CGSizeMake(pixelW, pixelH) contentScale:_contentScale];
     self.texture = texture;
     
 	free(data);
@@ -212,7 +199,7 @@ -(void)create
 		//create and attach depth buffer
 		glGenRenderbuffers(1, &depthRenderBuffer);
 		glBindRenderbuffer(GL_RENDERBUFFER, depthRenderBuffer);
-		glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, (GLsizei)powW, (GLsizei)powH);
+		glRenderbufferStorage(GL_RENDERBUFFER, _depthStencilFormat, (GLsizei)pixelW, (GLsizei)pixelH);
 		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depthRenderBuffer);
 
 		// if depth format is the one with stencil part, bind same render buffer as stencil attachment
diff --git a/cocos2d/CCRenderer.m b/cocos2d/CCRenderer.m
@@ -170,6 +170,9 @@ -(instancetype)initWithOptions:(NSDictionary *)options
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCBlendMode class]) return;
+	
 	CCBLENDMODE_CACHE = [[CCBlendModeCache alloc] init];
 	
 	// Add the default modes
@@ -276,6 +279,9 @@ @implementation CCRenderState {
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCRenderState class]) return;
+	
 	CCRENDERSTATE_CACHE = [[CCRenderStateCache alloc] init];
 	CCRENDERSTATE_DEBUGCOLOR = [[self alloc] initWithBlendMode:CCBLEND_DISABLED shader:[CCShader positionColorShader] shaderUniforms:@{}];
 }
diff --git a/cocos2d/CCShader.m b/cocos2d/CCShader.m
@@ -451,6 +451,9 @@ -(instancetype)copyWithZone:(NSZone *)zone
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCShader class]) return;
+	
 	CC_SHADER_CACHE = [[CCShaderCache alloc] init];
 	
 	// Setup the builtin shaders.
diff --git a/cocos2d/CCSpriteFrameCache.m b/cocos2d/CCSpriteFrameCache.m
@@ -449,6 +449,10 @@ -(CCSpriteFrame*) spriteFrameByName:(NSString*)name
     
     if (!frame)
     {
+        // Check fileLookup.plist
+        NSString *newName = [[CCFileUtils sharedFileUtils].filenameLookup objectForKey:name];
+        name = newName ?: name;
+        
         // Try finding the frame in one of the registered sprite sheets
         NSString* spriteFrameFile = [_spriteFrameFileLookup objectForKey:name];
         if (spriteFrameFile) [self addSpriteFramesWithFile:spriteFrameFile];
diff --git a/cocos2d/CCTMXXMLParser.h b/cocos2d/CCTMXXMLParser.h
@@ -77,7 +77,7 @@ typedef enum ccTMXTileFlags_ {
 @property (nonatomic,readwrite)			BOOL visible;
 
 /** Layer Opacity. */
-@property (nonatomic,readwrite)			unsigned char opacity;
+@property (nonatomic,readwrite)			float opacity;
 
 /** True to release ownership of layer tiles. */
 @property (nonatomic,readwrite)			BOOL ownTiles;
diff --git a/cocos2d/CCTexture.m b/cocos2d/CCTexture.m
@@ -163,6 +163,9 @@ @implementation CCTexture
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCTexture class]) return;
+	
 	CCTextureNone = [self alloc];
 	CCTextureNone->_name = 0;
 	CCTextureNone->_format = CCTexturePixelFormat_RGBA8888;
@@ -396,16 +399,8 @@ - (id) initWithCGImage:(CGImageRef)cgImage contentScale:(CGFloat)contentScale
 		pixelFormat = CCTexturePixelFormat_A8;
 	}
 
-	if( ! [conf supportsNPOT]  )
-	{
-		textureWidth = CCNextPOT(CGImageGetWidth(cgImage));
-		textureHeight = CCNextPOT(CGImageGetHeight(cgImage));
-	}
-	else
-	{
-		textureWidth = CGImageGetWidth(cgImage);
-		textureHeight = CGImageGetHeight(cgImage);
-	}
+	textureWidth = CGImageGetWidth(cgImage);
+	textureHeight = CGImageGetHeight(cgImage);
 
 #ifdef __CC_PLATFORM_IOS
 
diff --git a/cocos2d/CCTexturePVR.m b/cocos2d/CCTexturePVR.m
@@ -299,12 +299,6 @@ - (BOOL)unpackPVRv2Data:(unsigned char*)data PVRLen:(NSUInteger)len
 	if( flipped )
 		CCLOGWARN(@"cocos2d: WARNING: Image is flipped. Regenerate it using PVRTexTool");
 
-	if( ! [configuration supportsNPOT] &&
-	   ( header->width != CCNextPOT(header->width) || header->height != CCNextPOT(header->height ) ) ) {
-		CCLOGWARN(@"cocos2d: ERROR: Loding an NPOT texture (%dx%d) but is not supported on this device", header->width, header->height);
-		return NO;
-	}
-
 	for( NSUInteger i=0; i < (unsigned int)PVR2_MAX_TABLE_ELEMENTS ; i++) {
 		if( v2_pixel_formathash[i].pixelFormat == formatFlags ) {
 
@@ -604,8 +598,7 @@ - (id)initWithContentsOfFile:(NSString *)path
 			return nil;
 		}
 		
-#if defined(__CC_PLATFORM_IOS) && defined(DEBUG)
-
+#if defined(__CC_PLATFORM_IOS) && DEBUG
 		GLenum pixelFormat = _pixelFormatInfo->ccPixelFormat;
 		CCConfiguration *conf = [CCConfiguration sharedConfiguration];
 		
diff --git a/cocos2d/Platforms/iOS/CCAppDelegate.m b/cocos2d/Platforms/iOS/CCAppDelegate.m
@@ -191,10 +191,8 @@ - (void) setupCocos2dWithOptions:(NSDictionary*)config
 	
 	director.wantsFullScreenLayout = YES;
 	
-//#if DEBUG
 	// Display FSP and SPF
 	[director setDisplayStats:[config[CCSetupShowDebugStats] boolValue]];
-//#endif
 	
 	// set FPS at 60
 	NSTimeInterval animationInterval = [(config[CCSetupAnimationInterval] ?: @(1.0/60.0)) doubleValue];
diff --git a/cocos2d/Platforms/iOS/CCDirectorIOS.m b/cocos2d/Platforms/iOS/CCDirectorIOS.m
@@ -433,7 +433,7 @@ -(void) calculateDeltaTime
 	if( _displayStats )
 		gettimeofday( &_lastUpdate, NULL);
 
-#ifdef DEBUG
+#if DEBUG
 	// If we are debugging our code, prevent big delta time
 	if( _dt > 0.2f )
 		_dt = 1/60.0f;
diff --git a/cocos2d/Support/CCColor.m b/cocos2d/Support/CCColor.m
@@ -237,6 +237,9 @@ - (CCColor*) interpolateTo:(CCColor *) toColor alpha:(float) t
 
 +(void)initialize
 {
+	// +initialize may be called due to loading a subclass.
+	if(self != [CCColor class]) return;
+	
 	BLACK_COLOR = [CCColor colorWithRed:0 green:0 blue:0 alpha:1];
 	DARK_GRAY_COLOR = [CCColor colorWithWhite:1.0/3.0 alpha:1];
 	LIGHT_GRAY_COLOR = [CCColor colorWithWhite:2.0/3.0 alpha:1];

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ -(void) onEnter {`
`85`	`85`
`86`	`86`	`- (void)addNode:(CCNode)node andSequences:(NSDictionary)seq`
`87`	`87`	`{`
`88`		`-#ifdef DEBUG`
	`88`	`+#if DEBUG`
`89`	`89`	`//Sanity check sequences;`
`90`	`90`
`91`	`91`	`for (NSMutableDictionary* seqNodeProps in seq.allValues) {`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,9 @@ @implementation CCDrawNode {`
`56`	`56`
`57`	`57`	`+(void)initialize`
`58`	`58`	`{`
	`59`	`+ // +initialize may be called due to loading a subclass.`
	`60`	`+ if(self != [CCDrawNode class]) return;`
	`61`	`+`
`59`	`62`	`SHADER = [[CCShader alloc] initWithFragmentShaderSource:FRAGMENT_SHADER_SOURCE];`
`60`	`63`	`}`
`61`	`64`
Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,7 @@ -(void)didRemoveFromPhysicsNode:(CCPhysicsNode *)physics`
`514`	`514`	`//The following are properties which we track on the parent nodes in order to update the child nodes.`
`515`	`515`	`NSString * kDependantProperties[2] = { @"position", @"rotation"};`
`516`	`516`
`517`		`-#ifdef DEBUG`
	`517`	`+#if DEBUG`
`518`	`518`	`//The following are properties which cannot be animated. Changing their values after onEnter in unhandled.`
`519`	`519`	`NSString * kRestrictedProperties[3] = { @"scale", @"scaleX", @"scaleY"};`
`520`	`520`	`#endif`
`@@ -531,7 +531,7 @@ -(void)trackParentTransformations:(CCPhysicsNode *)physics`
`531`	`531`	`[node addObserver:self forKeyPath:kDependantProperties[i] options:NSKeyValueObservingOptionNew context:nil];`
`532`	`532`	`}`
`533`	`533`
`534`		`-#ifdef DEBUG`
	`534`	`+#if DEBUG`
`535`	`535`	`for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)`
`536`	`536`	`{`
`537`	`537`	`[node addObserver:self forKeyPath:kRestrictedProperties[i] options:NSKeyValueObservingOptionNew \| NSKeyValueObservingOptionOld context:nil];`
`@@ -552,7 +552,7 @@ -(void)removeParentTransformTracking:(CCPhysicsNode *)physics`
`552`	`552`	`{`
`553`	`553`	`[node removeObserver:self forKeyPath:kDependantProperties[i]];`
`554`	`554`	`}`
`555`		`-#ifdef DEBUG`
	`555`	`+#if DEBUG`
`556`	`556`	`for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)`
`557`	`557`	`{`
`558`	`558`	`[node removeObserver:self forKeyPath:kRestrictedProperties[i]];`
`@@ -567,7 +567,7 @@ -(void)removeParentTransformTracking:(CCPhysicsNode *)physics`
`567`	`567`
`568`	`568`	`-(void)observeValueForKeyPath:(NSString )keyPath ofObject:(id)object change:(NSDictionary )change context:(void *)context`
`569`	`569`	`{`
`570`		`-#ifdef DEBUG`
	`570`	`+#if DEBUG`
`571`	`571`	`for (int i = 0; i < sizeof(kRestrictedProperties)/sizeof(kRestrictedProperties[0]); i++)`
`572`	`572`	`{`
`573`	`573`	`if([kRestrictedProperties[i] isEqualToString:keyPath])`