CCLightNode and CCEffectLighting - CCLightNodeType -> CCLightType

Author: Thayer J Andrews

cocos2d/CCEffectLighting.m

@@ -122,7 +122,7 @@ +(NSMutableArray *)buildVertexFunctionsWithLights:(NSArray*)lights
     {
         CCLightNode *light = lights[lightIndex];
 
-        if (light.type == CCLightNodeDirectional)
+        if (light.type == CCLightDirectional)
         {
             [effectBody appendFormat:@"v_tangentSpaceLightDir%lu = u_lightVector%lu;", (unsigned long)lightIndex, (unsigned long)lightIndex];
         }
@@ -168,7 +168,7 @@ -(void)buildRenderPasses
 
             // Compute the light's position in the effect node's coordinate system.
             GLKVector4 lightVector = GLKVector4Make(0.0f, 0.0f, 0.0f, 0.0f);
-            if (light.type == CCLightNodeDirectional)
+            if (light.type == CCLightDirectional)
             {
                 lightVector = GLKMatrix4MultiplyVector4(lightNodeToEffectNode, GLKVector4Make(0.0f, 1.0f, 1.0f, 0.0f));
             }

cocos2d/CCLightNode.h

@@ -9,13 +9,14 @@
 #import "CCNode.h"
 
 
-typedef NS_ENUM(NSUInteger, CCLightNodeType)
+typedef NS_ENUM(NSUInteger, CCLightType)
 {
-    CCLightNodePoint       = 0,
-    CCLightNodeDirectional = 1,
-    CCLightNodeSpot        = 2,
+    CCLightPoint       = 0,
+    CCLightDirectional = 1,
+    CCLightSpot        = 2,
 };
 
+
 /**
  * CCLightNode allows the user to define lights that will be used with
  * CCEffectLighting.
@@ -36,7 +37,7 @@ typedef NS_ENUM(NSUInteger, CCLightNodeType)
  *  the light to the node exceeds the cutoff angle then the light no longer
  *  contributes to the lighting of the node.
  */
-@property (nonatomic, assign) CCLightNodeType type;
+@property (nonatomic, assign) CCLightType type;
 
 /** The primary color of the light. As described below, the color is modulated by the
  *  intensity value to determine the contribution of the light to the lighting
@@ -91,7 +92,7 @@ typedef NS_ENUM(NSUInteger, CCLightNodeType)
  *
  *  @return The CCLighttNode object.
  */
--(id)initWithType:(CCLightNodeType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity;
+-(id)initWithType:(CCLightType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity;
 
 
 /// -----------------------------------------------------------------------
@@ -109,7 +110,7 @@ typedef NS_ENUM(NSUInteger, CCLightNodeType)
  *
  *  @return An initialized CCLightNode object.
  */
-+(id)lightWithType:(CCLightNodeType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity;
++(id)lightWithType:(CCLightType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity;
 
 
 @end

cocos2d/CCLightNode.m

@@ -13,11 +13,11 @@ @implementation CCLightNode
 
 -(id)init
 {
-    return [self initWithType:CCLightNodePoint color:[CCColor whiteColor] intensity:1.0f ambientColor:[CCColor whiteColor] ambientIntensity:0.5f];
+    return [self initWithType:CCLightPoint color:[CCColor whiteColor] intensity:1.0f ambientColor:[CCColor whiteColor] ambientIntensity:0.5f];
 }
 
 
--(id)initWithType:(CCLightNodeType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity
+-(id)initWithType:(CCLightType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity
 {
     if ((self = [super init]))
     {
@@ -31,7 +31,7 @@ -(id)initWithType:(CCLightNodeType)type color:(CCColor *)color intensity:(float)
     return self;
 }
 
-+(id)lightWithType:(CCLightNodeType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity
++(id)lightWithType:(CCLightType)type color:(CCColor *)color intensity:(float)intensity ambientColor:(CCColor *)ambientColor ambientIntensity:(float)ambientIntensity
 {
     return [[self alloc] initWithType:type color:color intensity:intensity ambientColor:ambientColor ambientIntensity:ambientIntensity];
 }