Skip to content

Commit f93c61a

Browse files
author
Thayer J Andrews
committed
CCEffectGaussianBlur - Rename to CCEffectBlur
1 parent 3f9ccbb commit f93c61a

File tree

9 files changed

+53
-53
lines changed

9 files changed

+53
-53
lines changed

‎cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,8 @@
274274
D272032E18FC89A000B100FF /* CCEffectStack.m in Sources */ = {isa = PBXBuildFile; fileRef = D272032118FC89A000B100FF /* CCEffectStack.m */; };
275275
D272033318FC9A4700B100FF /* CCEffectBloom.h in Headers */ = {isa = PBXBuildFile; fileRef = D272033118FC9A4700B100FF /* CCEffectBloom.h */; };
276276
D272033418FC9A4700B100FF /* CCEffectBloom.m in Sources */ = {isa = PBXBuildFile; fileRef = D272033218FC9A4700B100FF /* CCEffectBloom.m */; };
277-
D2B49104192146FB00C3443A /* CCEffectGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */; };
278-
D2B49105192146FB00C3443A /* CCEffectGaussianBlur.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */; };
277+
D2B49104192146FB00C3443A /* CCEffectBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = D2B49102192146FB00C3443A /* CCEffectBlur.h */; };
278+
D2B49105192146FB00C3443A /* CCEffectBlur.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B49103192146FB00C3443A /* CCEffectBlur.m */; };
279279
D309055018AC23110081BF11 /* CCRenderer_private.h in Headers */ = {isa = PBXBuildFile; fileRef = D309054F18AC23110081BF11 /* CCRenderer_private.h */; };
280280
D33803E318032ECE0072D8FE /* CCPhysicsBody.m in Sources */ = {isa = PBXBuildFile; fileRef = D33803E218032ECE0072D8FE /* CCPhysicsBody.m */; };
281281
D33803E618032F390072D8FE /* CCPhysicsNode.m in Sources */ = {isa = PBXBuildFile; fileRef = D33803E518032F390072D8FE /* CCPhysicsNode.m */; };
@@ -616,8 +616,8 @@
616616
D272032118FC89A000B100FF /* CCEffectStack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectStack.m; sourceTree = "<group>"; };
617617
D272033118FC9A4700B100FF /* CCEffectBloom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBloom.h; sourceTree = "<group>"; };
618618
D272033218FC9A4700B100FF /* CCEffectBloom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBloom.m; sourceTree = "<group>"; };
619-
D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGaussianBlur.h; sourceTree = "<group>"; };
620-
D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGaussianBlur.m; sourceTree = "<group>"; };
619+
D2B49102192146FB00C3443A /* CCEffectBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBlur.h; sourceTree = "<group>"; };
620+
D2B49103192146FB00C3443A /* CCEffectBlur.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBlur.m; sourceTree = "<group>"; };
621621
D2B840C31909F447008063EA /* CCRenderTexture_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCRenderTexture_Private.h; sourceTree = "<group>"; };
622622
D309054F18AC23110081BF11 /* CCRenderer_private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderer_private.h; sourceTree = "<group>"; };
623623
D33803DC18032E4F0072D8FE /* CCPhysics+ObjectiveChipmunk.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CCPhysics+ObjectiveChipmunk.h"; sourceTree = "<group>"; };
@@ -1242,8 +1242,8 @@
12421242
9DB75999196E09FF00AF3E4A /* CCEffectHue.m */,
12431243
9DF3761F191C594A00C6D27A /* CCEffectPixellate.h */,
12441244
9DF37620191C594A00C6D27A /* CCEffectPixellate.m */,
1245-
D2B49102192146FB00C3443A /* CCEffectGaussianBlur.h */,
1246-
D2B49103192146FB00C3443A /* CCEffectGaussianBlur.m */,
1245+
D2B49102192146FB00C3443A /* CCEffectBlur.h */,
1246+
D2B49103192146FB00C3443A /* CCEffectBlur.m */,
12471247
9DFB1E4E19241AEF008371EF /* CCEffectSaturation.h */,
12481248
9DFB1E4F19241AEF008371EF /* CCEffectSaturation.m */,
12491249
9D1C03B61954F636007B6735 /* CCEffectRefraction.h */,
@@ -1356,7 +1356,7 @@
13561356
B7705FE81831A07B0043CC67 /* ALDevice.h in Headers */,
13571357
B7705FCD1831A07B0043CC67 /* OALAction+Private.h in Headers */,
13581358
501CCFB50E99657C00B86F68 /* TGAlib.h in Headers */,
1359-
D2B49104192146FB00C3443A /* CCEffectGaussianBlur.h in Headers */,
1359+
D2B49104192146FB00C3443A /* CCEffectBlur.h in Headers */,
13601360
B7D2730D1822F4AA0054849B /* CCBAnimationManager.h in Headers */,
13611361
50F7B2780F28DE7C00057537 /* CCActionEase.h in Headers */,
13621362
B798D1451820305400E7BFCD /* CCSprite_Private.h in Headers */,
@@ -1594,7 +1594,7 @@
15941594
504055B10E3230BD00213FEF /* CCParticleExamples.m in Sources */,
15951595
506602120E38A70D000B500E /* CCScheduler.m in Sources */,
15961596
50A07B7B0E4CBCD300AAF0BB /* cocos2d.m in Sources */,
1597-
D2B49105192146FB00C3443A /* CCEffectGaussianBlur.m in Sources */,
1597+
D2B49105192146FB00C3443A /* CCEffectBlur.m in Sources */,
15981598
B7D273181822F4AA0054849B /* CCBSequenceProperty.m in Sources */,
15991599
501CCFB40E99657C00B86F68 /* TGAlib.m in Sources */,
16001600
B7E260D918171D2000A0E872 /* CCTextField.m in Sources */,

