Merge commit '516ef6d' into develop

Conflicts:
	.gitmodules
	external/ObjectAL

Author: slembcke

cocos2d-ios.xcodeproj/project.pbxproj

@@ -282,6 +282,10 @@
 		D28A2E1D1954F7E000ADC03D /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D28A2E1C1954F7E000ADC03D /* OpenGLES.framework */; };
 		D28A2E211954F85700ADC03D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D28A2E201954F85700ADC03D /* AVFoundation.framework */; };
 		D291DCC2195B2FA100278EC0 /* libObjectiveChipmunk-iPhone.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B759E52D1880C66900E8166C /* libObjectiveChipmunk-iPhone.a */; };
+		D299CE7A19C2910B00519CBB /* CCEffectDFInnerGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = D299CE7819C2910B00519CBB /* CCEffectDFInnerGlow.h */; };
+		D299CE7B19C2910B00519CBB /* CCEffectDFInnerGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = D299CE7819C2910B00519CBB /* CCEffectDFInnerGlow.h */; };
+		D299CE7C19C2910B00519CBB /* CCEffectDFInnerGlow.m in Sources */ = {isa = PBXBuildFile; fileRef = D299CE7919C2910B00519CBB /* CCEffectDFInnerGlow.m */; };
+		D299CE7D19C2910B00519CBB /* CCEffectDFInnerGlow.m in Sources */ = {isa = PBXBuildFile; fileRef = D299CE7919C2910B00519CBB /* CCEffectDFInnerGlow.m */; };
 		D2DDB09319805E8400233D80 /* CCMathUtilsAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = D2DDB08819805E8400233D80 /* CCMathUtilsAndroid.h */; };
 		D2DDB09419805E8400233D80 /* CCMathUtilsAndroid.h in Headers */ = {isa = PBXBuildFile; fileRef = D2DDB08819805E8400233D80 /* CCMathUtilsAndroid.h */; };
 		D2DDB09519805E8400233D80 /* CCMatrix3.h in Headers */ = {isa = PBXBuildFile; fileRef = D2DDB08919805E8400233D80 /* CCMatrix3.h */; };
@@ -915,6 +919,8 @@
 		D28A2E1A1954F68D00ADC03D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		D28A2E1C1954F7E000ADC03D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		D28A2E201954F85700ADC03D /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		D299CE7819C2910B00519CBB /* CCEffectDFInnerGlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectDFInnerGlow.h; sourceTree = "<group>"; };
+		D299CE7919C2910B00519CBB /* CCEffectDFInnerGlow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCEffectDFInnerGlow.m; sourceTree = "<group>"; };
 		D2B840C31909F447008063EA /* CCRenderTexture_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCRenderTexture_Private.h; sourceTree = "<group>"; };
 		D2DDB08819805E8400233D80 /* CCMathUtilsAndroid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMathUtilsAndroid.h; path = Platforms/Android/CCMathUtilsAndroid.h; sourceTree = "<group>"; };
 		D2DDB08919805E8400233D80 /* CCMatrix3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCMatrix3.h; path = Platforms/Android/CCMatrix3.h; sourceTree = "<group>"; };
@@ -1584,6 +1590,8 @@
 				D27451B619AE5517006DA0A1 /* CCEffectDistanceField.m */,
 				D27451C419B111A9006DA0A1 /* CCEffectDFOutline.h */,
 				D27451C519B111A9006DA0A1 /* CCEffectDFOutline.m */,
+				D299CE7819C2910B00519CBB /* CCEffectDFInnerGlow.h */,
+				D299CE7919C2910B00519CBB /* CCEffectDFInnerGlow.m */,
 			);
 			name = DistanceField;
 			sourceTree = "<group>";
@@ -1742,6 +1750,7 @@
 				50F7B2780F28DE7C00057537 /* CCActionEase.h in Headers */,
 				571CD02819649E03003D460C /* CCPlatformTextField.h in Headers */,
 				B798D1451820305400E7BFCD /* CCSprite_Private.h in Headers */,
+				D299CE7A19C2910B00519CBB /* CCEffectDFInnerGlow.h in Headers */,
 				50BAF3990F33CCD8003F654C /* ccMacros.h in Headers */,
 				B798D13D181F2E4500E7BFCD /* CCNode_Private.h in Headers */,
 				509A79970F6188420032F449 /* CCSprite.h in Headers */,
