CCEffectStack - Make stitchEffects a class method

Thayer J Andrews · Thayer J Andrews · commit ce51c29ad1bf · 2014-09-18T16:50:48.000-07:00
There's no reason for it to be an instance method so in the interest of compartmentalization
I'm changing it.
diff --git a/cocos2d/CCEffectStack.m b/cocos2d/CCEffectStack.m
@@ -187,7 +187,7 @@ - (CCEffectPrepareStatus)prepareForRendering
             for (NSArray *stitchList in stitchLists)
             {
                 NSAssert(stitchList.count > 0, @"Encountered an empty stitch list which shouldn't happen.");
-                [stitchedEffects addObject:[self stitchEffects:stitchList startIndex:effectIndex]];
+                [stitchedEffects addObject:[CCEffectStack stitchEffects:stitchList startIndex:effectIndex]];
                 effectIndex += stitchList.count;
             }
         }
@@ -222,7 +222,7 @@ - (BOOL)readyForRendering
 
 #pragma mark - Internal
 
--(CCEffect *)stitchEffects:(NSArray*)effects startIndex:(int)startIndex
++ (CCEffect *)stitchEffects:(NSArray*)effects startIndex:(int)startIndex
 {
     NSMutableArray* allFragFunctions = [[NSMutableArray alloc] init];
     NSMutableArray* allFragUniforms = [[NSMutableArray alloc] init];

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ - (CCEffectPrepareStatus)prepareForRendering`
`187`	`187`	`for (NSArray *stitchList in stitchLists)`
`188`	`188`	`{`
`189`	`189`	`NSAssert(stitchList.count > 0, @"Encountered an empty stitch list which shouldn't happen.");`
`190`		`- [stitchedEffects addObject:[self stitchEffects:stitchList startIndex:effectIndex]];`
	`190`	`+ [stitchedEffects addObject:[CCEffectStack stitchEffects:stitchList startIndex:effectIndex]];`
`191`	`191`	`effectIndex += stitchList.count;`
`192`	`192`	`}`
`193`	`193`	`}`
`@@ -222,7 +222,7 @@ - (BOOL)readyForRendering`
`222`	`222`
`223`	`223`	`#pragma mark - Internal`
`224`	`224`
`225`		`--(CCEffect )stitchEffects:(NSArray)effects startIndex:(int)startIndex`
	`225`	`++ (CCEffect )stitchEffects:(NSArray)effects startIndex:(int)startIndex`
`226`	`226`	`{`
`227`	`227`	`NSMutableArray* allFragFunctions = [[NSMutableArray alloc] init];`
`228`	`228`	`NSMutableArray* allFragUniforms = [[NSMutableArray alloc] init];`