Merge remote-tracking branch 'upstream/effects' into develop

Author: osinoleg

Resources/Images/output.png

@@ -8,7 +8,12 @@
 #import "CCEffectStack_Private.h"
 
 @interface CCEffectsTest : TestBase @end
-@implementation CCEffectsTest
+@implementation CCEffectsTest {
+#if CC_EFFECTS_EXPERIMENTAL
+    CCEffectDistanceField* _distanceFieldEffect;
+#endif
+    CCEffectDFOutline* _outlineEffect;
+}
 
 -(id)init
 {
@@ -20,29 +25,179 @@ -(id)init
 	return self;
 }
 
--(void)setupOuterGlowEffectTest
+#pragma mark Distance Fields
+
+-(void)setupDFOutlineEffectTest
 {
-    self.subTitle = @"OuterGlow Effect Test";
+    self.subTitle = @"Distance Field Outline Test";
 
-//    CCNodeColor* environment = [CCNodeColor nodeWithColor:[CCColor whiteColor]];
     CCSprite *environment = [CCSprite spriteWithImageNamed:@"Images/MountainPanorama.jpg"];
     environment.positionType = CCPositionTypeNormalized;
     environment.anchorPoint = ccp(0.5, 0.5);
     environment.position = ccp(0.5f, 0.5f);
 
+    _outlineEffect = [CCEffectDFOutline effectWithOutlineColor:[CCColor redColor] fillColor:[CCColor blackColor] outlineWidth:3 fieldScale:32];
+    
+    CCSprite *sampleSprite = [CCSprite spriteWithImageNamed:@"Images/output.png"];
+    sampleSprite.position = ccp(0.5, 0.5);
+    sampleSprite.positionType = CCPositionTypeNormalized;
+    sampleSprite.effect = _outlineEffect;
+    sampleSprite.scale = 2.0f;
+    
+    CCSpriteFrame* background = [CCSpriteFrame frameWithImageNamed:@"Tests/slider-background.png"];
+    CCSpriteFrame* backgroundHilite = [CCSpriteFrame frameWithImageNamed:@"Tests/slider-background-hilite.png"];
+    CCSpriteFrame* handle = [CCSpriteFrame frameWithImageNamed:@"Tests/slider-handle.png"];
+    
+    CCSlider* slider = [[CCSlider alloc] initWithBackground:background andHandleImage:handle];
+    [slider setBackgroundSpriteFrame:backgroundHilite forState:CCControlStateHighlighted];
+    slider.positionType = CCPositionTypeNormalized;
+    slider.position = ccp(0.1f, 0.5f);
+    
+    slider.preferredSizeType = CCSizeTypeMake(CCSizeUnitNormalized, CCSizeUnitUIPoints);
+    slider.preferredSize = CGSizeMake(0.5f, 10);
+    slider.rotation = 90;
+    slider.anchorPoint = ccp(0.5f, 0.5f);
+    slider.scale = 0.8;
+    
+    [slider setTarget:self selector:@selector(outlineWidthChagne:)];
+    
     [self.contentNode addChild:environment];
+    [self.contentNode addChild:slider];
+    [self.contentNode addChild:sampleSprite];
 
-    CCColor *glowColor = [CCColor colorWithRed:0.0 green:0.0 blue:1.0 alpha:0.5];
-    CCEffectOuterGlow* effect = [CCEffectOuterGlow effectWithGlowColor:glowColor];
+    // 6 pixel block used for comparison;
+    CCNodeColor* block = [CCNodeColor nodeWithColor:[CCColor greenColor]];
+    block.contentSize = CGSizeMake(6.0, 6.0);
+    block.position = ccp(0.424, 0.324);
+    block.positionType = CCPositionTypeNormalized;
+    block.rotation = 32;
+//    [self.contentNode addChild:block];
+}
+
+- (void)outlineWidthChagne:(id)sender
+{
+    const int outlineWidthMax = 6;
+    CCSlider* slider = sender;
+    _outlineEffect.outlineWidth = slider.sliderValue * outlineWidthMax;
+}
+
+#if CC_EFFECTS_EXPERIMENTAL
+-(void)setupDistanceFieldEffectTest
+{
+    self.subTitle = @"Distance Field Effect Test";
 
-    CCSprite *sampleSprite = [CCSprite spriteWithImageNamed:@"Images/DistanceFieldX.png"];
+    //    CCNodeColor* environment = [CCNodeColor nodeWithColor:[CCColor whiteColor]];
+    CCSprite *environment = [CCSprite spriteWithImageNamed:@"Images/MountainPanorama.jpg"];
+    environment.positionType = CCPositionTypeNormalized;
+    environment.anchorPoint = ccp(0.5, 0.5);
+    environment.position = ccp(0.5f, 0.5f);
+
+    [self.contentNode addChild:environment];
+
+    CCColor *glowColor = [CCColor colorWithRed:0.0 green:0.0 blue:1.0 alpha:1.0];
+    _distanceFieldEffect = [CCEffectDistanceField effectWithGlowColor:glowColor outlineColor:[CCColor redColor]];
+
+    CCSprite *sampleSprite = [CCSprite spriteWithImageNamed:@"Images/output.png"];
     sampleSprite.position = ccp(0.5, 0.5);
     sampleSprite.positionType = CCPositionTypeNormalized;
-    sampleSprite.effect = effect;
-    
+    sampleSprite.effect = _distanceFieldEffect;
+    sampleSprite.scale = 2.0f;
+    
+    CCSpriteFrame* background = [CCSpriteFrame frameWithImageNamed:@"Tests/slider-background.png"];
+    CCSpriteFrame* backgroundHilite = [CCSpriteFrame frameWithImageNamed:@"Tests/slider-background-hilite.png"];
+    CCSpriteFrame* handle = [CCSpriteFrame frameWithImageNamed:@"Tests/slider-handle.png"];
+    
+    CCSlider* slider = [[CCSlider alloc] initWithBackground:background andHandleImage:handle];
+    [slider setBackgroundSpriteFrame:backgroundHilite forState:CCControlStateHighlighted];
+    slider.positionType = CCPositionTypeNormalized;
+    slider.position = ccp(0.1f, 0.5f);
+    
+    slider.preferredSizeType = CCSizeTypeMake(CCSizeUnitNormalized, CCSizeUnitUIPoints);
+    slider.preferredSize = CGSizeMake(0.5f, 10);
+    slider.rotation = 90;
+    slider.anchorPoint = ccp(0.5f, 0.5f);
+    slider.scale = 0.8;
+    
+    [slider setTarget:self selector:@selector(outlineInnerWidthChange:)];
+    
+    CCSlider* slider2 = [[CCSlider alloc] initWithBackground:background andHandleImage:handle];
+    [slider2 setBackgroundSpriteFrame:backgroundHilite forState:CCControlStateHighlighted];
+    slider2.positionType = CCPositionTypeNormalized;
+    slider2.position = ccp(0.15f, 0.5f);
+    
+    slider2.preferredSizeType = CCSizeTypeMake(CCSizeUnitNormalized, CCSizeUnitUIPoints);
+    slider2.preferredSize = CGSizeMake(0.5f, 10);
+    slider2.rotation = 90;
+    slider2.anchorPoint = ccp(0.5f, 0.5f);
+    slider2.scale = 0.8;
+    
+    [slider2 setTarget:self selector:@selector(outlineOuterWidthChange:)];
+    
+    CCSlider* slider3 = [[CCSlider alloc] initWithBackground:background andHandleImage:handle];
+    [slider3 setBackgroundSpriteFrame:backgroundHilite forState:CCControlStateHighlighted];
+    slider3.positionType = CCPositionTypeNormalized;
+    slider3.position = ccp(0.20f, 0.5f);
+    
+    slider3.preferredSizeType = CCSizeTypeMake(CCSizeUnitNormalized, CCSizeUnitUIPoints);
+    slider3.preferredSize = CGSizeMake(0.5f, 10);
+    slider3.rotation = 90;
+    slider3.anchorPoint = ccp(0.5f, 0.5f);
+    slider3.scale = 0.8;
+    
+    [slider3 setTarget:self selector:@selector(glowWidthChange:)];
+    
+    CCButton* enableGlow = [CCButton buttonWithTitle:@"Outer Glow"];
+    enableGlow.positionType = CCPositionTypeNormalized;
+    enableGlow.anchorPoint = ccp(0.5f, 0.5f);
+    enableGlow.position = ccp(0.9, 0.8);
+    [enableGlow setTarget:self selector:@selector(enableGlow:)];
+    
+    CCButton* enableOutline = [CCButton buttonWithTitle:@"Outline"];
+    enableOutline.positionType = CCPositionTypeNormalized;
+    enableOutline.anchorPoint = ccp(0.5f, 0.5f);
+    enableOutline.position = ccp(0.9, 0.7);
+    [enableOutline setTarget:self selector:@selector(enableOutline:)];
+
+    [self.contentNode addChild:enableOutline];
+    [self.contentNode addChild:enableGlow];
     [self.contentNode addChild:sampleSprite];
+    [self.contentNode addChild:slider];
+    [self.contentNode addChild:slider2];
+    [self.contentNode addChild:slider3];
+}
+
+- (void)outlineInnerWidthChange:(id)sender
+{
+    CCSlider* slider = sender;
+    _distanceFieldEffect.outlineInnerWidth = slider.sliderValue;
+}
+
+- (void)outlineOuterWidthChange:(id)sender
+{
+    CCSlider* slider = sender;
+    _distanceFieldEffect.outlineOuterWidth = slider.sliderValue;
+}
+
+- (void)glowWidthChange:(id)sender
+{
+    CCSlider* slider = sender;
+    _distanceFieldEffect.glowWidth = slider.sliderValue;
 }
 
