CCEffectNode - Fix parent relative sizing

It looks like this is broken for CCRenderTexture as well but I'm intentionally not fixing it there
with this change. I'll add that fix separately.

Author: Thayer J Andrews

cocos2d/CCEffectNode.m

@@ -70,6 +70,18 @@ -(void)setEffect:(CCEffect *)effect
     }
 }
 
+-(void)create
+{
+    CGSize pointSize = self.contentSizeInPoints;
+    CGSize pixelSize = CGSizeMake(pointSize.width * _contentScale, pointSize.height * _contentScale);
+    [self createTextureAndFboWithPixelSize:pixelSize];
+
+    CGRect rect = CGRectMake(0, 0, pointSize.width, pointSize.height);
+	[_sprite setTextureRect:rect];
+    
+    _projection = GLKMatrix4MakeOrtho(0.0f, pointSize.width, 0.0f, pointSize.height, -1024.0f, 1024.0f);
+}
+
 -(void)begin
 {
 	CGSize pixelSize = self.texture.contentSizeInPixels;
@@ -206,4 +218,10 @@ - (void)updateShaderUniformsFromEffect
     [_shaderUniforms addEntriesFromDictionary:_effect.shaderUniforms];
 }
 
+- (void)setContentSizeType:(CCSizeType)contentSizeType
+{
+    [super setContentSizeType:contentSizeType];
+    _contentSizeChanged = YES;
+}
+
 @end

cocos2d/CCRenderTexture.m

@@ -168,30 +168,32 @@ -(id)init
 }
 
 -(void)create
+{
+    CGSize pixelSize = CGSizeMake(_contentSize.width * _contentScale, _contentSize.height * _contentScale);
+    [self createTextureAndFboWithPixelSize:pixelSize];
+}
+
+-(void)createTextureAndFboWithPixelSize:(CGSize)pixelSize
 {
 	glPushGroupMarkerEXT(0, "CCRenderTexture: Create");
 
-	int pixelW = _contentSize.width*_contentScale;
-	int pixelH = _contentSize.height*_contentScale;
-
-
 	glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
 
 	// textures must be power of two
 	NSUInteger powW;
 	NSUInteger powH;
 
 	if( [[CCConfiguration sharedConfiguration] supportsNPOT] ) {
-		powW = pixelW;
-		powH = pixelH;
+		powW = pixelSize.width;
+		powH = pixelSize.height;
 	} else {
-		powW = CCNextPOT(pixelW);
-		powH = CCNextPOT(pixelH);
+		powW = CCNextPOT(pixelSize.width);
+		powH = CCNextPOT(pixelSize.height);
 	}
 
 	void *data = calloc(powW*powH, 4);
 
-	CCTexture *texture = [[CCTexture alloc] initWithData:data pixelFormat:_pixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:CGSizeMake(pixelW, pixelH) contentScale:_contentScale];
+	CCTexture *texture = [[CCTexture alloc] initWithData:data pixelFormat:_pixelFormat pixelsWide:powW pixelsHigh:powH contentSizeInPixels:pixelSize contentScale:_contentScale];
     self.texture = texture;
 
 	free(data);
@@ -234,6 +236,10 @@ -(void)create
 	CC_CHECK_GL_ERROR_DEBUG();
 	glPopGroupMarkerEXT();
 
+    // XXX Thayer says: I think this is incorrect for any situations where the content
+    // size type isn't (points, points). The call to setTextureRect below eventually arrives
+    // at some code that assumes the supplied size is in points so, if the size is not in points,
+    // things break.
 	CGRect rect = CGRectMake(0, 0, _contentSize.width, _contentSize.height);
 
 	[self assignSpriteTexture];
@@ -618,6 +624,10 @@ -(void) setContentSize:(CGSize)size
     // TODO: Fix CCRenderTexture so that it correctly handles this
 	// NSAssert(NO, @"You cannot change the content size of an already created CCRenderTexture. Recreate it");
     [super setContentSize:size];
+    
+    // XXX Thayer says: I'm pretty sure this is broken since the supplied content size could
+    // be normalized, in points, in UI points, etc. We should get the size in points then convert
+    // to pixels and use that to make the ortho matrix.
 	_projection = GLKMatrix4MakeOrtho(0.0f, size.width, 0.0f, size.height, -1024.0f, 1024.0f);
     _contentSizeChanged = YES;
 

cocos2d/CCRenderTexture_Private.h

@@ -36,6 +36,7 @@
     BOOL _contentSizeChanged;
 }
 
+-(void)createTextureAndFboWithPixelSize:(CGSize)pixelSize;
 -(void)destroy;
 
 -(GLuint)fbo;