‎cocos2d-osx.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
929D1B6D1954C2A600B27340 /* CCEffectBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = 929D1B591954C2A600B27340 /* CCEffectBrightness.m */; };
2222
929D1B6E1954C2A600B27340 /* CCEffectContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = 929D1B5A1954C2A600B27340 /* CCEffectContrast.h */; };
2323
929D1B6F1954C2A600B27340 /* CCEffectContrast.m in Sources */ = {isa = PBXBuildFile; fileRef = 929D1B5B1954C2A600B27340 /* CCEffectContrast.m */; };
24-
929D1B701954C2A600B27340 /* CCEffectGaussianBlur.m in Sources */ = {isa = PBXBuildFile; fileRef = 929D1B5C1954C2A600B27340 /* CCEffectGaussianBlur.m */; };
24+
929D1B701954C2A600B27340 /* CCEffectBlur.m in Sources */ = {isa = PBXBuildFile; fileRef = 929D1B5C1954C2A600B27340 /* CCEffectBlur.m */; };
2525
929D1B721954C2A600B27340 /* CCEffectNode.h in Headers */ = {isa = PBXBuildFile; fileRef = 929D1B5E1954C2A600B27340 /* CCEffectNode.h */; };
2626
929D1B731954C2A600B27340 /* CCEffectNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 929D1B5F1954C2A600B27340 /* CCEffectNode.m */; };
2727
929D1B741954C2A600B27340 /* CCEffectPixellate.h in Headers */ = {isa = PBXBuildFile; fileRef = 929D1B601954C2A600B27340 /* CCEffectPixellate.h */; };
@@ -36,7 +36,7 @@
3636
92D1343B1954FC7A003833C4 /* CCEffectStackProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D134361954FC7A003833C4 /* CCEffectStackProtocol.h */; };
3737
92D1343C1954FC7A003833C4 /* CCRenderTexture_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D134371954FC7A003833C4 /* CCRenderTexture_Private.h */; };
3838
92D1343E1954FC7A003833C4 /* CCActionManager_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D134391954FC7A003833C4 /* CCActionManager_Private.h */; };
39-
92D1343F1954FC7A003833C4 /* CCEffectGaussianBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D1343A1954FC7A003833C4 /* CCEffectGaussianBlur.h */; };
39+
92D1343F1954FC7A003833C4 /* CCEffectBlur.h in Headers */ = {isa = PBXBuildFile; fileRef = 92D1343A1954FC7A003833C4 /* CCEffectBlur.h */; };
4040
9D23869C196F0BC4001B792B /* CCEffectHue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D23869A196F0BC4001B792B /* CCEffectHue.h */; };
4141
9D23869D196F0BC4001B792B /* CCEffectHue.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D23869B196F0BC4001B792B /* CCEffectHue.m */; };
4242
9DB75994196E073200AF3E4A /* CCEffectBloom.h in Headers */ = {isa = PBXBuildFile; fileRef = 9DB75992196E073200AF3E4A /* CCEffectBloom.h */; };
@@ -381,7 +381,7 @@
381381
929D1B591954C2A600B27340 /* CCEffectBrightness.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBrightness.m; sourceTree = "<group>"; };
382382
929D1B5A1954C2A600B27340 /* CCEffectContrast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectContrast.h; sourceTree = "<group>"; };
383383
929D1B5B1954C2A600B27340 /* CCEffectContrast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectContrast.m; sourceTree = "<group>"; };
384-
929D1B5C1954C2A600B27340 /* CCEffectGaussianBlur.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectGaussianBlur.m; sourceTree = "<group>"; };
384+
929D1B5C1954C2A600B27340 /* CCEffectBlur.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectBlur.m; sourceTree = "<group>"; };
385385
929D1B5E1954C2A600B27340 /* CCEffectNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectNode.h; sourceTree = "<group>"; };
386386
929D1B5F1954C2A600B27340 /* CCEffectNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectNode.m; sourceTree = "<group>"; };
387387
929D1B601954C2A600B27340 /* CCEffectPixellate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectPixellate.h; sourceTree = "<group>"; };
@@ -396,7 +396,7 @@
396396
92D134361954FC7A003833C4 /* CCEffectStackProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectStackProtocol.h; sourceTree = "<group>"; };
397397
92D134371954FC7A003833C4 /* CCRenderTexture_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCRenderTexture_Private.h; sourceTree = "<group>"; };
398398
92D134391954FC7A003833C4 /* CCActionManager_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCActionManager_Private.h; sourceTree = "<group>"; };
399-
92D1343A1954FC7A003833C4 /* CCEffectGaussianBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectGaussianBlur.h; sourceTree = "<group>"; };
399+
92D1343A1954FC7A003833C4 /* CCEffectBlur.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBlur.h; sourceTree = "<group>"; };
400400
9D23869A196F0BC4001B792B /* CCEffectHue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectHue.h; sourceTree = "<group>"; };
401401
9D23869B196F0BC4001B792B /* CCEffectHue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectHue.m; sourceTree = "<group>"; };
402402
9DB75992196E073200AF3E4A /* CCEffectBloom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBloom.h; sourceTree = "<group>"; };
@@ -874,8 +874,8 @@
874874
929D1B591954C2A600B27340 /* CCEffectBrightness.m */,
875875
929D1B5A1954C2A600B27340 /* CCEffectContrast.h */,
876876
929D1B5B1954C2A600B27340 /* CCEffectContrast.m */,
877-
92D1343A1954FC7A003833C4 /* CCEffectGaussianBlur.h */,
878-
929D1B5C1954C2A600B27340 /* CCEffectGaussianBlur.m */,
877+
92D1343A1954FC7A003833C4 /* CCEffectBlur.h */,
878+
929D1B5C1954C2A600B27340 /* CCEffectBlur.m */,
879879
9D23869A196F0BC4001B792B /* CCEffectHue.h */,
880880
9D23869B196F0BC4001B792B /* CCEffectHue.m */,
881881
929D1B5E1954C2A600B27340 /* CCEffectNode.h */,
@@ -1685,7 +1685,7 @@
16851685
B74C2B9717BDA54600A829C0 /* CCSprite9Slice.h in Headers */,
16861686
B75C2E7717C5857F002B0E0D /* NSAttributedString+CCAdditions.h in Headers */,
16871687
B77060631831B0C40043CC67 /* OALActionManager.h in Headers */,
1688-
92D1343F1954FC7A003833C4 /* CCEffectGaussianBlur.h in Headers */,
1688+
92D1343F1954FC7A003833C4 /* CCEffectBlur.h in Headers */,
16891689
B77060711831B0C40043CC67 /* ObjectAL.h in Headers */,
16901690
A66680C317D4D73000ECDE6F /* CCResponder.h in Headers */,
16911691
A66680C517D4D73000ECDE6F /* CCResponderManager.h in Headers */,
@@ -1914,7 +1914,7 @@
19141914
B77060971831B0C40043CC67 /* OALAudioFile.m in Sources */,
19151915
2B192860163379400049A044 /* CCClippingNode.m in Sources */,
19161916
B77060741831B0C40043CC67 /* ALBuffer.m in Sources */,
1917-
929D1B701954C2A600B27340 /* CCEffectGaussianBlur.m in Sources */,
1917+
929D1B701954C2A600B27340 /* CCEffectBlur.m in Sources */,
19181918
B751D2611988896D00722D93 /* CCEffectReflection.m in Sources */,
19191919
A003ACA8165731D500C7B792 /* ccFPSImages.m in Sources */,
19201920
B74C2B9617BDA54600A829C0 /* CCSprite9Slice.m in Sources */,

