Merge pull request #920 from thayerandrews/develop

CCEffectNode - Fix a bunch of sizing issues and add tests for them

Author: vlidholt

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -99,22 +99,23 @@ -(NSString*)callStringWithInputs:(NSArray*)inputs
 
 @implementation CCEffectFunctionInput
 
--(id)initWithType:(NSString*)type name:(NSString*)name snippet:(NSString*)snippet
+-(id)initWithType:(NSString*)type name:(NSString*)name initialSnippet:(NSString*)initialSnippet snippet:(NSString*)snippet
 {
     if((self = [super init]))
     {
         _type = [type copy];
         _name = [name copy];
+        _initialSnippet = [initialSnippet copy];
         _snippet = [snippet copy];
         return self;
     }
 
     return self;
 }
 
-+(id)inputWithType:(NSString*)type name:(NSString*)name snippet:(NSString*)snippet
++(id)inputWithType:(NSString*)type name:(NSString*)name initialSnippet:(NSString*)initialSnippet snippet:(NSString*)snippet
 {
-    return [[self alloc] initWithType:type name:name snippet:snippet];
+    return [[self alloc] initWithType:type name:name initialSnippet:initialSnippet snippet:snippet];
 }
 
 @end
@@ -316,12 +317,22 @@ -(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunction
 {
     if((self = [super init]))
     {
-        [self buildEffectWithFragmentFunction:fragmentFunctions vertexFunctions:vertexFunctions fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings];
+        [self buildEffectWithFragmentFunction:fragmentFunctions vertexFunctions:vertexFunctions fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings firstInStack:YES];
     }
     return self;
 }
 
-- (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings
+-(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings firstInStack:(BOOL)firstInStack
+{
+    if((self = [super init]))
+    {
+        [self buildEffectWithFragmentFunction:fragmentFunctions vertexFunctions:vertexFunctions fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings firstInStack:firstInStack];
+    }
+    return self;
+}
+
+
+- (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings firstInStack:(BOOL)firstInStack
 {
     if (fragmentFunctions)
     {
@@ -363,6 +374,7 @@ - (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vert
     [self setVaryings:varyings];
 
     _stitchFlags = CCEffectFunctionStitchBoth;
+    _firstInStack = firstInStack;
 
     [self buildShaderUniforms:_fragmentUniforms vertexUniforms:_vertexUniforms];
     [self buildUniformTranslationTable];
@@ -414,17 +426,17 @@ -(void)setVaryings:(NSArray*)varyings
 
 -(void)buildEffectShader
 {
-    NSString *fragBody = [self  buildShaderSourceFromBase:fragBase functions:_fragmentFunctions uniforms:_fragmentUniforms varyings:_varyingVars];
+    NSString *fragBody = [self  buildShaderSourceFromBase:fragBase functions:_fragmentFunctions uniforms:_fragmentUniforms varyings:_varyingVars firstInStack:_firstInStack];
 //    NSLog(@"\n------------fragBody:\n%@", fragBody);
 
-    NSString *vertBody = [self  buildShaderSourceFromBase:vertBase functions:_vertexFunctions uniforms:_vertexUniforms varyings:_varyingVars];
+    NSString *vertBody = [self  buildShaderSourceFromBase:vertBase functions:_vertexFunctions uniforms:_vertexUniforms varyings:_varyingVars firstInStack:_firstInStack];
 //    NSLog(@"\n------------vertBody:\n%@", vertBody);
 
     _shader = [[CCShader alloc] initWithVertexShaderSource:vertBody fragmentShaderSource:fragBody];
 
 }
 
--(NSString *)buildShaderSourceFromBase:(NSString *)shaderBase functions:(NSArray *)functions uniforms:(NSArray *)uniforms varyings:(NSArray *)varyings
+-(NSString *)buildShaderSourceFromBase:(NSString *)shaderBase functions:(NSArray *)functions uniforms:(NSArray *)uniforms varyings:(NSArray *)varyings firstInStack:(BOOL)firstInStack
 {
     // Build the varying string
     NSMutableString* varyingString = [[NSMutableString alloc] init];
@@ -451,9 +463,19 @@ -(NSString *)buildShaderSourceFromBase:(NSString *)shaderBase functions:(NSArray
 
         if([functions firstObject] == curFunction)
         {
-            for (CCEffectFunctionInput *input in curFunction.inputs)
+            if (firstInStack)
+            {
+                for (CCEffectFunctionInput *input in curFunction.inputs)
+                {
+                    [effectFunctionBody appendFormat:@"tmp = %@;\n", input.initialSnippet];
+                }
+            }
+            else
             {
-                [effectFunctionBody appendFormat:@"tmp = %@;\n", input.snippet];
+                for (CCEffectFunctionInput *input in curFunction.inputs)
+                {
+                    [effectFunctionBody appendFormat:@"tmp = %@;\n", input.snippet];
+                }
             }
         }
 

cocos2d/CCEffect.m

@@ -25,17 +25,17 @@
  *  This value is in the range [0..1]. Lower values mean that more pixels will
  *  contribute to the blurry bloom image.
  */
-@property (nonatomic) float luminanceThreshold;
+@property (nonatomic, assign) float luminanceThreshold;
 
 /** The intensity of the blurred out bloom image when added to the original
  *  unmodified image. This value is in the range [0..1]. 0 results in no bloom
  *  while higher values result in more bloom.
  */
-@property (nonatomic) float intensity;
+@property (nonatomic, assign) float intensity;
 
 /** The size of the blur of the bloom image. This value is in the range [0..6].
  */
-@property (nonatomic) NSUInteger blurRadius;
+@property (nonatomic, assign) NSUInteger blurRadius;
 
 
 /// -----------------------------------------------------------------------

cocos2d/CCEffectBloom.h

@@ -22,7 +22,7 @@
 
 /** The size of the blur. This value is in the range [0..6].
  */
-@property (nonatomic) NSUInteger blurRadius;
+@property (nonatomic, assign) NSUInteger blurRadius;
 
 
 /// -----------------------------------------------------------------------

cocos2d/CCEffectBlur.h

@@ -26,7 +26,7 @@
  *  of -1 reduces the affected color to 0 (black), 0 results in no change, 1
  *  increases the affected color to 1 (white).
  */
-@property (nonatomic) float brightness;
+@property (nonatomic, assign) float brightness;
 
 
 /// -----------------------------------------------------------------------

cocos2d/CCEffectBrightness.h

@@ -15,7 +15,7 @@
 
 @interface CCEffectBrightness ()
 
-@property (nonatomic) NSNumber *conditionedBrightness;
+@property (nonatomic, strong) NSNumber *conditionedBrightness;
 
 @end
 
@@ -50,7 +50,7 @@ -(void)buildFragmentFunctions
 {
     self.fragmentFunctions = [[NSMutableArray alloc] init];
 
-    CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
+    CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" initialSnippet:@"cc_FragColor * texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
 
     NSString* effectBody = CC_GLSL(
                                    return vec4((inputValue.rgb + vec3(u_brightness * inputValue.a)), inputValue.a);

cocos2d/CCEffectBrightness.m

@@ -26,7 +26,7 @@
  *  an adjustment value of -1 scales the affected color by 0.25, 0 results in no
  *  change, and 1 scales the affected color by 4.
  */
-@property (nonatomic) float contrast;
+@property (nonatomic, assign) float contrast;
 
 
 /// -----------------------------------------------------------------------

cocos2d/CCEffectContrast.h

@@ -16,7 +16,7 @@
 
 @interface CCEffectContrast ()
 
-@property (nonatomic) NSNumber *conditionedContrast;
+@property (nonatomic, strong) NSNumber *conditionedContrast;
 
 @end
 
@@ -51,7 +51,7 @@ -(void)buildFragmentFunctions
 {
     self.fragmentFunctions = [[NSMutableArray alloc] init];
 
-    CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
+    CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" initialSnippet:@"cc_FragColor * texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
 
     NSString* effectBody = CC_GLSL(
                                    return vec4(((inputValue.rgb - vec3(0.5)) * vec3(u_contrast) + vec3(0.5)), inputValue.a);

cocos2d/CCEffectContrast.m

@@ -26,26 +26,26 @@
  *  resulting in maximum minification of the refracted image, 0 resulting in no
  *  refraction, and 1 resulting in maximum magnification of the refracted image.
  */
-@property (nonatomic) float refraction;
+@property (nonatomic, assign) float refraction;
 
 /** The overall shininess of the attached sprite. This value is in the range [0..1] and it controls
  *  how much of the reflected environment contributes to the final color of the affected pixels.
  */
-@property (nonatomic) float shininess;
+@property (nonatomic, assign) float shininess;
 
 /** The bias term in the fresnel reflectance equation:
  *    reflectance = max(0.0, fresnelBias + (1 - fresnelBias) * pow((1 - nDotV), fresnelPower))
  *  This value is in the range [0..1] and it controls the constant (view angle independent) contribution 
  *  to the reflectance equation.
  */
-@property (nonatomic) float fresnelBias;
+@property (nonatomic, assign) float fresnelBias;
 
 /** The power term in the fresnel reflectance equation:
  *    reflectance = max(0.0, fresnelBias + (1 - fresnelBias) * pow((1 - nDotV), fresnelPower))
  *  This value is in the range [0..inf] and it controls the view angle dependent contribution
  *  to the reflectance equation.
  */
-@property (nonatomic) float fresnelPower;
+@property (nonatomic, assign) float fresnelPower;
 
 /** The environment that will be refracted by the affected node. Typically this is a 
  *  sprite that serves as the background for the affected node so it appears that the viewer

cocos2d/CCEffectGlass.h

@@ -24,10 +24,10 @@
 
 @interface CCEffectGlass ()
 
-@property (nonatomic) float conditionedRefraction;
-@property (nonatomic) float conditionedShininess;
-@property (nonatomic) float conditionedFresnelBias;
-@property (nonatomic) float conditionedFresnelPower;
+@property (nonatomic, assign) float conditionedRefraction;
+@property (nonatomic, assign) float conditionedShininess;
+@property (nonatomic, assign) float conditionedFresnelBias;
+@property (nonatomic, assign) float conditionedFresnelPower;
 
 @end
 
@@ -110,7 +110,7 @@ -(void)buildFragmentFunctions
 {
     self.fragmentFunctions = [[NSMutableArray alloc] init];
 
-    CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" snippet:@"cc_FragColor * texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
+    CCEffectFunctionInput *input = [[CCEffectFunctionInput alloc] initWithType:@"vec4" name:@"inputValue" initialSnippet:@"cc_FragColor * texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)" snippet:@"texture2D(cc_PreviousPassTexture, cc_FragTexCoord1)"];
 
     NSString* effectBody = CC_GLSL(
                                    // Index the normal map and expand the color value from [0..1] to [-1..1]