CCEffectRenderer - Fix the content size passed to the effect renderer

Thayer J Andrews · Thayer J Andrews · commit 887ff2324c9e · 2014-08-05T17:37:33.000-07:00
It should be the content size in points not the raw content size. Thanks to Scott for pointing
this out.
diff --git a/cocos2d/CCEffectNode.m b/cocos2d/CCEffectNode.m
@@ -180,7 +180,7 @@ -(void)draw:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform
     
     if (_effect)
     {
-        _effectRenderer.contentSize = self.contentSize;
+        _effectRenderer.contentSize = self.contentSizeInPoints;
         if ([_effect prepareForRendering] == CCEffectPrepareSuccess)
         {
             // Preparing an effect for rendering can modify its uniforms
diff --git a/cocos2d/CCNoARC.m b/cocos2d/CCNoARC.m
@@ -78,7 +78,7 @@ -(void)draw:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform;
 	
 	if (_effect)
 	{
-		_effectRenderer.contentSize = self.contentSize;
+		_effectRenderer.contentSize = self.contentSizeInPoints;
 		if ([self.effect prepareForRendering] == CCEffectPrepareSuccess)
 		{
 			// Preparing an effect for rendering can modify its uniforms

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ -(void)draw:(CCRenderer )renderer transform:(const GLKMatrix4 )transform`
`180`	`180`
`181`	`181`	`if (_effect)`
`182`	`182`	`{`
`183`		`- _effectRenderer.contentSize = self.contentSize;`
	`183`	`+ _effectRenderer.contentSize = self.contentSizeInPoints;`
`184`	`184`	`if ([_effect prepareForRendering] == CCEffectPrepareSuccess)`
`185`	`185`	`{`
`186`	`186`	`// Preparing an effect for rendering can modify its uniforms`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ -(void)draw:(CCRenderer )renderer transform:(const GLKMatrix4 )transform;`
`78`	`78`
`79`	`79`	`if (_effect)`
`80`	`80`	`{`
`81`		`- _effectRenderer.contentSize = self.contentSize;`
	`81`	`+ _effectRenderer.contentSize = self.contentSizeInPoints;`
`82`	`82`	`if ([self.effect prepareForRendering] == CCEffectPrepareSuccess)`
`83`	`83`	`{`
`84`	`84`	`// Preparing an effect for rendering can modify its uniforms`