‎cocos2d-ui-tests/tests/CCEffectPongTest.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#import "CCTextureCache.h"
1111
#import "CCNodeColor.h"
1212
#import "CCEffectNode.h"
13-
#import "CCEffectGaussianBlur.h"
13+
#import "CCEffectBlur.h"
1414

1515

1616
#define PADDLE_SCALE 0.5f
@@ -37,7 +37,7 @@ @implementation CCEffectPongTest {
3737
CGSize _designSize;
3838

3939
CCEffectNode* _ballEffectNode;
40-
CCEffectGaussianBlur* _ballEffect;
40+
CCEffectBlur* _ballEffect;
4141

4242
CCNodeColor* _ceiling;
4343
CCNodeColor* _floor;
@@ -155,7 +155,7 @@ - (void)setupBall
155155
_ballEffectNode.scale = 0.1f;
156156
[_ballEffectNode addChild:_ball];
157157

158-
_ballEffect = [CCEffectGaussianBlur effectWithPixelBlurRadius:2.0];
158+
_ballEffect = [CCEffectBlur effectWithPixelBlurRadius:2.0];
159159
_ballEffectNode.effect = _ballEffect;
160160
}
161161

‎cocos2d-ui-tests/tests/CCEffectsTest.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#import "CCTextureCache.h"
33
#import "CCNodeColor.h"
44
#import "CCEffectNode.h"
5-
#import "CCEffectGaussianBlur.h"
5+
#import "CCEffectBlur.h"
66