+- (void)enableGlow:(id)sender
+{
+    _distanceFieldEffect.glow = !_distanceFieldEffect.glow;
+}
+
+- (void)enableOutline:(id)sender
+{
+    _distanceFieldEffect.outline = !_distanceFieldEffect.outline;
+}
+
+#endif
+
+#pragma mark DropShadow
+
 -(void)setupDropShadowEffectTest
 {
     self.subTitle = @"DropShadow Effect Test";
@@ -54,7 +209,7 @@ -(void)setupDropShadowEffectTest
     [self.contentNode addChild:environment];
 
     CCColor *shadowColor = [CCColor colorWithRed:0.0 green:1.0 blue:0.0 alpha:0.5];
-    CCEffectDropShadow* effect = [CCEffectDropShadow effectWithShadowOffset:GLKVector2Make(2.0, -2.0) shadowColor:shadowColor];
+    CCEffectDropShadow* effect = [CCEffectDropShadow effectWithShadowOffset:GLKVector2Make(2.0, -2.0) shadowColor:shadowColor blurRadius:5];
 
     CCSprite *sampleSprite = [CCSprite spriteWithImageNamed:@"Images/Ohm.png"];
     sampleSprite.position = ccp(0.5, 0.5);
@@ -71,6 +226,8 @@ -(void)setupDropShadowEffectTest
     [self.contentNode addChild:effectNode];
 }
 
