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

Conflicts:
	cocos2d/CCDirector.m

Author: slembcke

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

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

Resources/Images/ShinyTorusColor.png

@@ -13,7 +13,7 @@
 #import "ccTypes.h"
 
 #if CC_ENABLE_EXPERIMENTAL_EFFECTS
-extern const NSString *CCShaderUniformPreviousPassTexture;
+extern NSString * const CCShaderUniformPreviousPassTexture;
 
 typedef NS_ENUM(NSUInteger, CCEffectFunctionStitchFlags)
 {

Resources/Images/ShinyTorusNormals.png

@@ -11,7 +11,7 @@
 #import "CCtexture.h"
 
 #if CC_ENABLE_EXPERIMENTAL_EFFECTS
-const NSString *CCShaderUniformPreviousPassTexture = @"cc_PreviousPassTexture";
+NSString * const CCShaderUniformPreviousPassTexture = @"cc_PreviousPassTexture";
 
 static NSString* fragBase =
 @"%@\n\n"   // uniforms
@@ -40,6 +40,8 @@ -(id)initWithName:(NSString *)name body:(NSString*)body inputs:(NSArray*)inputs
 {
     if((self = [super init]))
     {
+        NSAssert(inputs.count <= 1, @"Effect functions currently only support 0 or 1 inputs.");
+        
         _body = [body copy];
         _name = [name copy];
         _inputs = [inputs copy];
@@ -255,7 +257,7 @@ -(void)end
 
 -(void)enqueueTriangles
 {
-    CCRenderState *renderState = [[CCRenderState alloc] initWithBlendMode:_blendMode shader:_shader shaderUniforms:_shaderUniforms];
+    CCRenderState *renderState = [[CCRenderState alloc] initWithBlendMode:_blendMode shader:_shader shaderUniforms:_shaderUniforms copyUniforms:NO];
 
     CCRenderBuffer buffer = [_renderer enqueueTriangles:2 andVertexes:4 withState:renderState globalSortOrder:0];
 	CCRenderBufferSetVertex(buffer, 0, CCVertexApplyTransform(_verts.bl, &_transform));
@@ -445,7 +447,7 @@ -(void)buildEffectShader
         }
 
         NSMutableArray *inputs = [[NSMutableArray alloc] init];
-        for (CCEffectFunctionInput *input in curFunction.inputs)
+        if (curFunction.inputs.count)
         {
             [inputs addObject:@"tmp"];
         }

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -214,7 +214,7 @@ -(void)buildFragmentFunctions
 
     // Choose one?
     // TODO: try using min(src, dst) to create a gloomEffect
-    NSString* addativeBlending =  @"src + dst";
+    // NSString* additiveBlending =  @"src + dst";
     NSString* screenBlending = @"(src + dst) - ((src * dst) * u_intensity)";
 
     [shaderString appendFormat:@"\
@@ -311,12 +311,12 @@ -(void)buildRenderPasses
 
         pass.shaderUniforms[CCShaderUniformMainTexture] = previousPassTexture;
         pass.shaderUniforms[CCShaderUniformPreviousPassTexture] = previousPassTexture;
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_enableGlowMap"]] = [NSNumber numberWithFloat:0.0f];
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_luminanceThreshold"]] = [NSNumber numberWithFloat:_luminanceThreshold];
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_intensity"]] = [NSNumber numberWithFloat:_transformedIntensity];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_enableGlowMap"]] = [NSNumber numberWithFloat:0.0f];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_luminanceThreshold"]] = [NSNumber numberWithFloat:_luminanceThreshold];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_intensity"]] = [NSNumber numberWithFloat:_transformedIntensity];
 
         GLKVector2 dur = GLKVector2Make(1.0 / (previousPassTexture.pixelWidth / previousPassTexture.contentScale), 0.0);
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_blurDirection"]] = [NSValue valueWithGLKVector2:dur];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_blurDirection"]] = [NSValue valueWithGLKVector2:dur];
 
     } copy]];
 
@@ -326,12 +326,12 @@ -(void)buildRenderPasses
     pass1.beginBlocks = @[[^(CCEffectRenderPass *pass, CCTexture *previousPassTexture){
 
         pass.shaderUniforms[CCShaderUniformPreviousPassTexture] = previousPassTexture;
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_enableGlowMap"]] = [NSNumber numberWithFloat:0.0f];
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_luminanceThreshold"]] = [NSNumber numberWithFloat:_luminanceThreshold];
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_intensity"]] = [NSNumber numberWithFloat:_transformedIntensity];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_enableGlowMap"]] = [NSNumber numberWithFloat:0.0f];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_luminanceThreshold"]] = [NSNumber numberWithFloat:_luminanceThreshold];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_intensity"]] = [NSNumber numberWithFloat:_transformedIntensity];
 
         GLKVector2 dur = GLKVector2Make(0.0, 1.0 / (previousPassTexture.pixelHeight / previousPassTexture.contentScale));
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_blurDirection"]] = [NSValue valueWithGLKVector2:dur];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_blurDirection"]] = [NSValue valueWithGLKVector2:dur];
 
     } copy]];
 
@@ -340,9 +340,9 @@ -(void)buildRenderPasses
     pass2.shader = self.shader;
     pass2.beginBlocks = @[[^(CCEffectRenderPass *pass, CCTexture *previousPassTexture){
         pass.shaderUniforms[CCShaderUniformPreviousPassTexture] = previousPassTexture;
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_enableGlowMap"]] = [NSNumber numberWithFloat:1.0f];
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_luminanceThreshold"]] = [NSNumber numberWithFloat:_luminanceThreshold];
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_intensity"]] = [NSNumber numberWithFloat:_transformedIntensity];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_enableGlowMap"]] = [NSNumber numberWithFloat:1.0f];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_luminanceThreshold"]] = [NSNumber numberWithFloat:_luminanceThreshold];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_intensity"]] = [NSNumber numberWithFloat:_transformedIntensity];
 
     } copy]];
 

cocos2d-ui/CCButton.m

@@ -70,7 +70,7 @@ -(void)buildRenderPasses
     pass0.beginBlocks = @[[^(CCEffectRenderPass *pass, CCTexture *previousPassTexture){
         pass.shaderUniforms[CCShaderUniformMainTexture] = previousPassTexture;
         pass.shaderUniforms[CCShaderUniformPreviousPassTexture] = previousPassTexture;
-        pass.shaderUniforms[self.uniformTranslationTable[@"u_brightness"]] = [NSNumber numberWithFloat:weakSelf.conditionedBrightness];
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_brightness"]] = [NSNumber numberWithFloat:weakSelf.conditionedBrightness];
     } copy]];
 
     self.renderPasses = @[pass0];