Merge branch 'develop' into metal-hacking

Conflicts:
	cocos2d-ios.xcodeproj/project.pbxproj
	cocos2d-ui/CCBReader/CCBReader.m
	cocos2d/CCRenderTexture.m
	cocos2d/cocos2d.h

Author: slembcke

.gitmodules

@@ -1,11 +1,7 @@
 [submodule "external/Chipmunk"]
 	path = external/Chipmunk
 url=https://github.com/slembcke/Chipmunk2D.git
-[submodule "external/ogg"]
-	path = external/ogg
-url=https://github.com/spritebuilder/ogg.git
-	branch = apportable
-[submodule "external/tremor"]
-	path = external/tremor
-url=https://github.com/spritebuilder/tremor.git
+[submodule "external/ObjectAL"]
+	path = external/ObjectAL
+	url = https://github.com/spritebuilder/ObjectAL-for-Cocos2D.git
 	branch = apportable

VERSION

@@ -1 +1 @@
-3.3.0-alpha.1
+3.3.0-alpha.1

cocos2d-ios.xcodeproj/project.pbxproj

@@ -101,6 +101,7 @@
 		B7EE698518187BC900B983FE /* CCSprite9SliceTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE698418187BC900B983FE /* CCSprite9SliceTest.m */; };
 		B7EE69F01819EB0E00B983FE /* CCLayoutTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE69EF1819EB0E00B983FE /* CCLayoutTest.m */; };
 		B7EE6A30181B285700B983FE /* CCSliderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B7EE6A2F181B285700B983FE /* CCSliderTest.m */; };
+		D3758C1119C8EBDE00B4E13A /* Music in Resources */ = {isa = PBXBuildFile; fileRef = D3758C1019C8EBDE00B4E13A /* Music */; };
 		D389410E18639CC900725CFC /* CCPhysicsTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D389410D18639CC900725CFC /* CCPhysicsTest.m */; };
 		D3AD532618C85006005B6CF3 /* GLKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3AD532518C85006005B6CF3 /* GLKit.framework */; };
 		D3AD532E18C856AC005B6CF3 /* CCBMFontTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3AD532818C856AC005B6CF3 /* CCBMFontTest.m */; };
