CCEffects - [CCEffect prepareForRendering] -> [CCEffect prepareForRenderingWithSprite]

Thayer J Andrews · Thayer J Andrews · commit 67698b2042b9 · 2014-10-10T10:45:48.000-07:00
Since prepareForRendering is responsible for dynamic shader generation in response to property changes,
the lighting shader is dependent on the presence or absence of a normal map, and the normal map lives
on the sprite, the affected sprite needs to be supplied to prepareForRendering.  That was not being done
in the past. It is now.
diff --git a/cocos2d/CCEffect.m b/cocos2d/CCEffect.m
@@ -572,7 +572,7 @@ - (BOOL)readyForRendering
     return YES;
 }
 
-- (CCEffectPrepareStatus)prepareForRendering
+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite
 {
     return CCEffectPrepareNothingToDo;
 }
diff --git a/cocos2d/CCEffectBloom.m b/cocos2d/CCEffectBloom.m
@@ -403,7 +403,7 @@ - (BOOL)readyForRendering
     return !_shaderDirty;
 }
 
-- (CCEffectPrepareStatus)prepareForRendering
+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite
 {
     CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;
     if (_shaderDirty)
diff --git a/cocos2d/CCEffectBlur.m b/cocos2d/CCEffectBlur.m
@@ -323,7 +323,7 @@ -(void)buildRenderPasses
     self.renderPasses = @[pass0, pass1];
 }
 
-- (CCEffectPrepareStatus)prepareForRendering
+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite
 {
     CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;
     if (_shaderDirty)
diff --git a/cocos2d/CCEffectDropShadow.m b/cocos2d/CCEffectDropShadow.m
@@ -332,7 +332,7 @@ -(void)buildRenderPasses
     self.renderPasses = @[pass0, pass1, pass3];
 }
 
-- (CCEffectPrepareStatus)prepareForRendering
+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite
 {
     CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;
     if (_shaderDirty)
diff --git a/cocos2d/CCEffectLighting.m b/cocos2d/CCEffectLighting.m
@@ -245,7 +245,7 @@ -(void)buildRenderPasses
     self.renderPasses = @[pass0];
 }
 
