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

Thayer J Andrews · Thayer J Andrews · commit d399c227d7ea · 2014-09-26T11:15:21.000-07:00
diff --git a/cocos2d-ios.xcodeproj/project.pbxproj b/cocos2d-ios.xcodeproj/project.pbxproj
@@ -2587,7 +2587,7 @@
 				MACOSX_DEPLOYMENT_TARGET = "$(inherited)";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = sbpbeta;
+				SDKROOT = sbandroid;
 			};
 			name = Debug;
 		};
@@ -2611,7 +2611,7 @@
 				MACOSX_DEPLOYMENT_TARGET = "$(inherited)";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = sbpbeta;
+				SDKROOT = sbandroid;
 			};
 			name = Release;
 		};
@@ -2783,7 +2783,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = cocos2dAndroid;
-				SDKROOT = sbpbeta;
+				SDKROOT = sbandroid;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -2828,7 +2828,7 @@
 				);
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = cocos2dAndroid;
-				SDKROOT = sbpbeta;
+				SDKROOT = sbandroid;
 				SKIP_INSTALL = YES;
 				ZERO_LINK = NO;
 			};
diff --git a/cocos2d-ui-tests/tests/CCEffectsTest.m b/cocos2d-ui-tests/tests/CCEffectsTest.m
@@ -693,7 +693,7 @@ -(void)setupBlurEffectNodeTest
     effectNode.positionType = CCPositionTypeNormalized;
     effectNode.position = ccp(0.1, 0.5);
     [effectNode addChild:sampleSprite];
-    CCEffectBlur* effect = [CCEffectBlur effectWithBlurRadius:1.0];
+    CCEffectBlur* effect = [CCEffectBlur effectWithBlurRadius:4.0];
     effectNode.effect = effect;
     
     [self.contentNode addChild:effectNode];
@@ -707,12 +707,11 @@ -(void)setupBlurEffectNodeTest
     effectNode2.positionType = CCPositionTypeNormalized;
     effectNode2.position = ccp(0.21, 0.5);
     [effectNode2 addChild:sampleSprite2];
-    CCEffectBlur* effect2 = [CCEffectBlur effectWithBlurRadius:7.0];
+    CCEffectBlur* effect2 = [CCEffectBlur effectWithBlurRadius:10.0];
     effectNode2.effect = effect2;
     
     [self.contentNode addChild:effectNode2];
     
-    // Tilt shift
     CCSprite *sampleSprite3 = [CCSprite spriteWithImageNamed:@"Images/sample_hollow_circle.png"];
     sampleSprite3.position = ccp(0.5, 0.5);
     sampleSprite3.positionType = CCPositionTypeNormalized;
@@ -728,7 +727,6 @@ -(void)setupBlurEffectNodeTest
     
     [self.contentNode addChild:effectNode3];
     
-    // Tilt shift reversed
     CCSprite *sampleSprite4 = [CCSprite spriteWithImageNamed:@"Images/sample_hollow_circle.png"];
     sampleSprite4.position = ccp(0.5, 0.5);
     sampleSprite4.positionType = CCPositionTypeNormalized;
@@ -737,7 +735,7 @@ -(void)setupBlurEffectNodeTest
     effectNode4.positionType = CCPositionTypeNormalized;
     effectNode4.position = ccp(0.6, 0.5);
     [effectNode4 addChild:sampleSprite4];
-    CCEffectBlur* effect4 = [CCEffectBlur effectWithBlurRadius:7.0];
+    CCEffectBlur* effect4 = [CCEffectBlur effectWithBlurRadius:12.0];
     effectNode4.effect = effect4;
         
     [self.contentNode addChild:effectNode4];
diff --git a/cocos2d-ui/CCBReader/CCBReader.m b/cocos2d-ui/CCBReader/CCBReader.m
@@ -1182,6 +1182,9 @@ -(void)readJoint
         [self readPropertyForNode:(CCNode*)properties parent:nil isExtraProp:NO];
     }
     