+#pragma mark Glass
+
 -(void)setupGlassEffectTest
 {
     self.subTitle = @"Glass Effect Test";
@@ -453,7 +610,7 @@ -(void)setupBloomEffectTest
         sampleSprite3.positionType = CCPositionTypeNormalized;
 
         // Blend glow maps test
-        CCEffectBloom* glowEffect3 = [CCEffectBloom effectWithBlurRadius:8 intensity:1.0f luminanceThreshold:1.0f - ((float)i/(float)(steps-1))];
+        CCEffectBloom* glowEffect3 = [CCEffectBloom effectWithBlurRadius:3 intensity:1.0f luminanceThreshold:1.0f - ((float)i/(float)(steps-1))];
         sampleSprite3.effect = glowEffect3;
 
         [self.contentNode addChild:sampleSprite3];
@@ -1338,7 +1495,6 @@ - (CCSprite *)spriteWithEffects:(NSArray *)effects image:(NSString *)spriteImage
     return sprite;
 }
 
-
 -(void)renderTextureHelper:(CCNode *)stage size:(CGSize)size
 {
 	CCColor *color = [CCColor colorWithRed:0.0 green:0.0 blue:0.5 alpha:0.5];
@@ -1364,5 +1520,5 @@ -(void)renderTextureHelper:(CCNode *)stage size:(CGSize)size
                                                                ]]];
 	[node addChild:sprite];
 }
-@end
 
+@end

cocos2d-ios.xcodeproj/project.pbxproj

@@ -48,6 +48,7 @@
 @implementation CCEffectBloom {
     NSUInteger _numberOfOptimizedOffsets;
     GLfloat _sigma;
+    NSUInteger _trueBlurRadius;
     BOOL _shaderDirty;
     float _transformedIntensity;
 }
@@ -73,13 +74,13 @@ -(id)initWithPixelBlurRadius:(NSUInteger)blurRadius intensity:(float)intensity l
     CCEffectUniform* u_intensity = [CCEffectUniform uniform:@"float" name:@"u_intensity" value:[NSNumber numberWithFloat:_transformedIntensity]];
     CCEffectUniform* u_luminanceThreshold = [CCEffectUniform uniform:@"float" name:@"u_luminanceThreshold" value:[NSNumber numberWithFloat:_luminanceThreshold]];
     CCEffectUniform* u_enableGlowMap = [CCEffectUniform uniform:@"float" name:@"u_enableGlowMap" value:[NSNumber numberWithFloat:0.0f]];