@@ -1982,6 +1991,7 @@
 				D2FEB693194F6C9E00FC0574 /* CCProgressNode.h in Headers */,
 				D2DDB09419805E8400233D80 /* CCMathUtilsAndroid.h in Headers */,
 				D2FEB694194F6C9E00FC0574 /* CCLayout.h in Headers */,
+				D299CE7B19C2910B00519CBB /* CCEffectDFInnerGlow.h in Headers */,
 				D2FEB695194F6C9E00FC0574 /* NSThread+performBlock.h in Headers */,
 				D2FEB696194F6C9E00FC0574 /* CCTiledMapLayer_Private.h in Headers */,
 				D2FEB69A194F6C9E00FC0574 /* CCTransition.h in Headers */,
@@ -2177,6 +2187,7 @@
 			files = (
 				5018F26A0DFDEAFF00C013A5 /* CCAction.m in Sources */,
 				D3903B0B1995285B003AA81A /* CCEffectBlur.m in Sources */,
+				D299CE7C19C2910B00519CBB /* CCEffectDFInnerGlow.m in Sources */,
 				5018F26C0DFDEAFF00C013A5 /* CCNode.m in Sources */,
 				5018F26E0DFDEAFF00C013A5 /* CCDirector.m in Sources */,
 				5018F2700DFDEAFF00C013A5 /* CCActionInstant.m in Sources */,
@@ -2317,6 +2328,7 @@
 			files = (
 				57202D391970776100238D56 /* CCPlatformTextFieldAndroid.m in Sources */,
 				D2FEB6B9194F6C9E00FC0574 /* CCAction.m in Sources */,
+				D299CE7D19C2910B00519CBB /* CCEffectDFInnerGlow.m in Sources */,
 				D2FEB6BA194F6C9E00FC0574 /* CCNode.m in Sources */,
 				D2FEB6BB194F6C9E00FC0574 /* CCDirector.m in Sources */,
 				D2FEB6BC194F6C9E00FC0574 /* CCActionInstant.m in Sources */,

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -12,6 +12,7 @@ @implementation CCEffectsTest {
 #if CC_EFFECTS_EXPERIMENTAL
     CCEffectDistanceField* _distanceFieldEffect;
     CCEffectDFOutline* _outlineEffect;
+    CCEffectDFInnerGlow* _innerGlowEffect;
 #endif
 }
 
@@ -29,6 +30,56 @@ -(id)init
 
 #if CC_EFFECTS_EXPERIMENTAL
 
+-(void)setupDFInnerGlowTest
+{
+    self.subTitle = @"Distance Field Inner Glow Test";
+    
+    CCSprite *environment = [CCSprite spriteWithImageNamed:@"Images/MountainPanorama.jpg"];
+    environment.positionType = CCPositionTypeNormalized;
+    environment.anchorPoint = ccp(0.5, 0.5);
+    environment.position = ccp(0.5f, 0.5f);
+    
+    CCTexture* texture = [[CCTextureCache sharedTextureCache] addImage:@"Images/output.png"];
+    
+    CCColor* fillColor = [CCColor colorWithRed:0.0 green:1.0 blue:0.0 alpha:0.5];
+    _innerGlowEffect = [CCEffectDFInnerGlow effectWithGlowColor:[CCColor redColor] fillColor:fillColor glowWidth:2 fieldScale:32 distanceField:texture];
+    
+    CCSprite *dfSprite = [CCSprite spriteWithImageNamed:@"Images/df_sprite.png"];
+    dfSprite.position = ccp(0.5, 0.5);
+    dfSprite.positionType = CCPositionTypeNormalized;
+    dfSprite.effect = _innerGlowEffect;
+    dfSprite.scale = 1.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.sliderValue = 0.3;
+    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(innerGlowWidthChanged:)];
+    
+    [self.contentNode addChild:environment];
+    [self.contentNode addChild:slider];
+    [self.contentNode addChild:dfSprite];
+}
+
+- (void)innerGlowWidthChanged:(id)sender
+{
+    const int innerGloWMax = 6;
+    CCSlider* slider = sender;
+    _innerGlowEffect.glowWidth = slider.sliderValue * innerGloWMax;
+}
+
+
 -(void)setupDFOutlineEffectTest
 {
     self.subTitle = @"Distance Field Outline Test";
@@ -40,8 +91,8 @@ -(void)setupDFOutlineEffectTest
 
     CCTexture* texture = [[CCTextureCache sharedTextureCache] addImage:@"Images/output.png"];
 
-    CCColor* fillColor = [CCColor colorWithRed:0.0 green:0.0 blue:0.0 alpha:0.0];
-    _outlineEffect = [CCEffectDFOutline effectWithOutlineColor:[CCColor redColor] fillColor:fillColor outlineWidth:3 fieldScale:32 distanceField:texture];
+    CCColor* fillColor = [CCColor colorWithRed:0.0 green:0.0 blue:1.0 alpha:0.0];
+    _outlineEffect = [CCEffectDFOutline effectWithOutlineColor:[CCColor redColor] fillColor:fillColor outlineWidth:1 fieldScale:32 distanceField:texture];
 
     CCSprite *dfSprite = [CCSprite spriteWithImageNamed:@"Images/df_sprite.png"];
     dfSprite.position = ccp(0.5, 0.5);
@@ -57,12 +108,12 @@ -(void)setupDFOutlineEffectTest
     [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.sliderValue = 0.1;
 
     [slider setTarget:self selector:@selector(outlineWidthChagne:)];
 

cocos2d/CCEffectDFInnerGlow.h

@@ -0,0 +1,84 @@
+//
+//  CCEffectDFInnerGlow.h
+//  cocos2d-ios
+//
+//  Created by Oleg Osin on 9/11/14.
+//
+//
+
+#import "CCEffect.h"
+
+/**
+ * CCEffectDFInnerGlow create an inner glow on any sprite (combined with a distance field).
+ *
+ */
+#if CC_EFFECTS_EXPERIMENTAL
+
+@interface CCEffectDFInnerGlow : CCEffect
+
+/// -----------------------------------------------------------------------
+/// @name Accessing Effect Attributes
+/// -----------------------------------------------------------------------
+
+/** Color of the sprite (pass a fillColor with with alpha value of 0.0 to see the actual sprite) */
+@property (nonatomic, strong) CCColor* fillColor;
+
+/** Color of glow */
+@property (nonatomic, strong) CCColor* glowColor;
+
+/** Outline width pixel width of the glow */
+@property (nonatomic) int glowWidth;
+
+// Distance Field, generated by SDFGen (https://github.com/osinoleg/SDFGen)
+@property (nonatomic, strong) CCTexture* distanceField;
+
+/// -----------------------------------------------------------------------
+/// @name Initializing a CCEffectDFInnerGlow object
+/// -----------------------------------------------------------------------
+
+/**
+ *  Initializes a CCEffectDFInnerGlow.
+ *
+ *  @return The CCEffectDFInnerGlow object.
+ */
+-(id)init;
+
+/**
+ *  Initializes a CCEffectDFInnerGlow object with the supplied parameters.
+ *
+ *  @param glowColor Color of the glow, a [CCColor blackColor] will result in an opaque black glow.
+ *  @param fillColor Color of the fillColor, a [CCColor blackColor] will result in an opaque black fillColor.
+ *  @param glowWidth pixel width of the glow.
+ *  @param fieldScale, defined by the distance field generation proccess, for example a distance field that
+ *  was generated with a 4096/4096 input and output a 128/128 texture would have a fieldScale of 32 (
+ *  input size / output size). Note: this parameter could be automatically calculated if we assume that all
+ *  distance fields are generated from a 4096 input.
+ *
+ *  @return The CCEffectDFInnerGlow object.
+ */
+-(id)initWithGlowColor:(CCColor*)glowColor fillColor:(CCColor*)fillColor glowWidth:(int)glowWidth fieldScale:(float)fieldScale distanceField:(CCTexture*)distanceField;
+
+
+/// -----------------------------------------------------------------------
+/// @name Creating a CCEffectDFInnerGlow object
+/// -----------------------------------------------------------------------
+
+/**
+ *  Initializes a CCEffectDFInnerGlow object with the supplied parameters.
+ *
+ *  @param glowColor Color of the glow, a [CCColor blackColor] will result in an opaque black glow.
+ *  @param fillColor Color of the fillColor, a [CCColor blackColor] will result in an opaque black fillColor.
+ *  @param glowWidth pixel width of the glow.
+ *  @param fieldScale, defined by the distance field generation proccess, for example a distance field that
+ *  was generated with a 4096/4096 input and output a 128/128 texture would have a fieldScale of 32 (
+ *  input size / output size). Note: this parameter could be automatically calculated if we assume that all
+ *  distance fields are generated from a 4096 input.
+ *
+ *  @return The CCEffectDFInnerGlow object.
+ */
++(id)effectWithGlowColor:(CCColor*)glowColor fillColor:(CCColor*)fillColor glowWidth:(int)glowWidth fieldScale:(float)fieldScale distanceField:(CCTexture*)distanceField;
+
+@end
+
+#endif
+