77

88
@interface CCEffectsTest : TestBase @end
@@ -283,7 +283,7 @@ -(void)setupBlurEffectNodeTest
283283
effectNode.positionType = CCPositionTypeNormalized;
284284
effectNode.position = ccp(0.1, 0.5);
285285
[effectNode addChild:sampleSprite];
286-
CCEffectGaussianBlur* effect = [CCEffectGaussianBlur effectWithPixelBlurRadius:1.0];
286+
CCEffectBlur* effect = [CCEffectBlur effectWithPixelBlurRadius:1.0];
287287
effectNode.effect = effect;
288288

289289
[self.contentNode addChild:effectNode];
@@ -297,7 +297,7 @@ -(void)setupBlurEffectNodeTest
297297
effectNode2.positionType = CCPositionTypeNormalized;
298298
effectNode2.position = ccp(0.21, 0.5);
299299
[effectNode2 addChild:sampleSprite2];
300-
CCEffectGaussianBlur* effect2 = [CCEffectGaussianBlur effectWithPixelBlurRadius:7.0];
300+
CCEffectBlur* effect2 = [CCEffectBlur effectWithPixelBlurRadius:7.0];
301301
effectNode2.effect = effect2;
302302

303303
[self.contentNode addChild:effectNode2];
@@ -313,7 +313,7 @@ -(void)setupBlurEffectNodeTest
313313
effectNode3.position = ccp(0.5, 0.5);
314314
effectNode3.anchorPoint = ccp(0.5, 0.5);
315315
[effectNode3 addChild:sampleSprite3];
316-
CCEffectGaussianBlur* effect3 = [CCEffectGaussianBlur effectWithPixelBlurRadius:1.0];
316+
CCEffectBlur* effect3 = [CCEffectBlur effectWithPixelBlurRadius:1.0];
317317
effectNode3.effect = effect3;
318318

319319
[self.contentNode addChild:effectNode3];
@@ -327,7 +327,7 @@ -(void)setupBlurEffectNodeTest
327327
effectNode4.positionType = CCPositionTypeNormalized;
328328
effectNode4.position = ccp(0.6, 0.5);
329329
[effectNode4 addChild:sampleSprite4];
330-
CCEffectGaussianBlur* effect4 = [CCEffectGaussianBlur effectWithPixelBlurRadius:7.0];
330+
CCEffectBlur* effect4 = [CCEffectBlur effectWithPixelBlurRadius:7.0];
331331
effectNode4.effect = effect4;
332332

333333
[self.contentNode addChild:effectNode4];
@@ -508,7 +508,7 @@ -(void)setupStackTest
508508
[self.contentNode addChild:refractEnvironment];
509509

