CCEffectNode - More parent relative sizing fixes

Keep track of the last allocated content size and compare this to the current content size.
If the two are different, destroy and reallocate the associated texture and FBO. This fixes
cases where the effect node's size is parent relative (and does not change) but the parent's
size does change.

Author: Thayer J Andrews

cocos2d/CCEffectNode.m

@@ -32,6 +32,7 @@ @interface CCEffectNode()
 {
     CCEffect *_effect;
     CCEffectRenderer *_effectRenderer;
+    CGSize _allocatedSize;
 }
 
 @end
@@ -48,6 +49,7 @@ -(id)initWithWidth:(int)width height:(int)height
 {
 	if((self = [super initWithWidth:width height:height pixelFormat:CCTexturePixelFormat_Default])) {
         _effectRenderer = [[CCEffectRenderer alloc] init];
+        _allocatedSize = CGSizeMake(0.0f, 0.0f);
 	}
 	return self;
 }
@@ -72,14 +74,20 @@ -(void)setEffect:(CCEffect *)effect
 
 -(void)create
 {
-    CGSize pointSize = self.contentSizeInPoints;
-    CGSize pixelSize = CGSizeMake(pointSize.width * _contentScale, pointSize.height * _contentScale);
+    _allocatedSize = self.contentSizeInPoints;
+    CGSize pixelSize = CGSizeMake(_allocatedSize.width * _contentScale, _allocatedSize.height * _contentScale);
     [self createTextureAndFboWithPixelSize:pixelSize];
 
-    CGRect rect = CGRectMake(0, 0, pointSize.width, pointSize.height);
+    CGRect rect = CGRectMake(0, 0, _allocatedSize.width, _allocatedSize.height);
 	[_sprite setTextureRect:rect];
 
-    _projection = GLKMatrix4MakeOrtho(0.0f, pointSize.width, 0.0f, pointSize.height, -1024.0f, 1024.0f);
+    _projection = GLKMatrix4MakeOrtho(0.0f, _allocatedSize.width, 0.0f, _allocatedSize.height, -1024.0f, 1024.0f);
+}
+
+-(void)destroy
+{
+    [super destroy];
+    _allocatedSize = CGSizeMake(0.0f, 0.0f);
 }
 
 -(void)begin
@@ -123,9 +131,11 @@ -(void)visit:(CCRenderer *)renderer parentTransform:(const GLKMatrix4 *)parentTr
 	// Don't call visit on its children
 	if(!_visible) return;
 
-    if(_contentSizeChanged)
+    CGSize pointSize = self.contentSizeInPoints;
+    if (!CGSizeEqualToSize(pointSize, _allocatedSize))
     {
         [self destroy];
+        [self contentSizeChanged];
         _contentSizeChanged = NO;
     }
 
@@ -224,10 +234,4 @@ - (void)updateShaderUniformsFromEffect
     [_shaderUniforms addEntriesFromDictionary:_effect.shaderUniforms];
 }
 
-- (void)setContentSizeType:(CCSizeType)contentSizeType
-{
-    [super setContentSizeType:contentSizeType];
-    _contentSizeChanged = YES;
-}
-
 @end

cocos2d/CCNode_Private.h

@@ -107,4 +107,6 @@ CGAffineTransform CGAffineTransformMakeRigid(CGPoint translate, CGFloat radians)
  */
 -(void) detachChild:(CCNode *)child cleanup:(BOOL)doCleanup;
 
+- (void) contentSizeChanged;
+
 @end