CCEffectStack - Match convenience constructor flavors to those in CCActionSequence

There is now an NSArray* version and a nil-terminated list version. This also introduces a
convenience va_list initializer but that's internal only.

Author: Thayer J Andrews

cocos2d-ui-tests/tests/CCEffectsTest.m

@@ -527,8 +527,7 @@ -(void)setupStackTest
     sprite.position = ccp(0.5f, 0.5f);
     sprite.scale = 0.5f;
 
-    sprite.effect = [CCEffectStack effectStackWithEffects:@[effects[8], effects[9]]];
-//    sprite.effect = [CCEffectStack effectStackWithEffects:@[effects[7]]];
+    sprite.effect = [CCEffectStack effects:effects[8], effects[9], nil];
 
     sprite.normalMapSpriteFrame = [CCSpriteFrame frameWithImageNamed:@"Images/ShinyBallNormals.png"];
     sprite.colorRGBA = [CCColor colorWithRed:0.75f green:0.75f blue:0.75f alpha:0.75f];
@@ -662,7 +661,7 @@ - (CCNode *)effectNodeWithEffects:(NSArray *)effects appliedToSpriteWithImage:(N
     }
     else if (effects.count > 1)
     {
-        CCEffectStack *stack = [CCEffectStack effectStackWithEffects:effects];
+        CCEffectStack *stack = [CCEffectStack effectWithArray:effects];
         effectNode.effect = stack;
     }
 
@@ -683,7 +682,7 @@ - (CCSprite *)spriteWithEffects:(NSArray *)effects image:(NSString *)spriteImage
     }
     else if (effects.count > 1)
     {
-        CCEffectStack *stack = [CCEffectStack effectStackWithEffects:effects];
+        CCEffectStack *stack = [CCEffectStack effectWithArray:effects];
         sprite.effect = stack;
     }
 

cocos2d/CCEffectStack.h

@@ -40,11 +40,21 @@
 /**
  *  Initializes an effect stack object with the specified array of effects.
  *
- *  @param effects The array of effects to add to the stack.
+ *  @param arrayOfEffects The array of effects to add to the stack.
  *
  *  @return The CCEffectStack object.
  */
-- (id)initWithEffects:(NSArray *)effects;
+- (id)initWithArray:(NSArray *)arrayOfEffects;
+
+/**
+ *  Initializes an effect stack object with the specified effects.
+ *
+ *  @param effect1 First effect to add to the stack.
+ *  @param ...     Nil terminated list of effects to stack.
+ *
+ *  @return The CCEffectStack object.
+ */
+- (id)initWithEffects:(CCEffect*)effect1, ... NS_REQUIRES_NIL_TERMINATION;
 
 
 /// -----------------------------------------------------------------------
@@ -54,11 +64,21 @@
 /**
  *  Creates an effect stack object with the specified array of effects.
  *
- *  @param effects The array of effects to add to the stack.
+ *  @param arrayOfEffects The array of effects to add to the stack.
+ *
+ *  @return The CCEffectStack object.
+ */
++ (id)effectWithArray:(NSArray*)arrayOfEffects;
+
+/**
+ *  Creates an effect stack object with the specified effects.
+ *
+ *  @param effect1 First effect to add to the stack.
+ *  @param ...     Nil terminated list of effects to stack.
  *
  *  @return The CCEffectStack object.
  */
-+ (id)effectStackWithEffects:(NSArray *)effects;
++ (id)effects:(CCEffect*)effect1, ... NS_REQUIRES_NIL_TERMINATION;
 
 
 /// -----------------------------------------------------------------------

cocos2d/CCEffectStack.m

@@ -17,10 +17,10 @@ @implementation CCEffectStack
 
 - (id)init
 {
-    return [self initWithEffects:nil];
+    return [self initWithArray:nil];
 }
 
-- (id)initWithEffects:(NSArray *)effects
+- (id)initWithArray:(NSArray *)effects
 {
     if ((self = [super init]))
     {
@@ -46,9 +46,48 @@ - (id)initWithEffects:(NSArray *)effects
     return self;
 }
 
-+ (id)effectStackWithEffects:(NSArray *)effects
+- (id)initWithEffect:(CCEffect*)effect1 vaList:(va_list)args
 {
-    return [[self alloc] initWithEffects:effects];
+    NSMutableArray *effects = [[NSMutableArray alloc] init];
+	
+    CCEffect *effect = effect1;
+	while(effect)
+    {
+        [effects addObject:effect];
+		effect = va_arg(args, CCEffect*);
+	}
+    
+	return [self initWithArray:effects];
+}
+
+- (id)initWithEffects:(CCEffect*)effect1, ...
+{
+	va_list args;
+	va_start(args, effect1);
+    
+	id ret = [self initWithEffect:effect1 vaList:args];
+    
+	va_end(args);
+    
+	return ret;
+}
+
+
++ (id)effectWithArray:(NSArray *)arrayOfEffects
+{
+    return [[self alloc] initWithArray:arrayOfEffects];
+}
+
++ (id)effects:(CCEffect*)effect1, ...
+{
+	va_list args;
+	va_start(args, effect1);
+    
+	id ret = [[self alloc] initWithEffect:effect1 vaList:args];
+    
+	va_end(args);
+    
+	return ret;
 }
 
 - (NSUInteger)effectCount
@@ -58,10 +97,18 @@ - (NSUInteger)effectCount
 
 - (CCEffect *)effectAtIndex:(NSUInteger)effectIndex
 {
-    NSAssert(effectIndex < _effects.count,@"Pass index out of range.");
+    NSAssert(effectIndex < _effects.count,@"Effect index out of range.");
     return _effects[effectIndex];
 }
 
+- (void)dealloc
+{
+    for (CCEffect *effect in _effects)
+    {
+        effect.owningStack = nil;
+    }
+}
+
 #pragma mark - CCEffect overrides
 
 - (CCEffectPrepareStatus)prepareForRendering