+    // TODO: This is a hack because things are happening in the wrong order, needs refactoring!
+    [self postDeserialization];
+    
     CCNode * nodeBodyA = properties[@"bodyA"];
     CCNode * nodeBodyB = properties[@"bodyB"];
     
diff --git a/cocos2d/CCEffectBloom.m b/cocos2d/CCEffectBloom.m
@@ -136,9 +136,9 @@ -(void)buildFragmentFunctions
 {
     self.fragmentFunctions = [[NSMutableArray alloc] init];
 
-    GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 1, sizeof(GLfloat));
+    GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 2, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
-    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; 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)));
         
@@ -153,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 < _trueBlurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; 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 = _trueBlurRadius / 2 + (_trueBlurRadius % 2);
+    NSUInteger numberOfOptimizedOffsets = _numberOfOptimizedOffsets;
+    NSUInteger trueNumberOfOptimizedOffsets = _trueBlurRadius / 2;
     
     NSMutableString *shaderString = [[NSMutableString alloc] init];
     
@@ -183,7 +183,7 @@ -(void)buildFragmentFunctions
     [shaderString appendString:@"inBounds = step(0.0, min(compare.x, compare.y));"];
     [shaderString appendFormat:@"srcPixel = texture2D(cc_PreviousPassTexture, v_blurCoordinates[0]);\n"];
     [shaderString appendString:@"luminanceCheck = step(u_luminanceThreshold, dot(srcPixel.rgb, luminanceWeighting));\n"];
-    [shaderString appendFormat:@"src += inBounds * luminanceCheck * srcPixel * %f;\n", standardGaussianWeights[0]];
+    [shaderString appendFormat:@"src += inBounds * luminanceCheck * srcPixel * %f;\n", (_trueBlurRadius == 0) ? 1.0 : standardGaussianWeights[0]];
     
     for (NSUInteger currentBlurCoordinateIndex = 0; currentBlurCoordinateIndex < numberOfOptimizedOffsets; currentBlurCoordinateIndex++)
     {
diff --git a/cocos2d/CCEffectBlur.h b/cocos2d/CCEffectBlur.h
@@ -20,7 +20,7 @@
 /// @name Accessing Effect Attributes
 /// -----------------------------------------------------------------------
 
-/** The size of the blur. This value is in the range [0..6].
+/** The size of the blur. This value is in the range [0..n].
  */
 @property (nonatomic, assign) NSUInteger blurRadius;
 
diff --git a/cocos2d/CCEffectBlur.m b/cocos2d/CCEffectBlur.m
@@ -118,9 +118,9 @@ -(void)buildFragmentFunctions
 {
     self.fragmentFunctions = [[NSMutableArray alloc] init];
 
-    GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 1, sizeof(GLfloat));
+    GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 2, sizeof(GLfloat));
     GLfloat sumOfWeights = 0.0;
-    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; 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)));
         
@@ -135,14 +135,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 < _trueBlurRadius + 1; currentGaussianWeightIndex++)
+    for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; 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 = _trueBlurRadius / 2 + (_trueBlurRadius % 2);
+    NSUInteger numberOfOptimizedOffsets = _numberOfOptimizedOffsets;
+    NSUInteger trueNumberOfOptimizedOffsets = _trueBlurRadius / 2;
     
     NSMutableString *shaderString = [[NSMutableString alloc] init];
     
@@ -157,7 +157,7 @@ -(void)buildFragmentFunctions
     // Inner texture loop
     [shaderString appendString:@"compare = cc_FragTexCoord1Extents - abs(v_blurCoordinates[0] - cc_FragTexCoord1Center);"];
     [shaderString appendString:@"inBounds = step(0.0, min(compare.x, compare.y));"];
