Merge branch 'v3.4' into develop

Conflicts:
	cocos2d/CCEffectDropShadow.m

Author: slembcke

Resources/Images/powered_normals.png

@@ -298,8 +298,8 @@ -(void)setupSimpleLightingTest
 
     [self.contentNode.scene.lights flushGroupNames];
 
-    NSString *normalMapImage = @"Images/ShinyTorusNormals.png";
-    NSString *diffuseImage = @"Images/ShinyTorusColor.png";
+    NSString *normalMapImage = @"Images/powered_normals.png";
+    NSString *diffuseImage = @"Images/powered.png";
 
     void (^setupBlock)(CGPoint position, CCLightType type, float lightDepth, NSString *title) = ^void(CGPoint position, CCLightType type, float lightDepth, NSString *title)
     {
@@ -327,6 +327,13 @@ -(void)setupSimpleLightingTest
         sprite.effect = lightingEffect;
         sprite.scale = 0.5f;
 
+        [sprite runAction:[CCActionRepeatForever actionWithAction:[CCActionSequence actions:
+                                                                  [CCActionDelay actionWithDuration:1.0],
+                                                                  [CCActionRotateBy actionWithDuration:4.0 angle:360.0],
+                                                                  [CCActionDelay actionWithDuration:8.0],
+                                                                  nil
+                                                                  ]]];
+        
         CCNode *root = [[CCNode alloc] init];
         root.positionType = CCPositionTypeNormalized;
         root.position = position;
@@ -348,14 +355,15 @@ -(void)setupSimpleLightingTest
 
         [light runAction:[CCActionRepeatForever actionWithAction:[CCActionSequence actions:
                                                                   [CCActionMoveTo actionWithDuration:1.0 position:ccp(1.0f, 1.0f)],
+                                                                  [CCActionDelay actionWithDuration:4.0],
                                                                   [CCActionMoveTo actionWithDuration:2.0 position:ccp(0.0f, 0.0f)],
                                                                   [CCActionRotateBy actionWithDuration:5.0 angle:360.0],
                                                                   [CCActionMoveTo actionWithDuration:1.0 position:ccp(0.5f, 0.5f)],
                                                                   nil
                                                                   ]]];
     };
-    setupBlock(ccp(0.25f, 0.5f), CCLightPoint, 250.0f, @"Point Light\nPosition matters, orientation does not.");
-    setupBlock(ccp(0.75f, 0.5f), CCLightDirectional, 1.0f, @"Directional Light\nPosition does not matter, orientation does.");
+    setupBlock(ccp(0.25f, 0.5f), CCLightPoint, 50.0f, @"Point Light\nPosition matters, orientation does not.");
+    setupBlock(ccp(0.75f, 0.5f), CCLightDirectional, 0.5f, @"Directional Light\nPosition does not matter, orientation does.");
 }
 
 -(void)setupLightingParameterTest

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -238,7 +238,9 @@ - (CCActionInterval*)actionFromKeyframe0:(CCBKeyframe*)kf0 andKeyframe1:(CCBKeyf
             return [CCActionHide action];
         }
     } else if ([name isEqualToString:@"spriteFrame"]) {
-        return [CCActionSpriteFrame actionWithSpriteFrame:kf1.value];
+        // TODO is this a mild bug?
+        // What happens if an easing curve is applied to this?
+        return (CCActionInterval *)[CCActionSpriteFrame actionWithSpriteFrame:kf1.value];
     } else if ([node isKindOfClass:[CCLightNode class]]) {
         if ([name isEqualToString:@"intensity"] ||
             [name isEqualToString:@"specularIntensity"] ||

cocos2d-ui/CCBReader/CCAnimationManager.m

@@ -390,6 +390,7 @@ - (CCActionInterval *) reverse
 #pragma mark - CCSpawn
 
 @implementation CCActionSpawn
+
 +(instancetype) actions: (CCActionFiniteTime*) action1, ...
 {
 	va_list args;

cocos2d/CCActionInterval.m

@@ -284,9 +284,11 @@ + (NSArray *)buildRenderPassesWithInterface:(CCEffectDropShadow *)interface
         passInputs.shaderUniforms[pass.uniformTranslationTable[@"u_blurDirection"]] = [NSValue valueWithGLKVector2:dur];
         passInputs.shaderUniforms[pass.uniformTranslationTable[@"u_composite"]] = [NSNumber numberWithFloat:1.0f];
 
-        GLKVector2 offset = GLKVector2Make(weakInterface.shadowOffset.x / passInputs.previousPassTexture.contentSize.width, weakInterface.shadowOffset.y / passInputs.previousPassTexture.contentSize.height);
+        CGPoint offset = weakInterface.shadowOffset;
+        offset.x /= passInputs.previousPassTexture.contentSize.width;
+        offset.y /= passInputs.previousPassTexture.contentSize.height;
 
-        passInputs.shaderUniforms[pass.uniformTranslationTable[@"u_shadowOffset"]] = [NSValue valueWithGLKVector2:offset];
+        passInputs.shaderUniforms[pass.uniformTranslationTable[@"u_shadowOffset"]] = [NSValue valueWithCGPoint:offset];
         passInputs.shaderUniforms[pass.uniformTranslationTable[@"u_shadowColor"]] = [NSValue valueWithGLKVector4:weakInterface.shadowColor.glkVector4];
 
     } copy]];

cocos2d/CCEffectDropShadow.m

@@ -243,10 +243,9 @@ +(NSArray *)buildRenderPassesWithInterface:(CCEffectLighting *)interface
         GLKMatrix4 nodeLocalToWorld = passInputs.sprite.nodeToWorldMatrix;
         GLKMatrix4 ndcToWorld = GLKMatrix4Multiply(nodeLocalToWorld, passInputs.ndcToNodeLocal);
 
-
-        GLKMatrix2 tangentMatrix = CCEffectUtilsMatrix2InvertAndTranspose(GLKMatrix4GetMatrix2(nodeLocalToWorld), nil);
-        GLKVector2 reflectTangent = GLKVector2Normalize(CCEffectUtilsMatrix2MultiplyVector2(tangentMatrix, GLKVector2Make(1.0f, 0.0f)));
-        GLKVector2 reflectBinormal = GLKVector2Make(-reflectTangent.y, reflectTangent.x);
+        // Tangent and binormal vectors are the x/y basis vectors from the nodeLocalToWorldMatrix
+        GLKVector2 reflectTangent = GLKVector2Normalize(GLKVector2Make(nodeLocalToWorld.m[0], nodeLocalToWorld.m[1]));
+        GLKVector2 reflectBinormal = GLKVector2Normalize(GLKVector2Make(nodeLocalToWorld.m[4], nodeLocalToWorld.m[5]));
 
         passInputs.shaderUniforms[pass.uniformTranslationTable[@"u_worldSpaceTangent"]] = [NSValue valueWithGLKVector2:reflectTangent];
         passInputs.shaderUniforms[pass.uniformTranslationTable[@"u_worldSpaceBinormal"]] = [NSValue valueWithGLKVector2:reflectBinormal];