Skip to content

Commit 69ff4a6

Browse files
author
Thayer J Andrews
committed
CCEffectBrightness / CCEffectContrast - Store conditioned inputs as NSNumber
And don't create NSNumbers on every draw.
1 parent d03e851 commit 69ff4a6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

cocos2d/CCEffectBrightness.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
@interface CCEffectBrightness ()
1818

19-
@property (nonatomic) float conditionedBrightness;
19+
@property (nonatomic) NSNumber *conditionedBrightness;
2020

2121
@end
2222

@@ -35,7 +35,7 @@ -(id)initWithBrightness:(float)brightness
3535
if((self = [super initWithFragmentUniforms:@[uniformBrightness] vertexUniforms:nil varying:nil]))
3636
{
3737
_brightness = brightness;
38-
_conditionedBrightness = conditionBrightness(brightness);
38+
_conditionedBrightness = [NSNumber numberWithFloat:conditionBrightness(brightness)];
3939

4040
self.debugName = @"CCEffectBrightness";
4141
}
@@ -72,7 +72,7 @@ -(void)buildRenderPasses
7272

7373
pass.shaderUniforms[CCShaderUniformMainTexture] = previousPassTexture;
7474
pass.shaderUniforms[CCShaderUniformPreviousPassTexture] = previousPassTexture;
75-
pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_brightness"]] = [NSNumber numberWithFloat:weakSelf.conditionedBrightness];
75+
pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_brightness"]] = weakSelf.conditionedBrightness;
7676
} copy]];
7777

7878
self.renderPasses = @[pass0];
@@ -81,7 +81,7 @@ -(void)buildRenderPasses
8181
-(void)setBrightness:(float)brightness
8282
{
8383
_brightness = brightness;
84-
_conditionedBrightness = conditionBrightness(brightness);
84+
_conditionedBrightness = [NSNumber numberWithFloat:conditionBrightness(brightness)];
8585
}
8686

8787
@end

cocos2d/CCEffectContrast.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@interface CCEffectContrast ()
1919

20-
@property (nonatomic) float conditionedContrast;
20+
@property (nonatomic) NSNumber *conditionedContrast;
2121

2222
@end
2323

@@ -36,7 +36,7 @@ -(id)initWithContrast:(float)contrast
3636
if((self = [super initWithFragmentUniforms:@[uniformContrast] vertexUniforms:nil varying:nil]))
3737
{
3838
_contrast = contrast;
39-
_conditionedContrast = conditionContrast(contrast);
39+
_conditionedContrast = [NSNumber numberWithFloat:conditionContrast(contrast)];
4040

4141
self.debugName = @"CCEffectContrast";
4242
}
@@ -73,7 +73,7 @@ -(void)buildRenderPasses
7373

7474
pass.shaderUniforms[CCShaderUniformMainTexture] = previousPassTexture;
7575
pass.shaderUniforms[CCShaderUniformPreviousPassTexture] = previousPassTexture;
76-
pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_contrast"]] = [NSNumber numberWithFloat:weakSelf.conditionedContrast];
76+
pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_contrast"]] = weakSelf.conditionedContrast;
7777
} copy]];
7878

7979
self.renderPasses = @[pass0];
@@ -82,7 +82,7 @@ -(void)buildRenderPasses
8282
-(void)setContrast:(float)contrast
8383
{
8484
_contrast = contrast;
85-
_conditionedContrast = conditionContrast(contrast);
85+
_conditionedContrast = [NSNumber numberWithFloat:conditionContrast(contrast)];
8686
}
8787

8888
@end

0 commit comments

Comments
 (0)