@@ -236,6 +237,7 @@
 		B7EE698418187BC900B983FE /* CCSprite9SliceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSprite9SliceTest.m; path = "cocos2d-ui-tests/tests/CCSprite9SliceTest.m"; sourceTree = SOURCE_ROOT; };
 		B7EE69EF1819EB0E00B983FE /* CCLayoutTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCLayoutTest.m; path = "cocos2d-ui-tests/tests/CCLayoutTest.m"; sourceTree = SOURCE_ROOT; };
 		B7EE6A2F181B285700B983FE /* CCSliderTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCSliderTest.m; path = "cocos2d-ui-tests/tests/CCSliderTest.m"; sourceTree = SOURCE_ROOT; };
+		D3758C1019C8EBDE00B4E13A /* Music */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Music; path = Resources/Music; sourceTree = SOURCE_ROOT; };
 		D389410D18639CC900725CFC /* CCPhysicsTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CCPhysicsTest.m; path = "cocos2d-ui-tests/tests/CCPhysicsTest.m"; sourceTree = SOURCE_ROOT; };
 		D389412F18639E4500725CFC /* libObjectiveChipmunk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libObjectiveChipmunk.a; path = DerivedData/cocos2d/Build/Products/Debug/libObjectiveChipmunk.a; sourceTree = "<group>"; };
 		D389413118639E5000725CFC /* libChipmunk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libChipmunk.a; path = external/Chipmunk/xcode/build/Debug/libChipmunk.a; sourceTree = "<group>"; };
@@ -336,6 +338,7 @@
 		75FCA70E185F89A0006E7468 /* Test Resources */ = {
 			isa = PBXGroup;
 			children = (
+				D3758C1019C8EBDE00B4E13A /* Music */,
 				75FCA70A185F89A0006E7468 /* Sounds */,
 				75FCA70B185F89A0006E7468 /* Particles */,
 				75FCA70C185F89A0006E7468 /* TileMaps */,
@@ -586,6 +589,7 @@
 				57E145A11975E3230065F142 /* larabie-16.plist in Resources */,
 				57E145821975E3230065F142 /* bitmapFontTest2.fnt in Resources */,
 				57E145931975E3230065F142 /* fps_images.plist in Resources */,
+				D3758C1119C8EBDE00B4E13A /* Music in Resources */,
 				57E145A31975E3230065F142 /* markerFelt-hd.fnt in Resources */,
 				57E145941975E3230065F142 /* fps_images.png in Resources */,
 				57E145801975E3230065F142 /* bitmapFontTest.fnt in Resources */,

cocos2d-osx.xcodeproj/project.pbxproj

@@ -12,6 +12,7 @@
 static NSString *TEST_STRINGS[] = {
 	@"ABCDEFGHIJKLM\nNOPQRSTUVWXYZ",
 	@"abcdefghijklm\nnopqrstuvwxyz",
+	@"first line\u2028second line",
 	@",.?!;:'\"",
 	@"()[]{}<>\\|/\n",
 	@"@#$%^&*+-=_",

cocos2d-tests-osx.xcodeproj/project.pbxproj

@@ -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:)];
 
@@ -200,6 +251,151 @@ - (void)enableOutline:(id)sender
 
 #endif
 
+-(void)setupPaddingEffectTest
+{
+    self.subTitle = @"Effect Padding Test";
+
+    {
+        CCSprite *sprite = [CCSprite spriteWithImageNamed:@"Images/particles.png"];
+        sprite.positionType = CCPositionTypeNormalized;
+        sprite.position = ccp(0.75f, 0.8f);
+        
+        [self.contentNode addChild:sprite];
+        
+        CCLabelTTF *title = [CCLabelTTF labelWithString:@"Original Sprite" fontName:@"HelveticaNeue-Light" fontSize:14 * [CCDirector sharedDirector].UIScaleFactor];
+        title.color = [CCColor whiteColor];
+        title.positionType = CCPositionTypeNormalized;
+        title.position = ccp(0.25f, 0.8f);
+        title.horizontalAlignment = CCTextAlignmentCenter;
+        
+        [self.contentNode addChild:title];
+    }
+    
+    {
+        CCSprite *sprite = [CCSprite spriteWithImageNamed:@"Images/particles.png"];
+        sprite.positionType = CCPositionTypeNormalized;
+        sprite.position = ccp(0.75f, 0.65f);
+        
+        CCEffectColorChannelOffset *offset = [CCEffectColorChannelOffset effectWithRedOffset:GLKVector2Make(5.0f, 0.0f) greenOffset:GLKVector2Make(-4.0f, 4.0f) blueOffset:GLKVector2Make(-4.0f, -4.0f)];
+        sprite.effect = offset;
+        
+        [self.contentNode addChild:sprite];
+        
+        CCLabelTTF *title = [CCLabelTTF labelWithString:@"Color channel offset without padding" fontName:@"HelveticaNeue-Light" fontSize:14 * [CCDirector sharedDirector].UIScaleFactor];
+        title.color = [CCColor whiteColor];
+        title.positionType = CCPositionTypeNormalized;
+        title.position = ccp(0.25f, 0.65f);
+        title.horizontalAlignment = CCTextAlignmentCenter;
+        
+        [self.contentNode addChild:title];
+    }
+    
+    {
+        CCSprite *sprite = [CCSprite spriteWithImageNamed:@"Images/particles.png"];
+        sprite.positionType = CCPositionTypeNormalized;
+        sprite.position = ccp(0.75f, 0.5f);
+        
+        CCEffectColorChannelOffset *offset = [CCEffectColorChannelOffset effectWithRedOffset:GLKVector2Make(5.0f, 0.0f) greenOffset:GLKVector2Make(-4.0f, 4.0f) blueOffset:GLKVector2Make(-4.0f, -4.0f)];
+        offset.padding = CGSizeMake(5.0f, 5.0f);
+        sprite.effect = offset;
+        
+        [self.contentNode addChild:sprite];
+        
+        CCLabelTTF *title = [CCLabelTTF labelWithString:@"Color channel offset with padding" fontName:@"HelveticaNeue-Light" fontSize:14 * [CCDirector sharedDirector].UIScaleFactor];
+        title.color = [CCColor whiteColor];
+        title.positionType = CCPositionTypeNormalized;
+        title.position = ccp(0.25f, 0.5f);
+        title.horizontalAlignment = CCTextAlignmentCenter;
+        
+        [self.contentNode addChild:title];
+    }
+
+    {
+        CCSprite *sprite = [CCSprite spriteWithImageNamed:@"Images/particles.png"];
+        sprite.positionType = CCPositionTypeNormalized;
+        sprite.position = ccp(0.75f, 0.35f);
+        
+        CCEffectColorChannelOffset *offset = [CCEffectColorChannelOffset effectWithRedOffset:GLKVector2Make(5.0f, 0.0f) greenOffset:GLKVector2Make(-4.0f, 4.0f) blueOffset:GLKVector2Make(-4.0f, -4.0f)];
+        offset.padding = CGSizeMake(5.0f, 5.0f);
+        CCEffectHue *hue = [CCEffectHue effectWithHue:60.0f];
+        sprite.effect = [CCEffectStack effectWithArray:@[offset, hue]];
+        
+        [self.contentNode addChild:sprite];
+        
+        CCLabelTTF *title = [CCLabelTTF labelWithString:@"Padded effect stack (offset then hue)" fontName:@"HelveticaNeue-Light" fontSize:14 * [CCDirector sharedDirector].UIScaleFactor];
+        title.color = [CCColor whiteColor];
+        title.positionType = CCPositionTypeNormalized;
+        title.position = ccp(0.25f, 0.35f);
+        title.horizontalAlignment = CCTextAlignmentCenter;
+        
+        [self.contentNode addChild:title];
+    }
+    
+    {
+        CCSprite *sprite = [CCSprite spriteWithImageNamed:@"Images/particles.png"];
+        sprite.positionType = CCPositionTypeNormalized;
+        sprite.position = ccp(0.75f, 0.2f);
+        
+        CCEffectColorChannelOffset *offset = [CCEffectColorChannelOffset effectWithRedOffset:GLKVector2Make(5.0f, 0.0f) greenOffset:GLKVector2Make(-4.0f, 4.0f) blueOffset:GLKVector2Make(-4.0f, -4.0f)];
+        offset.padding = CGSizeMake(5.0f, 5.0f);
+        CCEffectHue *hue = [CCEffectHue effectWithHue:60.0f];
+        sprite.effect = [CCEffectStack effectWithArray:@[hue, offset]];
+        
+        [self.contentNode addChild:sprite];
+        
+        CCLabelTTF *title = [CCLabelTTF labelWithString:@"Padded efect stack (hue then offset)" fontName:@"HelveticaNeue-Light" fontSize:14 * [CCDirector sharedDirector].UIScaleFactor];
+        title.color = [CCColor whiteColor];
+        title.positionType = CCPositionTypeNormalized;
+        title.position = ccp(0.25f, 0.2f);
+        title.horizontalAlignment = CCTextAlignmentCenter;
+        
+        [self.contentNode addChild:title];
+    }
+}
+
+-(void)setupColorChannelOffsetTest
+{
+    self.subTitle = @"Color Channel Offset Effect Test";
+    
+    CCEffectColorChannelOffset *effect = [CCEffectColorChannelOffset effectWithRedOffset:GLKVector2Make(0.0f, 0.0f) greenOffset:GLKVector2Make(0.0f, 0.0f) blueOffset:GLKVector2Make(0.0f, 0.0f)];
+    effect.padding = CGSizeMake(5.0f, 5.0f);
+    
+    CCSprite *sprite = [CCSprite spriteWithImageNamed:@"Images/particles.png"];
+    sprite.scale = 1.0f;
+    sprite.positionType = CCPositionTypeNormalized;
+    sprite.position = ccp(0.5f, 0.5f);
+    sprite.effect = effect;
+    
+    [self.contentNode addChild:sprite];
+    
+    const float thetaStep = CC_DEGREES_TO_RADIANS(10.0f);
+    __block float redTheta = CC_DEGREES_TO_RADIANS(0.0f);
+    __block float greenTheta = CC_DEGREES_TO_RADIANS(120.0f);
+    __block float blueTheta = CC_DEGREES_TO_RADIANS(240.0f);
+    void (^updateBlock)() = ^{
+        
+        float redRadius = 3.0f;
+        effect.redOffset = GLKVector2Make(redRadius * cosf(redTheta), redRadius * sinf(redTheta));
+        
+        float greenRadius = 3.0f;
+        effect.greenOffset = GLKVector2Make(greenRadius * cosf(greenTheta), greenRadius * sinf(greenTheta));
+        
+        float blueRadius = 3.0f;
+        effect.blueOffset = GLKVector2Make(blueRadius * cosf(blueTheta), blueRadius * sinf(blueTheta));
+        
+        redTheta += thetaStep;
+        greenTheta += thetaStep;
+        blueTheta += thetaStep;
+    };
+    updateBlock();
+    
+    [sprite runAction:[CCActionRepeatForever actionWithAction:[CCActionSequence actions:
+                                                               [CCActionDelay actionWithDuration:0.1f],
+                                                               [CCActionCallBlock actionWithBlock:updateBlock],
+                                                               nil
+                                                               ]]];
+}
+
 #pragma mark DropShadow
 
 -(void)setupDropShadowEffectTest
@@ -608,13 +804,14 @@ -(void)setupBloomEffectTest
     const int steps = 5;
     for (int i = 0; i < steps; i++)
     {
-        CCSprite *sampleSprite3 = [CCSprite spriteWithImageNamed:@"Images/grossini_dance_08.png"];
+        CCSprite *sampleSprite3 = [CCSprite spriteWithImageNamed:@"Images/f1.png"];
         sampleSprite3.anchorPoint = ccp(0.5, 0.5);
         sampleSprite3.position = ccp(0.1f + i * (0.8f / (steps - 1)), 0.2f);
         sampleSprite3.positionType = CCPositionTypeNormalized;
 
         // Blend glow maps test
-        CCEffectBloom* glowEffect3 = [CCEffectBloom effectWithBlurRadius:3 intensity:1.0f luminanceThreshold:1.0f - ((float)i/(float)(steps-1))];
+        CCEffectBloom* glowEffect3 = [CCEffectBloom effectWithBlurRadius:8 intensity:1.0f luminanceThreshold:1.0f - ((float)i/(float)(steps-1))];
+        glowEffect3.padding = CGSizeMake(10.0f, 10.0f);
         sampleSprite3.effect = glowEffect3;
 
         [self.contentNode addChild:sampleSprite3];

cocos2d-ui-tests/tests/CCBMFontTest.m

@@ -1340,7 +1340,7 @@ - (CCNode*) readNodeGraphParent:(CCNode*)parent
         // Class was not found. Maybe it's a Swift class?
         // See http://stackoverflow.com/questions/24030814/swift-language-nsclassfromstring
         NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleName"];
-        NSString *classStringName = [NSString stringWithFormat:@"_TtC%d%@%d%@", (int)appName.length, appName, (int)className.length, className];
+        NSString *classStringName = [NSString stringWithFormat:@"_TtC%lu%@%lu%@", (unsigned long)appName.length, appName, (unsigned long)className.length, className];
         class = NSClassFromString(classStringName);
     }
     if (!class)

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -25,6 +25,7 @@
  */
 
 #import <Foundation/Foundation.h>
+#import "CCGL.h"
 
 #define CC_MINIMUM_TABLET_SCREEN_DIAGONAL 6.0
 extern Class CCGraphicsBufferClass;

cocos2d-ui/CCBReader/CCBReader.m

@@ -29,4 +29,11 @@
 /** An identifier for debugging effects. */
 @property (nonatomic, copy) NSString *debugName;
 
+/** Padding in points that will be applied to affected sprites to avoid clipping the
+  * effect's visuals at the sprite's boundary. For example, if you create a blur effect
+  * whose radius will animate over time but will never exceed 8 points then you should
+  * set the padding to at least 8 to avoid clipping.
+  */
+@property (nonatomic, assign) CGSize padding;
+
 @end