-    CCEffectUniform* u_blurDirection = [CCEffectUniform uniform:@"vec2" name:@"u_blurDirection"
+    CCEffectUniform* u_blurDirection = [CCEffectUniform uniform:@"highp vec2" name:@"u_blurDirection"
                                                           value:[NSValue valueWithGLKVector2:GLKVector2Make(0.0f, 0.0f)]];
 
     unsigned long count = (unsigned long)(1 + (_numberOfOptimizedOffsets * 2));
     CCEffectVarying* v_blurCoords = [CCEffectVarying varying:@"vec2" name:@"v_blurCoordinates" count:count];
 
-    if(self = [super initWithFragmentUniforms:@[u_enableGlowMap, u_luminanceThreshold, u_intensity]
+    if(self = [super initWithFragmentUniforms:@[u_enableGlowMap, u_luminanceThreshold, u_intensity, u_blurDirection]
                                vertexUniforms:@[u_blurDirection]
                                      varyings:@[v_blurCoords]])
     {
@@ -121,9 +122,10 @@ -(void)setBlurRadius:(NSUInteger)blurRadius
 
 - (void)setBlurRadiusAndDependents:(NSUInteger)blurRadius
 {
+    _trueBlurRadius = blurRadius;
     blurRadius = MIN(blurRadius, BLUR_OPTIMIZED_RADIUS_MAX);
     _blurRadius = blurRadius;
-    _sigma = blurRadius / 2;
+    _sigma = _trueBlurRadius / 2;
     if(_sigma == 0.0)
         _sigma = 1.0f;
 
@@ -134,9 +136,9 @@ -(void)buildFragmentFunctions
 {
     self.fragmentFunctions = [[NSMutableArray alloc] init];
 
-    GLfloat *standardGaussianWeights = calloc(_blurRadius + 1, sizeof(GLfloat));
+    GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 1, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
-    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)
     {
         standardGaussianWeights[currentGaussianWeightIndex] = (1.0 / sqrt(2.0 * M_PI * pow(_sigma, 2.0))) * exp(-pow(currentGaussianWeightIndex, 2.0) / (2.0 * pow(_sigma, 2.0)));
 
@@ -151,14 +153,14 @@ -(void)buildFragmentFunctions
     }
 
     // Next, normalize these weights to prevent the clipping of the Gaussian curve at the end of the discrete samples from reducing luminance
-    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)
     {
         standardGaussianWeights[currentGaussianWeightIndex] = standardGaussianWeights[currentGaussianWeightIndex] / sumOfWeights;
     }
 
     // From these weights we calculate the offsets to read interpolated values from
     NSUInteger numberOfOptimizedOffsets = MIN(_blurRadius / 2 + (_blurRadius % 2), BLUR_OPTIMIZED_RADIUS_MAX);
-    NSUInteger trueNumberOfOptimizedOffsets = _blurRadius / 2 + (_blurRadius % 2);
+    NSUInteger trueNumberOfOptimizedOffsets = _trueBlurRadius / 2 + (_trueBlurRadius % 2);
 
     NSMutableString *shaderString = [[NSMutableString alloc] init];
 
@@ -244,9 +246,9 @@ -(void)buildVertexFunctions
 {
     self.vertexFunctions = [[NSMutableArray alloc] init];
 
-    GLfloat* standardGaussianWeights = calloc(_blurRadius + 1, sizeof(GLfloat));
+    GLfloat* standardGaussianWeights = calloc(_trueBlurRadius + 1, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
-    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)
     {
         standardGaussianWeights[currentGaussianWeightIndex] = (1.0 / sqrt(2.0 * M_PI * pow(_sigma, 2.0))) * exp(-pow(currentGaussianWeightIndex, 2.0) / (2.0 * pow(_sigma, 2.0)));
 
@@ -261,7 +263,7 @@ -(void)buildVertexFunctions
     }
 
     // Next, normalize these weights to prevent the clipping of the Gaussian curve at the end of the discrete samples from reducing luminance
-    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _blurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)
     {
         standardGaussianWeights[currentGaussianWeightIndex] = standardGaussianWeights[currentGaussianWeightIndex] / sumOfWeights;
     }