CCEffects - Change "varying" to "varyings" to match our use of "uniforms" elsewhere

Thayer J Andrews · Thayer J Andrews · commit 31945f627347 · 2014-07-29T16:53:07.000-07:00
No functional change
diff --git a/cocos2d/CCEffect.m b/cocos2d/CCEffect.m
@@ -299,29 +299,29 @@ + (NSSet *)defaultEffectVertexUniformNames
 
 -(id)init
 {
-    return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:nil vertexUniforms:nil varying:nil];
+    return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:nil vertexUniforms:nil varyings:nil];
 }
 
--(id)initWithFragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varying:(NSArray*)varying
+-(id)initWithFragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings
 {
-    return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varying:varying];
+    return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings];
 }
 
--(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varying:(NSArray*)varying
+-(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings
 {
-    return [self initWithFragmentFunction:fragmentFunctions vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varying:varying];
+    return [self initWithFragmentFunction:fragmentFunctions vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings];
 }
 
--(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varying:(NSArray*)varying
+-(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings
 {
     if((self = [super init]))
     {
-        [self buildEffectWithFragmentFunction:fragmentFunctions vertexFunctions:vertexFunctions fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varying:varying];
+        [self buildEffectWithFragmentFunction:fragmentFunctions vertexFunctions:vertexFunctions fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings];
     }
     return self;
 }
 
-- (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varying:(NSArray*)varying
+- (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings
 {
     if (fragmentFunctions)
     {
@@ -360,7 +360,7 @@ - (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vert
         _vertexUniforms = [[CCEffect defaultEffectVertexUniforms] copy];
     }
     
-    [self setVarying:varying];
+    [self setVaryings:varyings];
     
     _stitchFlags = CCEffectFunctionStitchBoth;
     
@@ -400,11 +400,11 @@ -(void)buildUniformTranslationTable
     }
 }
 
--(void)setVarying:(NSArray*)varying
+-(void)setVaryings:(NSArray*)varyings
 {
-    if (varying)
+    if (varyings)
     {
-        _varyingVars = [varying copy];
+        _varyingVars = [varyings copy];
     }
     else
     {
diff --git a/cocos2d/CCEffectBloom.m b/cocos2d/CCEffectBloom.m
@@ -81,7 +81,7 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity l
     
     if(self = [super initWithFragmentUniforms:@[u_enableGlowMap, u_luminanceThreshold, u_intensity]
                                vertexUniforms:@[u_blurDirection]
-                                      varying:@[v_blurCoords]])
+                                     varyings:@[v_blurCoords]])
     {
         
         self.debugName = @"CCEffectBloom";
@@ -364,7 +364,7 @@ - (CCEffectPrepareStatus)prepareForRendering
     {
         unsigned long count = (unsigned long)(1 + (_numberOfOptimizedOffsets * 2));
         CCEffectVarying* v_blurCoords = [CCEffectVarying varying:@"vec2" name:@"v_blurCoordinates" count:count];
-        [self setVarying:@[v_blurCoords]];
+        [self setVaryings:@[v_blurCoords]];
 
         [self buildFragmentFunctions];
         [self buildVertexFunctions];
diff --git a/cocos2d/CCEffectBrightness.m b/cocos2d/CCEffectBrightness.m
@@ -31,7 +31,7 @@ -(id)initWithBrightness:(float)brightness
 {
     CCEffectUniform* uniformBrightness = [CCEffectUniform uniform:@"float" name:@"u_brightness" value:[NSNumber numberWithFloat:0.0f]];
     
-    if((self = [super initWithFragmentUniforms:@[uniformBrightness] vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:@[uniformBrightness] vertexUniforms:nil varyings:nil]))
     {
         _brightness = brightness;
         _conditionedBrightness = [NSNumber numberWithFloat:conditionBrightness(brightness)];
diff --git a/cocos2d/CCEffectContrast.m b/cocos2d/CCEffectContrast.m
@@ -32,7 +32,7 @@ -(id)initWithContrast:(float)contrast
 {
     CCEffectUniform* uniformContrast = [CCEffectUniform uniform:@"float" name:@"u_contrast" value:[NSNumber numberWithFloat:1.0f]];
     
-    if((self = [super initWithFragmentUniforms:@[uniformContrast] vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:@[uniformContrast] vertexUniforms:nil varyings:nil]))
     {
         _contrast = contrast;
         _conditionedContrast = [NSNumber numberWithFloat:conditionContrast(contrast)];
diff --git a/cocos2d/CCEffectGaussianBlur.m b/cocos2d/CCEffectGaussianBlur.m
@@ -74,7 +74,7 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius
     
     if(self = [super initWithFragmentUniforms:nil
                                vertexUniforms:[NSArray arrayWithObjects:u_blurDirection, nil]
-                                      varying:[NSArray arrayWithObjects:v_blurCoords, nil]])
+                                     varyings:[NSArray arrayWithObjects:v_blurCoords, nil]])
     {
         
         self.debugName = @"CCEffectGaussianBlur";
@@ -300,7 +300,7 @@ - (CCEffectPrepareStatus)prepareForRendering
     {
         unsigned long count = (unsigned long)(1 + (_numberOfOptimizedOffsets * 2));
         CCEffectVarying* v_blurCoords = [CCEffectVarying varying:@"vec2" name:@"v_blurCoordinates" count:count];
-        [self setVarying:@[v_blurCoords]];
+        [self setVaryings:@[v_blurCoords]];
 
         [self buildFragmentFunctions];
         [self buildVertexFunctions];
diff --git a/cocos2d/CCEffectGlass.m b/cocos2d/CCEffectGlass.m
@@ -65,7 +65,7 @@ -(id)initWithShininess:(float)shininess refraction:(float)refraction refractionE
                           
                           ];
     
-    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))
     {
         _refraction = refraction;
         _conditionedRefraction = CCEffectUtilsConditionRefraction(refraction);
diff --git a/cocos2d/CCEffectHue.m b/cocos2d/CCEffectHue.m
@@ -81,7 +81,7 @@ -(id)initWithHue:(float)hue
 #endif
                           ];
     
-    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))
     {
         _hue = hue;
 #if CCEFFECTHUE_USES_COLOR_MATRIX
diff --git a/cocos2d/CCEffectPixellate.m b/cocos2d/CCEffectPixellate.m
@@ -66,7 +66,7 @@ -(id)initWithBlockSize:(float)blockSize
     CCEffectUniform* uniformUStep = [CCEffectUniform uniform:@"float" name:@"u_uStep" value:[NSNumber numberWithFloat:1.0f]];
     CCEffectUniform* uniformVStep = [CCEffectUniform uniform:@"float" name:@"u_vStep" value:[NSNumber numberWithFloat:1.0f]];
     
-    if((self = [super initWithFragmentUniforms:@[uniformUStep, uniformVStep] vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:@[uniformUStep, uniformVStep] vertexUniforms:nil varyings:nil]))
     {
         _blockSize = blockSize;
         _conditionedBlockSize = conditionBlockSize(blockSize);
diff --git a/cocos2d/CCEffectReflection.m b/cocos2d/CCEffectReflection.m
@@ -61,7 +61,7 @@ -(id)initWithShininess:(float)shininess fresnelBias:(float)bias fresnelPower:(fl
                           [CCEffectUniform uniform:@"mat4" name:@"u_screenToEnv" value:[NSValue valueWithGLKMatrix4:GLKMatrix4Identity]],
                           ];
     
-    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))
     {
         _shininess = shininess;
         _conditionedShininess = CCEffectUtilsConditionShininess(shininess);
diff --git a/cocos2d/CCEffectRefraction.m b/cocos2d/CCEffectRefraction.m
@@ -46,7 +46,7 @@ -(id)initWithRefraction:(float)refraction environment:(CCSprite *)environment no
                           [CCEffectUniform uniform:@"mat4" name:@"u_screenToEnv" value:[NSValue valueWithGLKMatrix4:GLKMatrix4Identity]],
                           ];
     
-    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))
     {
         _refraction = refraction;
         _conditionedRefraction = CCEffectUtilsConditionRefraction(refraction);
diff --git a/cocos2d/CCEffectSaturation.m b/cocos2d/CCEffectSaturation.m
@@ -67,7 +67,7 @@ -(id)initWithSaturation:(float)saturation
 {
     CCEffectUniform* uniformSaturation = [CCEffectUniform uniform:@"float" name:@"u_saturation" value:[NSNumber numberWithFloat:1.0f]];
     
-    if((self = [super initWithFragmentUniforms:@[uniformSaturation] vertexUniforms:nil varying:nil]))
+    if((self = [super initWithFragmentUniforms:@[uniformSaturation] vertexUniforms:nil varyings:nil]))
     {
         _saturation = saturation;
         _conditionedSaturation = [NSNumber numberWithFloat:conditionSaturation(saturation)];
diff --git a/cocos2d/CCEffectStack.m b/cocos2d/CCEffectStack.m
@@ -216,7 +216,7 @@ -(CCEffect *)stitchEffects:(NSArray*)effects
         effectIndex++;
     }
     
-    CCEffect* stitchedEffect = [[CCEffect alloc] initWithFragmentFunction:allFragFunctions vertexFunctions:allVertexFunctions fragmentUniforms:allFragUniforms vertexUniforms:allVertexUniforms varying:allVaryings];
+    CCEffect* stitchedEffect = [[CCEffect alloc] initWithFragmentFunction:allFragFunctions vertexFunctions:allVertexFunctions fragmentUniforms:allFragUniforms vertexUniforms:allVertexUniforms varyings:allVaryings];
     stitchedEffect.debugName = @"CCEffectStack_Stitched";
     
     // Set the stitch flags of the resulting effect based on the flags of the first
diff --git a/cocos2d/CCEffect_Private.h b/cocos2d/CCEffect_Private.h
@@ -131,16 +131,16 @@ typedef void (^CCEffectRenderPassEndBlock)(CCEffectRenderPass *pass);
 @property (nonatomic) NSMutableDictionary* uniformTranslationTable;
 
 
--(id)initWithFragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varying:(NSArray*)varying;
--(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varying:(NSArray*)varying;
--(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varying:(NSArray*)varying;
+-(id)initWithFragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings;
+-(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions 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;
 
 -(CCEffectPrepareStatus)prepareForRendering;
 -(CCEffectRenderPass *)renderPassAtIndex:(NSUInteger)passIndex;
 
 -(BOOL)stitchSupported:(CCEffectFunctionStitchFlags)stitch;
 
--(void)setVarying:(NSArray*)varying;
+-(void)setVaryings:(NSArray*)varyings;
 
 
 -(void)buildEffectShader;

Original file line number	Diff line number	Diff line change
`@@ -299,29 +299,29 @@ + (NSSet *)defaultEffectVertexUniformNames`
`299`	`299`
`300`	`300`	`-(id)init`
`301`	`301`	`{`
`302`		`- return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:nil vertexUniforms:nil varying:nil];`
	`302`	`+ return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:nil vertexUniforms:nil varyings:nil];`
`303`	`303`	`}`
`304`	`304`
`305`		`--(id)initWithFragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varying:(NSArray*)varying`
	`305`	`+-(id)initWithFragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varyings:(NSArray*)varyings`
`306`	`306`	`{`
`307`		`- return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varying:varying];`
	`307`	`+ return [self initWithFragmentFunction:nil vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings];`
`308`	`308`	`}`
`309`	`309`
`310`		`--(id)initWithFragmentFunction:(NSMutableArray) fragmentFunctions fragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varying:(NSArray)varying`
	`310`	`+-(id)initWithFragmentFunction:(NSMutableArray) fragmentFunctions fragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varyings:(NSArray)varyings`
`311`	`311`	`{`
`312`		`- return [self initWithFragmentFunction:fragmentFunctions vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varying:varying];`
	`312`	`+ return [self initWithFragmentFunction:fragmentFunctions vertexFunctions:nil fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings];`
`313`	`313`	`}`
`314`	`314`
`315`		`--(id)initWithFragmentFunction:(NSMutableArray) fragmentFunctions vertexFunctions:(NSMutableArray)vertexFunctions fragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varying:(NSArray*)varying`
	`315`	`+-(id)initWithFragmentFunction:(NSMutableArray) fragmentFunctions vertexFunctions:(NSMutableArray)vertexFunctions fragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varyings:(NSArray*)varyings`
`316`	`316`	`{`
`317`	`317`	`if((self = [super init]))`
`318`	`318`	`{`
`319`		`- [self buildEffectWithFragmentFunction:fragmentFunctions vertexFunctions:vertexFunctions fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varying:varying];`
	`319`	`+ [self buildEffectWithFragmentFunction:fragmentFunctions vertexFunctions:vertexFunctions fragmentUniforms:fragmentUniforms vertexUniforms:vertexUniforms varyings:varyings];`
`320`	`320`	`}`
`321`	`321`	`return self;`
`322`	`322`	`}`
`323`	`323`
`324`		`-- (void)buildEffectWithFragmentFunction:(NSMutableArray) fragmentFunctions vertexFunctions:(NSMutableArray)vertexFunctions fragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varying:(NSArray*)varying`
	`324`	`+- (void)buildEffectWithFragmentFunction:(NSMutableArray) fragmentFunctions vertexFunctions:(NSMutableArray)vertexFunctions fragmentUniforms:(NSArray)fragmentUniforms vertexUniforms:(NSArray)vertexUniforms varyings:(NSArray*)varyings`
`325`	`325`	`{`
`326`	`326`	`if (fragmentFunctions)`
`327`	`327`	`{`
`@@ -360,7 +360,7 @@ - (void)buildEffectWithFragmentFunction:(NSMutableArray*) fragmentFunctions vert`
`360`	`360`	`_vertexUniforms = [[CCEffect defaultEffectVertexUniforms] copy];`
`361`	`361`	`}`
`362`	`362`
`363`		`- [self setVarying:varying];`
	`363`	`+ [self setVaryings:varyings];`
`364`	`364`
`365`	`365`	`_stitchFlags = CCEffectFunctionStitchBoth;`
`366`	`366`
`@@ -400,11 +400,11 @@ -(void)buildUniformTranslationTable`
`400`	`400`	`}`
`401`	`401`	`}`
`402`	`402`
`403`		`--(void)setVarying:(NSArray*)varying`
	`403`	`+-(void)setVaryings:(NSArray*)varyings`
`404`	`404`	`{`
`405`		`- if (varying)`
	`405`	`+ if (varyings)`
`406`	`406`	`{`
`407`		`- _varyingVars = [varying copy];`
	`407`	`+ _varyingVars = [varyings copy];`
`408`	`408`	`}`
`409`	`409`	`else`
`410`	`410`	`{`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity l`
`81`	`81`
`82`	`82`	`if(self = [super initWithFragmentUniforms:@[u_enableGlowMap, u_luminanceThreshold, u_intensity]`
`83`	`83`	`vertexUniforms:@[u_blurDirection]`
`84`		`- varying:@[v_blurCoords]])`
	`84`	`+ varyings:@[v_blurCoords]])`
`85`	`85`	`{`
`86`	`86`
`87`	`87`	`self.debugName = @"CCEffectBloom";`
`@@ -364,7 +364,7 @@ - (CCEffectPrepareStatus)prepareForRendering`
`364`	`364`	`{`
`365`	`365`	`unsigned long count = (unsigned long)(1 + (_numberOfOptimizedOffsets * 2));`
`366`	`366`	`CCEffectVarying* v_blurCoords = [CCEffectVarying varying:@"vec2" name:@"v_blurCoordinates" count:count];`
`367`		`- [self setVarying:@[v_blurCoords]];`
	`367`	`+ [self setVaryings:@[v_blurCoords]];`
`368`	`368`
`369`	`369`	`[self buildFragmentFunctions];`
`370`	`370`	`[self buildVertexFunctions];`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ -(id)initWithBrightness:(float)brightness`
`31`	`31`	`{`
`32`	`32`	`CCEffectUniform* uniformBrightness = [CCEffectUniform uniform:@"float" name:@"u_brightness" value:[NSNumber numberWithFloat:0.0f]];`
`33`	`33`
`34`		`- if((self = [super initWithFragmentUniforms:@[uniformBrightness] vertexUniforms:nil varying:nil]))`
	`34`	`+ if((self = [super initWithFragmentUniforms:@[uniformBrightness] vertexUniforms:nil varyings:nil]))`
`35`	`35`	`{`
`36`	`36`	`_brightness = brightness;`
`37`	`37`	`_conditionedBrightness = [NSNumber numberWithFloat:conditionBrightness(brightness)];`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ -(id)initWithContrast:(float)contrast`
`32`	`32`	`{`
`33`	`33`	`CCEffectUniform* uniformContrast = [CCEffectUniform uniform:@"float" name:@"u_contrast" value:[NSNumber numberWithFloat:1.0f]];`
`34`	`34`
`35`		`- if((self = [super initWithFragmentUniforms:@[uniformContrast] vertexUniforms:nil varying:nil]))`
	`35`	`+ if((self = [super initWithFragmentUniforms:@[uniformContrast] vertexUniforms:nil varyings:nil]))`
`36`	`36`	`{`
`37`	`37`	`_contrast = contrast;`
`38`	`38`	`_conditionedContrast = [NSNumber numberWithFloat:conditionContrast(contrast)];`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius`
`74`	`74`
`75`	`75`	`if(self = [super initWithFragmentUniforms:nil`
`76`	`76`	`vertexUniforms:[NSArray arrayWithObjects:u_blurDirection, nil]`
`77`		`- varying:[NSArray arrayWithObjects:v_blurCoords, nil]])`
	`77`	`+ varyings:[NSArray arrayWithObjects:v_blurCoords, nil]])`
`78`	`78`	`{`
`79`	`79`
`80`	`80`	`self.debugName = @"CCEffectGaussianBlur";`
`@@ -300,7 +300,7 @@ - (CCEffectPrepareStatus)prepareForRendering`
`300`	`300`	`{`
`301`	`301`	`unsigned long count = (unsigned long)(1 + (_numberOfOptimizedOffsets * 2));`
`302`	`302`	`CCEffectVarying* v_blurCoords = [CCEffectVarying varying:@"vec2" name:@"v_blurCoordinates" count:count];`
`303`		`- [self setVarying:@[v_blurCoords]];`
	`303`	`+ [self setVaryings:@[v_blurCoords]];`
`304`	`304`
`305`	`305`	`[self buildFragmentFunctions];`
`306`	`306`	`[self buildVertexFunctions];`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ -(id)initWithShininess:(float)shininess refraction:(float)refraction refractionE`
`65`	`65`
`66`	`66`	`];`
`67`	`67`
`68`		`- if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))`
	`68`	`+ if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))`
`69`	`69`	`{`
`70`	`70`	`_refraction = refraction;`
`71`	`71`	`_conditionedRefraction = CCEffectUtilsConditionRefraction(refraction);`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ -(id)initWithHue:(float)hue`
`81`	`81`	`#endif`
`82`	`82`	`];`
`83`	`83`
`84`		`- if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))`
	`84`	`+ if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))`
`85`	`85`	`{`
`86`	`86`	`_hue = hue;`
`87`	`87`	`#if CCEFFECTHUE_USES_COLOR_MATRIX`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ -(id)initWithBlockSize:(float)blockSize`
`66`	`66`	`CCEffectUniform* uniformUStep = [CCEffectUniform uniform:@"float" name:@"u_uStep" value:[NSNumber numberWithFloat:1.0f]];`
`67`	`67`	`CCEffectUniform* uniformVStep = [CCEffectUniform uniform:@"float" name:@"u_vStep" value:[NSNumber numberWithFloat:1.0f]];`
`68`	`68`
`69`		`- if((self = [super initWithFragmentUniforms:@[uniformUStep, uniformVStep] vertexUniforms:nil varying:nil]))`
	`69`	`+ if((self = [super initWithFragmentUniforms:@[uniformUStep, uniformVStep] vertexUniforms:nil varyings:nil]))`
`70`	`70`	`{`
`71`	`71`	`_blockSize = blockSize;`
`72`	`72`	`_conditionedBlockSize = conditionBlockSize(blockSize);`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ -(id)initWithShininess:(float)shininess fresnelBias:(float)bias fresnelPower:(fl`
`61`	`61`	`[CCEffectUniform uniform:@"mat4" name:@"u_screenToEnv" value:[NSValue valueWithGLKMatrix4:GLKMatrix4Identity]],`
`62`	`62`	`];`
`63`	`63`
`64`		`- if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))`
	`64`	`+ if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))`
`65`	`65`	`{`
`66`	`66`	`_shininess = shininess;`
`67`	`67`	`_conditionedShininess = CCEffectUtilsConditionShininess(shininess);`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ -(id)initWithRefraction:(float)refraction environment:(CCSprite *)environment no`
`46`	`46`	`[CCEffectUniform uniform:@"mat4" name:@"u_screenToEnv" value:[NSValue valueWithGLKMatrix4:GLKMatrix4Identity]],`
`47`	`47`	`];`
`48`	`48`
`49`		`- if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varying:nil]))`
	`49`	`+ if((self = [super initWithFragmentUniforms:uniforms vertexUniforms:nil varyings:nil]))`
`50`	`50`	`{`
`51`	`51`	`_refraction = refraction;`
`52`	`52`	`_conditionedRefraction = CCEffectUtilsConditionRefraction(refraction);`