-    [shaderString appendFormat:@"sum += texture2D(cc_PreviousPassTexture, v_blurCoordinates[0]) * inBounds * %f;\n", standardGaussianWeights[0]];
+    [shaderString appendFormat:@"sum += texture2D(cc_PreviousPassTexture, v_blurCoordinates[0]) * inBounds * %f;\n", (_trueBlurRadius == 0) ? 1.0 : standardGaussianWeights[0]];
     
     for (NSUInteger currentBlurCoordinateIndex = 0; currentBlurCoordinateIndex < numberOfOptimizedOffsets; currentBlurCoordinateIndex++)
     {

Original file line number	Diff line number	Diff line change
`@@ -1182,6 +1182,9 @@ -(void)readJoint`
`1182`	`1182`	`[self readPropertyForNode:(CCNode*)properties parent:nil isExtraProp:NO];`
`1183`	`1183`	`}`
`1184`	`1184`
	`1185`	`+ // TODO: This is a hack because things are happening in the wrong order, needs refactoring!`
	`1186`	`+ [self postDeserialization];`
	`1187`	`+`
`1185`	`1188`	`CCNode * nodeBodyA = properties[@"bodyA"];`
`1186`	`1189`	`CCNode * nodeBodyB = properties[@"bodyB"];`
`1187`	`1190`
Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,9 @@ -(void)buildFragmentFunctions`
`136`	`136`	`{`
`137`	`137`	`self.fragmentFunctions = [[NSMutableArray alloc] init];`
`138`	`138`
`139`		`- GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 1, sizeof(GLfloat));`
	`139`	`+ GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 2, sizeof(GLfloat));`
`140`	`140`	`GLfloat sumOfWeights = 0.0;`
`141`		`- for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)`
	`141`	`+ for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; currentGaussianWeightIndex++)`
`142`	`142`	`{`
`143`	`143`	`standardGaussianWeights[currentGaussianWeightIndex] = (1.0 / sqrt(2.0 * M_PI * pow(_sigma, 2.0))) * exp(-pow(currentGaussianWeightIndex, 2.0) / (2.0 * pow(_sigma, 2.0)));`
`144`	`144`
`@@ -153,14 +153,14 @@ -(void)buildFragmentFunctions`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`// Next, normalize these weights to prevent the clipping of the Gaussian curve at the end of the discrete samples from reducing luminance`
`156`		`- for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)`
	`156`	`+ for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; currentGaussianWeightIndex++)`
`157`	`157`	`{`
`158`	`158`	`standardGaussianWeights[currentGaussianWeightIndex] = standardGaussianWeights[currentGaussianWeightIndex] / sumOfWeights;`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`// From these weights we calculate the offsets to read interpolated values from`
`162`		`- NSUInteger numberOfOptimizedOffsets = MIN(_blurRadius / 2 + (_blurRadius % 2), BLUR_OPTIMIZED_RADIUS_MAX);`
`163`		`- NSUInteger trueNumberOfOptimizedOffsets = _trueBlurRadius / 2 + (_trueBlurRadius % 2);`
	`162`	`+ NSUInteger numberOfOptimizedOffsets = _numberOfOptimizedOffsets;`
	`163`	`+ NSUInteger trueNumberOfOptimizedOffsets = _trueBlurRadius / 2;`
`164`	`164`
`165`	`165`	`NSMutableString *shaderString = [[NSMutableString alloc] init];`
`166`	`166`
`@@ -183,7 +183,7 @@ -(void)buildFragmentFunctions`
`183`	`183`	`[shaderString appendString:@"inBounds = step(0.0, min(compare.x, compare.y));"];`
`184`	`184`	`[shaderString appendFormat:@"srcPixel = texture2D(cc_PreviousPassTexture, v_blurCoordinates[0]);\n"];`
`185`	`185`	`[shaderString appendString:@"luminanceCheck = step(u_luminanceThreshold, dot(srcPixel.rgb, luminanceWeighting));\n"];`
`186`		`- [shaderString appendFormat:@"src += inBounds * luminanceCheck * srcPixel * %f;\n", standardGaussianWeights[0]];`
	`186`	`+ [shaderString appendFormat:@"src += inBounds * luminanceCheck * srcPixel * %f;\n", (_trueBlurRadius == 0) ? 1.0 : standardGaussianWeights[0]];`
`187`	`187`
`188`	`188`	`for (NSUInteger currentBlurCoordinateIndex = 0; currentBlurCoordinateIndex < numberOfOptimizedOffsets; currentBlurCoordinateIndex++)`
`189`	`189`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,9 @@ -(void)buildFragmentFunctions`
`118`	`118`	`{`
`119`	`119`	`self.fragmentFunctions = [[NSMutableArray alloc] init];`
`120`	`120`
`121`		`- GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 1, sizeof(GLfloat));`
	`121`	`+ GLfloat *standardGaussianWeights = calloc(_trueBlurRadius + 2, sizeof(GLfloat));`
`122`	`122`	`GLfloat sumOfWeights = 0.0;`
`123`		`- for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)`
	`123`	`+ for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; currentGaussianWeightIndex++)`
`124`	`124`	`{`
`125`	`125`	`standardGaussianWeights[currentGaussianWeightIndex] = (1.0 / sqrt(2.0 * M_PI * pow(_sigma, 2.0))) * exp(-pow(currentGaussianWeightIndex, 2.0) / (2.0 * pow(_sigma, 2.0)));`
`126`	`126`
`@@ -135,14 +135,14 @@ -(void)buildFragmentFunctions`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`// Next, normalize these weights to prevent the clipping of the Gaussian curve at the end of the discrete samples from reducing luminance`
`138`		`- for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 1; currentGaussianWeightIndex++)`
	`138`	`+ for (NSUInteger currentGaussianWeightIndex = 0; currentGaussianWeightIndex < _trueBlurRadius + 2; currentGaussianWeightIndex++)`
`139`	`139`	`{`
`140`	`140`	`standardGaussianWeights[currentGaussianWeightIndex] = standardGaussianWeights[currentGaussianWeightIndex] / sumOfWeights;`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`// From these weights we calculate the offsets to read interpolated values from`
`144`		`- NSUInteger numberOfOptimizedOffsets = MIN(_blurRadius / 2 + (_blurRadius % 2), BLUR_OPTIMIZED_RADIUS_MAX);`
`145`		`- NSUInteger trueNumberOfOptimizedOffsets = _trueBlurRadius / 2 + (_trueBlurRadius % 2);`
	`144`	`+ NSUInteger numberOfOptimizedOffsets = _numberOfOptimizedOffsets;`
	`145`	`+ NSUInteger trueNumberOfOptimizedOffsets = _trueBlurRadius / 2;`
`146`	`146`
`147`	`147`	`NSMutableString *shaderString = [[NSMutableString alloc] init];`
`148`	`148`
`@@ -157,7 +157,7 @@ -(void)buildFragmentFunctions`
`157`	`157`	`// Inner texture loop`
`158`	`158`	`[shaderString appendString:@"compare = cc_FragTexCoord1Extents - abs(v_blurCoordinates[0] - cc_FragTexCoord1Center);"];`
`159`	`159`	`[shaderString appendString:@"inBounds = step(0.0, min(compare.x, compare.y));"];`
`160`		`- [shaderString appendFormat:@"sum += texture2D(cc_PreviousPassTexture, v_blurCoordinates[0]) * inBounds * %f;\n", standardGaussianWeights[0]];`
	`160`	`+ [shaderString appendFormat:@"sum += texture2D(cc_PreviousPassTexture, v_blurCoordinates[0]) * inBounds * %f;\n", (_trueBlurRadius == 0) ? 1.0 : standardGaussianWeights[0]];`
`161`	`161`
`162`	`162`	`for (NSUInteger currentBlurCoordinateIndex = 0; currentBlurCoordinateIndex < numberOfOptimizedOffsets; currentBlurCoordinateIndex++)`
`163`	`163`	`{`