Merge branch 'develop' of https://github.com/cocos2d/cocos2d-iphone into develop

Author: jtwigg

Resources/Images/ShinyBallColor.png

@@ -57,9 +57,9 @@ -(void)setupRefractionEffectTest
 
     [self.contentNode addChild:renderTexture];
 
-    NSString *sphereTextureFile = @"Images/sphere-256.png";
+    NSString *sphereTextureFile = @"Images/ShinyBallColor.png";
     CCTexture *sphereTexture = [CCTexture textureWithFile:sphereTextureFile];
-    CCSpriteFrame *sphereNormalMap = [CCSpriteFrame frameWithImageNamed:@"Images/sphere-normal-256.png"];
+    CCSpriteFrame *sphereNormalMap = [CCSpriteFrame frameWithImageNamed:@"Images/ShinyBallNormals.png"];
     CCEffectRefraction *sphereRefraction = [[CCEffectRefraction alloc] initWithRefraction:0.1f environment:renderTexture.sprite normalMap:nil];
 
     p1 = CGPointMake(0.1f, 0.8f);
@@ -76,9 +76,9 @@ -(void)setupRefractionEffectTest
                                                                 ]]];
     [self.contentNode addChild:sprite1];
 
-    NSString *torusTextureFile = @"Images/torus-256.png";
+    NSString *torusTextureFile = @"Images/ShinyTorusColor.png";
     CCTexture *torusTexture = [CCTexture textureWithFile:torusTextureFile];
-    CCSpriteFrame *torusNormalMap = [CCSpriteFrame frameWithImageNamed:@"Images/torus-normal-256.png"];
+    CCSpriteFrame *torusNormalMap = [CCSpriteFrame frameWithImageNamed:@"Images/ShinyTorusNormals.png"];
     CCEffectRefraction *torusRefraction = [[CCEffectRefraction alloc] initWithRefraction:0.1f environment:renderTexture.sprite normalMap:torusNormalMap];
 
     p1 = CGPointMake(0.65f, 0.2f);

Resources/Images/ShinyBallNormals.png

@@ -6,6 +6,7 @@ @implementation SpritePerformanceTest
 
 #define SPRITE_COUNT 3000
 #define TILE_COUNT 37
+#define SCALE 1.0
 
 - (void)setupSpritesUnbatchedUnatlassedTest
 {
@@ -18,6 +19,7 @@ - (void)setupSpritesUnbatchedUnatlassedTest
 		CCSprite *sprite = [CCSprite spriteWithImageNamed:[NSString stringWithFormat:@"Tiles/%02d.png", num]];
 		sprite.position = ccp(CCRANDOM_0_1()*size.width, CCRANDOM_0_1()*size.height);
 		sprite.rotation = CCRANDOM_0_1()*360;
+		sprite.scale = SCALE;
 		[self.contentNode addChild:sprite];
 	}
 }
@@ -33,6 +35,7 @@ - (void)setupSpritesUnbatchedTest
 		CCSprite *sprite = [CCSprite spriteWithImageNamed:[NSString stringWithFormat:@"TilesAtlassed/%02d.png", num]];
 		sprite.position = ccp(CCRANDOM_0_1()*size.width, CCRANDOM_0_1()*size.height);
 		sprite.rotation = CCRANDOM_0_1()*360;
+		sprite.scale = SCALE;
 		[self.contentNode addChild:sprite];
 	}
 }
@@ -48,6 +51,7 @@ - (void)setupSpritesUnbatchedUnatlassed2080Test
 		CCSprite *sprite = [CCSprite spriteWithImageNamed:[NSString stringWithFormat:@"Tiles/%02d.png", num]];
 		sprite.position = ccp(CCRANDOM_0_1()*size.width, CCRANDOM_0_1()*size.height);
 		sprite.rotation = CCRANDOM_0_1()*360;
+		sprite.scale = SCALE;
 
 		if(i < 0.8*SPRITE_COUNT) sprite.position = ccp(-1000, -1000);
 
@@ -68,6 +72,7 @@ - (void)setupSpritesSorted2080Test
 		CCSprite *sprite = [CCSprite spriteWithImageNamed:[NSString stringWithFormat:@"Tiles/%02d.png", num]];
 		sprite.position = ccp(CCRANDOM_0_1()*size.width, CCRANDOM_0_1()*size.height);
 		sprite.rotation = CCRANDOM_0_1()*360;
+		sprite.scale = SCALE;
 
 		if(i < 0.8*SPRITE_COUNT) sprite.position = ccp(-1000, -1000);
 
@@ -92,6 +97,7 @@ - (void)setupSpritesUnbatched2080Test
 		CCSprite *sprite = [CCSprite spriteWithImageNamed:[NSString stringWithFormat:@"TilesAtlassed/%02d.png", num]];
 		sprite.position = ccp(CCRANDOM_0_1()*size.width, CCRANDOM_0_1()*size.height);
 		sprite.rotation = CCRANDOM_0_1()*360;
+		sprite.scale = SCALE;
 
 		if(i < 0.8*SPRITE_COUNT) sprite.position = ccp(-1000, -1000);
 

Resources/Images/ShinyTorusColor.png

@@ -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) {

Resources/Images/ShinyTorusNormals.png

@@ -321,6 +321,8 @@ - (void) stateChanged
             }
 
             [_label stopAllActions];
+            [_background stopAllActions];
+			
             if (_zoomWhenHighlighted)
             {
                 _label.scaleX = _originalScaleX;

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -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;
 

cocos2d-ui-tests/tests/SpritePerformanceTest.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") );