@@ -50,28 +50,7 @@ @implementation CCEffectBloom {
5050 NSUInteger _numberOfOptimizedOffsets;
5151 GLfloat _sigma;
5252 BOOL _shaderDirty;
53- }
54-
55- - (void )setBlurRadiusAndDependents : (NSUInteger )blurRadius
56- {
57- blurRadius = MIN (blurRadius, GAUSSIANBLUR_OPTMIZIED_RADIUS_MAX);
58- _blurRadius = blurRadius;
59- _sigma = blurRadius / 2 ;
60- if (_sigma == 0.0 )
61- _sigma = 1 .0f ;
62-
63- _numberOfOptimizedOffsets = MIN (blurRadius / 2 + (blurRadius % 2 ), GAUSSIANBLUR_OPTMIZIED_RADIUS_MAX);
64- }
65-
66- -(void )setBlurRadius : (NSUInteger )blurRadius
67- {
68- [self setBlurRadiusAndDependents: blurRadius];
69-
70- // The shader is constructed dynamically based on the blur radius
71- // so mark it dirty and make sure this propagates up to any containing
72- // effect stacks.
73- _shaderDirty = YES ;
74- [self .owningStack passesDidChange: self ];
53+ float _transformedIntensity;
7554}
7655
7756-(id )init
@@ -87,13 +66,12 @@ -(id)init
8766
8867-(id )initWithPixelBlurRadius : (NSUInteger )blurRadius intensity : (float )intensity luminanceThreshold : (float )luminanceThreshold
8968{
90- _intensity = clampf (intensity, 0 .0f , 1 .0f );
91- _intensity = 1 .0f - _intensity;
92-
93- _luminanceThreshold = clampf (luminanceThreshold, 0 .0f , 1 .0f );
94-
95- [self setBlurRadiusAndDependents: blurRadius];
69+ self.intensity = intensity;
70+ self.luminanceThreshold = luminanceThreshold;
9671
72+ [self setBlurRadiusAndDependents: blurRadius];
73+
74+ CCEffectUniform* u_intensity = [CCEffectUniform uniform: @" float" name: @" u_intensity" value: [NSNumber numberWithFloat: _transformedIntensity]];
9775 CCEffectUniform* u_luminanceThreshold = [CCEffectUniform uniform: @" float" name: @" u_luminanceThreshold" value: [NSNumber numberWithFloat: _luminanceThreshold]];
9876 CCEffectUniform* u_enableGlowMap = [CCEffectUniform uniform: @" float" name: @" u_enableGlowMap" value: [NSNumber numberWithFloat: 0 .0f ]];
9977 CCEffectUniform* u_blurDirection = [CCEffectUniform uniform: @" vec2" name: @" u_blurDirection"
@@ -102,7 +80,7 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity l
10280 unsigned long count = (unsigned long )(1 + (_numberOfOptimizedOffsets * 2 ));
10381 CCEffectVarying* v_blurCoords = [CCEffectVarying varying: @" vec2" name: @" v_blurCoordinates" count: count];
10482
105- if (self = [super initWithFragmentUniforms: @[u_enableGlowMap, u_luminanceThreshold]
83+ if (self = [super initWithFragmentUniforms: @[u_enableGlowMap, u_luminanceThreshold, u_intensity ]
10684 vertexUniforms: @[u_blurDirection]
10785 varying: @[v_blurCoords]])
10886 {
@@ -120,6 +98,39 @@ +(id)effectWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity
12098 return [[self alloc ] initWithPixelBlurRadius: blurRadius intensity: intensity luminanceThreshold: luminanceThreshold];
12199}
122100
101+ -(void )setLuminanceThreshold : (float )luminanceThreshold
102+ {
103+ _luminanceThreshold = clampf (luminanceThreshold, 0 .0f , 1 .0f );
104+ }
105+
106+ -(void )setIntensity : (float )intensity
107+ {
108+ _intensity = clampf (intensity, 0 .0f , 1 .0f );
109+ _transformedIntensity = 1 .0f - _intensity;
110+ }
111+
112+ -(void )setBlurRadius : (NSUInteger )blurRadius
113+ {
114+ [self setBlurRadiusAndDependents: blurRadius];
115+
116+ // The shader is constructed dynamically based on the blur radius
117+ // so mark it dirty and make sure this propagates up to any containing
118+ // effect stacks.
119+ _shaderDirty = YES ;
120+ [self .owningStack passesDidChange: self ];
121+ }
122+
123+ - (void )setBlurRadiusAndDependents : (NSUInteger )blurRadius
124+ {
125+ blurRadius = MIN (blurRadius, GAUSSIANBLUR_OPTMIZIED_RADIUS_MAX);
126+ _blurRadius = blurRadius;
127+ _sigma = blurRadius / 2 ;
128+ if (_sigma == 0.0 )
129+ _sigma = 1 .0f ;
130+
131+ _numberOfOptimizedOffsets = MIN (blurRadius / 2 + (blurRadius % 2 ), GAUSSIANBLUR_OPTMIZIED_RADIUS_MAX);
132+ }
133+
123134-(void )buildFragmentFunctions
124135{
125136 self.fragmentFunctions = [[NSMutableArray alloc ] init ];
@@ -202,8 +213,9 @@ -(void)buildFragmentFunctions
202213
203214
204215 // Choose one?
216+ // TODO: try using min(src, dst) to create a gloomEffect
205217 NSString * addativeBlending = @" src + dst"
206- NSString * screenBlending = [ NSString stringWithFormat: @" (src + dst) - ((src * dst) * %f ) " , _intensity] ;
218+ NSString * screenBlending = @" (src + dst) - ((src * dst) * u_intensity) "
207219
208220 [shaderString appendFormat: @" \
209221 return %@ ;\n " , screenBlending];
@@ -300,6 +312,8 @@ -(void)buildRenderPasses
300312 pass.shaderUniforms [CCShaderUniformMainTexture] = previousPassTexture;
301313 pass.shaderUniforms [CCShaderUniformPreviousPassTexture] = previousPassTexture;
302314 pass.shaderUniforms [self .uniformTranslationTable[@" u_enableGlowMap" NSNumber numberWithFloat: 0 .0f ];
315+ pass.shaderUniforms [self .uniformTranslationTable[@" u_luminanceThreshold" NSNumber numberWithFloat: _luminanceThreshold];
316+ pass.shaderUniforms [self .uniformTranslationTable[@" u_intensity" NSNumber numberWithFloat: _transformedIntensity];
303317
304318 GLKVector2 dur = GLKVector2Make (1.0 / (previousPassTexture.pixelWidth / previousPassTexture.contentScale ), 0.0 );
305319 pass.shaderUniforms [self .uniformTranslationTable[@" u_blurDirection" NSValue valueWithGLKVector2: dur];
@@ -313,6 +327,8 @@ -(void)buildRenderPasses
313327
314328 pass.shaderUniforms [CCShaderUniformPreviousPassTexture] = previousPassTexture;
315329 pass.shaderUniforms [self .uniformTranslationTable[@" u_enableGlowMap" NSNumber numberWithFloat: 0 .0f ];
330+ pass.shaderUniforms [self .uniformTranslationTable[@" u_luminanceThreshold" NSNumber numberWithFloat: _luminanceThreshold];
331+ pass.shaderUniforms [self .uniformTranslationTable[@" u_intensity" NSNumber numberWithFloat: _transformedIntensity];
316332
317333 GLKVector2 dur = GLKVector2Make (0.0 , 1.0 / (previousPassTexture.pixelHeight / previousPassTexture.contentScale ));
318334 pass.shaderUniforms [self .uniformTranslationTable[@" u_blurDirection" NSValue valueWithGLKVector2: dur];
@@ -325,6 +341,9 @@ -(void)buildRenderPasses
325341 pass2.beginBlocks = @[[^(CCEffectRenderPass *pass, CCTexture *previousPassTexture){
326342 pass.shaderUniforms [CCShaderUniformPreviousPassTexture] = previousPassTexture;
327343 pass.shaderUniforms [self .uniformTranslationTable[@" u_enableGlowMap" NSNumber numberWithFloat: 1 .0f ];
344+ pass.shaderUniforms [self .uniformTranslationTable[@" u_luminanceThreshold" NSNumber numberWithFloat: _luminanceThreshold];
345+ pass.shaderUniforms [self .uniformTranslationTable[@" u_intensity" NSNumber numberWithFloat: _transformedIntensity];
346+
328347 } copy]];
329348
330349 self.renderPasses = @[pass0, pass1, pass2];
@@ -340,6 +359,10 @@ - (CCEffectPrepareStatus)prepareForRendering
340359 CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;
341360 if (_shaderDirty)
342361 {
362+ unsigned long count = (unsigned long )(1 + (_numberOfOptimizedOffsets * 2 ));
363+ CCEffectVarying* v_blurCoords = [CCEffectVarying varying: @" vec2" name: @" v_blurCoordinates" count: count];
364+ [self setVarying: @[v_blurCoords]];
365+
343366 [self buildFragmentFunctions ];
344367 [self buildVertexFunctions ];
345368 [self buildEffectShader ];
0 commit comments