510510
NSArray *effects = @[
511-
[CCEffectGaussianBlur effectWithPixelBlurRadius:7.0],
511+
[CCEffectBlur effectWithPixelBlurRadius:7.0],
512512
[CCEffectBloom effectWithPixelBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f],
513513
[CCEffectBrightness effectWithBrightness:0.25f],
514514
[CCEffectContrast effectWithContrast:1.0f],
@@ -563,7 +563,7 @@ -(void)setupPerformanceTest
563563
refractEnvironment.scale = 0.5;
564564

565565
NSArray *allEffects = @[
566-
[CCEffectGaussianBlur effectWithPixelBlurRadius:7.0],
566+
[CCEffectBlur effectWithPixelBlurRadius:7.0],
567567
[CCEffectBloom effectWithPixelBlurRadius:8 intensity:1.0f luminanceThreshold:0.0f],
568568
[CCEffectBrightness effectWithBrightness:0.25f],
569569
[CCEffectContrast effectWithContrast:1.0f],

‎cocos2d/CCEffectBloom.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,13 +121,13 @@ -(void)setBlurRadius:(NSUInteger)blurRadius
121121

122122
- (void)setBlurRadiusAndDependents:(NSUInteger)blurRadius
123123
{
124-
blurRadius = MIN(blurRadius, GAUSSIANBLUR_OPTMIZIED_RADIUS_MAX);
124+
blurRadius = MIN(blurRadius, BLUR_OPTIMIZED_RADIUS_MAX);
125125
_blurRadius = blurRadius;
126126
_sigma = blurRadius / 2;
127127
if(_sigma == 0.0)
128128
_sigma = 1.0f;
129129

130-
_numberOfOptimizedOffsets = MIN(blurRadius / 2 + (blurRadius % 2), GAUSSIANBLUR_OPTMIZIED_RADIUS_MAX);
130+
_numberOfOptimizedOffsets = MIN(blurRadius / 2 + (blurRadius % 2), BLUR_OPTIMIZED_RADIUS_MAX);
131131
}
132132

133133
-(void)buildFragmentFunctions
@@ -157,7 +157,7 @@ -(void)buildFragmentFunctions
157157
}
158158

159159
// From these weights we calculate the offsets to read interpolated values from
160-
NSUInteger numberOfOptimizedOffsets = MIN(_blurRadius / 2 + (_blurRadius % 2), GAUSSIANBLUR_OPTMIZIED_RADIUS_MAX);
160+
NSUInteger numberOfOptimizedOffsets = MIN(_blurRadius / 2 + (_blurRadius % 2), BLUR_OPTIMIZED_RADIUS_MAX);
161161
NSUInteger trueNumberOfOptimizedOffsets = _blurRadius / 2 + (_blurRadius % 2);
162162

163163
NSMutableString *shaderString = [[NSMutableString alloc] init];

‎cocos2d/CCEffectGaussianBlur.h renamed to ‎cocos2d/CCEffectBlur.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// CCEffectGaussianBlur.h
2+
// CCEffectBlur.h
33
// cocos2d-ios
44
//
55
// Created by Oleg Osin on 5/12/14.
@@ -10,10 +10,10 @@
1010

1111

1212
/**
13-
* CCEffectGaussianBlur performs blur operation on the pixels of the attached node.
13+
* CCEffectBlur performs blur operation on the pixels of the attached node.
1414
*/
1515

16-
@interface CCEffectGaussianBlur : CCEffect
16+
@interface CCEffectBlur : CCEffect
1717

1818

1919
/// -----------------------------------------------------------------------
@@ -26,39 +26,39 @@
2626

2727

2828
/// -----------------------------------------------------------------------
29-
/// @name Initializing a CCEffectGaussianBlur object
29+
/// @name Initializing a CCEffectBlur object
3030
/// -----------------------------------------------------------------------
3131

3232
/**
33-
* Initializes a CCEffectGaussianBlur object with the following default parameters:
33+
* Initializes a CCEffectBlur object with the following default parameters:
3434
* blurRadius = 2
3535
*
36-
* @return The CCEffectGaussianBlur object.
36+
* @return The CCEffectBlur object.
3737
*/
3838
-(id)init;
3939

4040
/**
41-
* Initializes a CCEffectGaussianBlur object with the specified parameters.
41+
* Initializes a CCEffectBlur object with the specified parameters.
4242
*
4343
* @param blurRadius number of pixels blur will extend to (6 is the maximum, because we are limited by the number
4444
* of varying variables that can be passed to a glsl program).
4545
*
46-
* @return The CCEffectGaussianBlur object.
46+
* @return The CCEffectBlur object.
4747
*/
4848
-(id)initWithPixelBlurRadius:(NSUInteger)blurRadius;
4949

5050

5151
/// -----------------------------------------------------------------------
52-
/// @name Creating a CCEffectGaussianBlur object
52+
/// @name Creating a CCEffectBlur object
5353
/// -----------------------------------------------------------------------
5454

5555
/**
56-
* Creates a CCEffectGaussianBlur object with the specified parameters.
56+
* Creates a CCEffectBlur object with the specified parameters.
5757
*
5858
* @param blurRadius number of pixels blur will extend to (6 is the maximum, because we are limited by the number
5959
* of varying variables that can be passed to a glsl program).
6060
*
61-
* @return The CCEffectGaussianBlur object.
61+
* @return The CCEffectBlur object.
6262
*/
6363
+(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius;
6464

0 commit comments

Comments
 (0)