CCEffectBlur / Bloom - Change effectWithPixelBlurRadius to effectWithBlurRadius

Author: Thayer J Andrews

cocos2d-ui-tests/tests/CCEffectPongTest.m

@@ -155,7 +155,7 @@ - (void)setupBall
         _ballEffectNode.scale = 0.1f;
         [_ballEffectNode addChild:_ball];
 
-        _ballEffect = [CCEffectBlur effectWithPixelBlurRadius:2.0];
+        _ballEffect = [CCEffectBlur effectWithBlurRadius:2.0];
         _ballEffectNode.effect = _ballEffect;
     }
 

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -283,7 +283,7 @@ -(void)setupBlurEffectNodeTest
     effectNode.positionType = CCPositionTypeNormalized;
     effectNode.position = ccp(0.1, 0.5);
     [effectNode addChild:sampleSprite];
-    CCEffectBlur* effect = [CCEffectBlur effectWithPixelBlurRadius:1.0];
+    CCEffectBlur* effect = [CCEffectBlur effectWithBlurRadius:1.0];
     effectNode.effect = effect;
 
     [self.contentNode addChild:effectNode];
@@ -297,7 +297,7 @@ -(void)setupBlurEffectNodeTest
     effectNode2.positionType = CCPositionTypeNormalized;
     effectNode2.position = ccp(0.21, 0.5);
     [effectNode2 addChild:sampleSprite2];
-    CCEffectBlur* effect2 = [CCEffectBlur effectWithPixelBlurRadius:7.0];
+    CCEffectBlur* effect2 = [CCEffectBlur effectWithBlurRadius:7.0];
     effectNode2.effect = effect2;
 
     [self.contentNode addChild:effectNode2];
@@ -313,7 +313,7 @@ -(void)setupBlurEffectNodeTest
     effectNode3.position = ccp(0.5, 0.5);
     effectNode3.anchorPoint = ccp(0.5, 0.5);
     [effectNode3 addChild:sampleSprite3];
-    CCEffectBlur* effect3 = [CCEffectBlur effectWithPixelBlurRadius:1.0];
+    CCEffectBlur* effect3 = [CCEffectBlur effectWithBlurRadius:1.0];
     effectNode3.effect = effect3;
 
     [self.contentNode addChild:effectNode3];
@@ -327,7 +327,7 @@ -(void)setupBlurEffectNodeTest
     effectNode4.positionType = CCPositionTypeNormalized;
     effectNode4.position = ccp(0.6, 0.5);
     [effectNode4 addChild:sampleSprite4];
-    CCEffectBlur* effect4 = [CCEffectBlur effectWithPixelBlurRadius:7.0];
+    CCEffectBlur* effect4 = [CCEffectBlur effectWithBlurRadius:7.0];
     effectNode4.effect = effect4;
 
     [self.contentNode addChild:effectNode4];
@@ -358,7 +358,7 @@ -(void)setupGlowEffectNodeTest
     glowEffectNode.positionType = CCPositionTypeNormalized;
     glowEffectNode.position = ccp(0.1, 0.5);
     [glowEffectNode addChild:sampleSprite];
-    CCEffectBloom* glowEffect = [CCEffectBloom effectWithPixelBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f];
+    CCEffectBloom* glowEffect = [CCEffectBloom effectWithBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f];
     glowEffectNode.effect = glowEffect;
 
     [self.contentNode addChild:glowEffectNode];
@@ -385,7 +385,7 @@ -(void)setupGlowEffectNodeTest
     glowEffectNode2.positionType = CCPositionTypeNormalized;
     glowEffectNode2.position = ccp(0.4, 0.5);
     [glowEffectNode2 addChild:sampleSprite2];
-    CCEffectBloom* glowEffect2 = [CCEffectBloom effectWithPixelBlurRadius:2 intensity:0.0f luminanceThreshold:0.0f];
+    CCEffectBloom* glowEffect2 = [CCEffectBloom effectWithBlurRadius:2 intensity:0.0f luminanceThreshold:0.0f];
     glowEffectNode2.effect = glowEffect2;
 
     [self.contentNode addChild:glowEffectNode2];
@@ -508,8 +508,8 @@ -(void)setupStackTest
     [self.contentNode addChild:refractEnvironment];
 
     NSArray *effects = @[
-                         [CCEffectBlur effectWithPixelBlurRadius:7.0],
-                         [CCEffectBloom effectWithPixelBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f],
+                         [CCEffectBlur effectWithBlurRadius:7.0],
+                         [CCEffectBloom effectWithBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f],
                          [CCEffectBrightness effectWithBrightness:0.25f],
                          [CCEffectContrast effectWithContrast:1.0f],
                          [CCEffectPixellate effectWithBlockSize:8.0f],
@@ -563,8 +563,8 @@ -(void)setupPerformanceTest
     refractEnvironment.scale = 0.5;
 
     NSArray *allEffects = @[
-                            [CCEffectBlur effectWithPixelBlurRadius:7.0],
-                            [CCEffectBloom effectWithPixelBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f],
+                            [CCEffectBlur effectWithBlurRadius:7.0],
+                            [CCEffectBloom effectWithBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f],
                             [CCEffectBrightness effectWithBrightness:0.25f],
                             [CCEffectContrast effectWithContrast:1.0f],
                             [CCEffectPixellate effectWithBlockSize:4.0f],

cocos2d/CCEffectBloom.h

@@ -85,6 +85,6 @@
  *  @return The CCEffectBloom object.
  *
  */
-+(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity luminanceThreshold:(float)luminanceThreshold;
++(id)effectWithBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity luminanceThreshold:(float)luminanceThreshold;
 
 @end

cocos2d/CCEffectBloom.m

@@ -92,7 +92,7 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity l
     return self;
 }
 
-+(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity luminanceThreshold:(float)luminanceThreshold
++(id)effectWithBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity luminanceThreshold:(float)luminanceThreshold
 {
     return [[self alloc] initWithPixelBlurRadius:blurRadius intensity:intensity luminanceThreshold:luminanceThreshold];
 }

cocos2d/CCEffectBlur.h

@@ -60,7 +60,7 @@
  *
  *  @return The CCEffectBlur object.
  */
-+(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius;
++(id)effectWithBlurRadius:(NSUInteger)blurRadius;
 
 @end
 

cocos2d/CCEffectBlur.m

@@ -85,7 +85,7 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius
     return self;
 }
 
-+(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius
++(id)effectWithBlurRadius:(NSUInteger)blurRadius
 {
     return [[self alloc] initWithPixelBlurRadius:blurRadius];
 }