-- (CCEffectPrepareStatus)prepareForRendering
+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite
 {
     CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;
 
diff --git a/cocos2d/CCEffectNode.m b/cocos2d/CCEffectNode.m
@@ -159,7 +159,7 @@ -(void)draw:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform
     if (_effect)
     {
         _effectRenderer.contentSize = self.contentSizeInPoints;
-        if ([_effect prepareForRendering] == CCEffectPrepareSuccess)
+        if ([_effect prepareForRenderingWithSprite:_sprite] == CCEffectPrepareSuccess)
         {
             // Preparing an effect for rendering can modify its uniforms
             // dictionary which means we need to reinitialize our copy of the
diff --git a/cocos2d/CCEffectStack.m b/cocos2d/CCEffectStack.m
@@ -111,7 +111,7 @@ - (void)dealloc
 
 #pragma mark - CCEffect overrides
 
-- (CCEffectPrepareStatus)prepareForRendering
+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite
 {
     CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;
     if (_passesDirty)
@@ -147,7 +147,7 @@ - (CCEffectPrepareStatus)prepareForRendering
         {
             // Make sure all the contained effects are ready for rendering
             // before we do anything else.
-            [effect prepareForRendering];
+            [effect prepareForRenderingWithSprite:sprite];
             
             // And find the max padding values of all contained effects.
             if (effect.padding.width > maxPadding.width)
diff --git a/cocos2d/CCEffect_Private.h b/cocos2d/CCEffect_Private.h
@@ -165,7 +165,7 @@ typedef void (^CCEffectRenderPassEndBlock)(CCEffectRenderPass *pass);
 -(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings;
 -(id)initWithFragmentFunction:(NSMutableArray*) fragmentFunctions vertexFunctions:(NSMutableArray*)vertexFunctions fragmentUniforms:(NSArray*)fragmentUniforms vertexUniforms:(NSArray*)vertexUniforms varyings:(NSArray*)varyings firstInStack:(BOOL)firstInStack;
 
--(CCEffectPrepareStatus)prepareForRendering;
+-(CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite;
 -(CCEffectRenderPass *)renderPassAtIndex:(NSUInteger)passIndex;
 
 -(BOOL)stitchSupported:(CCEffectFunctionStitchFlags)stitch;
diff --git a/cocos2d/CCNoARC.m b/cocos2d/CCNoARC.m
@@ -83,7 +83,7 @@ -(void)draw:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform;
 	if (_effect)
 	{
 		_effectRenderer.contentSize = self.contentSizeInPoints;
-		if ([self.effect prepareForRendering] == CCEffectPrepareSuccess)
+		if ([self.effect prepareForRenderingWithSprite:self] == CCEffectPrepareSuccess)
 		{
 			// Preparing an effect for rendering can modify its uniforms
 			// dictionary which means we need to reinitialize our copy of the

Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ - (BOOL)readyForRendering`
`572`	`572`	`return YES;`
`573`	`573`	`}`
`574`	`574`
`575`		`-- (CCEffectPrepareStatus)prepareForRendering`
	`575`	`+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite`
`576`	`576`	`{`
`577`	`577`	`return CCEffectPrepareNothingToDo;`
`578`	`578`	`}`
Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ - (BOOL)readyForRendering`
`403`	`403`	`return !_shaderDirty;`
`404`	`404`	`}`
`405`	`405`
`406`		`-- (CCEffectPrepareStatus)prepareForRendering`
	`406`	`+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite`
`407`	`407`	`{`
`408`	`408`	`CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;`
`409`	`409`	`if (_shaderDirty)`
Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ -(void)buildRenderPasses`
`323`	`323`	`self.renderPasses = @[pass0, pass1];`
`324`	`324`	`}`
`325`	`325`
`326`		`-- (CCEffectPrepareStatus)prepareForRendering`
	`326`	`+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite`
`327`	`327`	`{`
`328`	`328`	`CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;`
`329`	`329`	`if (_shaderDirty)`
Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,7 @@ -(void)buildRenderPasses`
`332`	`332`	`self.renderPasses = @[pass0, pass1, pass3];`
`333`	`333`	`}`
`334`	`334`
`335`		`-- (CCEffectPrepareStatus)prepareForRendering`
	`335`	`+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite`
`336`	`336`	`{`
`337`	`337`	`CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;`
`338`	`338`	`if (_shaderDirty)`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ -(void)buildRenderPasses`
`245`	`245`	`self.renderPasses = @[pass0];`
`246`	`246`	`}`
`247`	`247`
`248`		`-- (CCEffectPrepareStatus)prepareForRendering`
	`248`	`+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite`
`249`	`249`	`{`
`250`	`250`	`CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;`
`251`	`251`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ -(void)draw:(CCRenderer )renderer transform:(const GLKMatrix4 )transform`
`159`	`159`	`if (_effect)`
`160`	`160`	`{`
`161`	`161`	`_effectRenderer.contentSize = self.contentSizeInPoints;`
`162`		`- if ([_effect prepareForRendering] == CCEffectPrepareSuccess)`
	`162`	`+ if ([_effect prepareForRenderingWithSprite:_sprite] == CCEffectPrepareSuccess)`
`163`	`163`	`{`
`164`	`164`	`// Preparing an effect for rendering can modify its uniforms`
`165`	`165`	`// dictionary which means we need to reinitialize our copy of the`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ - (void)dealloc`
`111`	`111`
`112`	`112`	`#pragma mark - CCEffect overrides`
`113`	`113`
`114`		`-- (CCEffectPrepareStatus)prepareForRendering`
	`114`	`+- (CCEffectPrepareStatus)prepareForRenderingWithSprite:(CCSprite *)sprite`
`115`	`115`	`{`
`116`	`116`	`CCEffectPrepareStatus result = CCEffectPrepareNothingToDo;`
`117`	`117`	`if (_passesDirty)`
`@@ -147,7 +147,7 @@ - (CCEffectPrepareStatus)prepareForRendering`
`147`	`147`	`{`
`148`	`148`	`// Make sure all the contained effects are ready for rendering`
`149`	`149`	`// before we do anything else.`
`150`		`- [effect prepareForRendering];`
	`150`	`+ [effect prepareForRenderingWithSprite:sprite];`
`151`	`151`
`152`	`152`	`// And find the max padding values of all contained effects.`
`153`	`153`	`if (effect.padding.width > maxPadding.width)`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ -(void)draw:(CCRenderer )renderer transform:(const GLKMatrix4 )transform;`
`83`	`83`	`if (_effect)`
`84`	`84`	`{`
`85`	`85`	`_effectRenderer.contentSize = self.contentSizeInPoints;`
`86`		`- if ([self.effect prepareForRendering] == CCEffectPrepareSuccess)`
	`86`	`+ if ([self.effect prepareForRenderingWithSprite:self] == CCEffectPrepareSuccess)`
`87`	`87`	`{`
`88`	`88`	`// Preparing an effect for rendering can modify its uniforms`
`89`	`89`	`// dictionary which means we need to reinitialize our copy of the`