CCEffectLighting - Switch from CCNode to CCLightNode

Author: Thayer J Andrews

cocos2d/CCEffectLighting.h

@@ -7,6 +7,7 @@
 //
 
 #import "CCEffect.h"
+#import "CCLightNode.h"
 
 /**
  * CCEffectLighting uses a normal map and a collection of light nodes to compute the Phong
@@ -18,9 +19,10 @@
 /// @name Accessing Effect Attributes
 /// -----------------------------------------------------------------------
 
-/** The node that will light the affected node.
+/** The lights that will contribute to the lighting of the affected
+ *  node.
  */
-@property (nonatomic, strong) CCNode *light;
+@property (nonatomic, strong) CCLightNode *light;
 
 
 /// -----------------------------------------------------------------------
@@ -41,7 +43,7 @@
  *
  *  @return The CCEffectLighting object.
  */
--(id)initWithLight:(CCNode *)light;
+-(id)initWithLight:(CCLightNode *)light;
 
 
 /// -----------------------------------------------------------------------
@@ -55,6 +57,6 @@
  *
  *  @return The CCEffectLighting object.
  */
-+(id)effectWithLight:(CCNode *)light;
++(id)effectWithLight:(CCLightNode *)light;
 
 @end

cocos2d/CCEffectLighting.m

@@ -122,7 +122,9 @@ -(void)buildRenderPasses
         // Compute the light's position in the effect node's coordinate system.
         GLKVector4 lightPosition = GLKMatrix4MultiplyVector4(lightNodeToEffectNode, GLKVector4Make(weakSelf.light.anchorPointInPoints.x, weakSelf.light.anchorPointInPoints.y, 500.0f, 1.0f));
 
-        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_lightColor"]] = [NSValue valueWithGLKVector4:GLKVector4Make(1.0f, 1.0f, 1.0f, 1.0f)];
+        GLKVector4 lightColor = GLKVector4MultiplyScalar(weakSelf.light.color.glkVector4, weakSelf.light.intensity);
+        
+        pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_lightColor"]] = [NSValue valueWithGLKVector4:lightColor];
         pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_lightPosition"]] = [NSValue valueWithGLKVector4:lightPosition];
         pass.shaderUniforms[weakSelf.uniformTranslationTable[@"u_ndcToTangentSpace"]] = [NSValue valueWithGLKMatrix4:pass.ndcToNodeLocal];
 

cocos2d/CCLightNode.h

@@ -37,6 +37,14 @@
 /// @name Initializing a CCLightNode object
 /// -----------------------------------------------------------------------
 
+
+/**
+ *  Initializes a CCLightNode object with a white color and full intensity.
+ *
+ *  @return The CCLightNode object.
+ */
+-(id)init;
+
 /**
  *  Initializes a CCLightNode object with the specified parameters.
  *