Update CCEffectNode with the CCRenderTexture changes.

Author: slembcke

cocos2d/CCEffectNode.m

@@ -117,41 +117,6 @@ -(void)destroy
     _allocatedSize = CGSizeMake(0.0f, 0.0f);
 }
 
--(void)begin
-{
-//	CGSize pixelSize = self.texture.contentSizeInPixels;
-//	GLuint fbo = [self fbo];
-//  
-//	[_renderer pushGroup];
-//	[_renderer enqueueBlock:^{
-//		glGetFloatv(GL_VIEWPORT, _oldViewport.v);
-//		glViewport(0, 0, pixelSize.width, pixelSize.height );
-//		
-//		glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
-//		glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-//        
-//	} globalSortOrder:NSIntegerMin debugLabel:@"CCEffectNode: Bind FBO" threadSafe:NO];
-}
-
--(void)endWithDebugLabel:(NSString *)debugLabel
-{
-//    [_renderer enqueueBlock:^{
-//		glBindFramebuffer(GL_FRAMEBUFFER, _oldFBO);
-//		glViewport(_oldViewport.v[0], _oldViewport.v[1], _oldViewport.v[2], _oldViewport.v[3]);
-//	} globalSortOrder:NSIntegerMax debugLabel:@"CCEffectNode: Restore FBO" threadSafe:NO];
-//	
-//	[_renderer popGroupWithDebugLabel:debugLabel globalSortOrder:0];
-}
-
--(void)visit
-{
-//    [self configureRender];
-//	NSAssert(_renderer, @"Cannot call [CCNode visit] without a currently bound renderer.");
-//    
-//	GLKMatrix4 projection; [_renderer.globalShaderUniforms[CCShaderUniformProjection] getValue:&projection];
-//	[self visit:_renderer parentTransform:&projection];
-}
-
 -(void)visit:(CCRenderer *)renderer parentTransform:(const GLKMatrix4 *)parentTransform
 {
 	// override visit.
@@ -173,83 +138,42 @@ -(void)visit:(CCRenderer *)renderer parentTransform:(const GLKMatrix4 *)parentTr
 	_orderOfArrival = 0;
 }
 
--(void)configureRender
-{
-//    // bind renderer
-//    _renderer = [CCRenderer currentRenderer];
-//	
-//	if(_renderer == nil)
-//    {
-//		_renderer = [[CCRenderer alloc] init];
-//		
-//		NSMutableDictionary *uniforms = [[CCDirector sharedDirector].globalShaderUniforms mutableCopy];
-//		uniforms[CCShaderUniformProjection] = [NSValue valueWithGLKMatrix4:_projection];
-//		#warning FIXME
-////		_renderer.globalShaderUniforms = uniforms;
-//		
-//		[CCRenderer bindRenderer:_renderer];
-//		_privateRenderer = YES;
-//    }
-//    else if(_privateRenderer == NO)
-//    {
-//		_oldGlobalUniforms = _renderer.globalShaderUniforms;
-//		
-//		NSMutableDictionary *uniforms = [_oldGlobalUniforms mutableCopy];
-//		uniforms[CCShaderUniformProjection] = [NSValue valueWithGLKMatrix4:_projection];
-//		#warning FIXME
-////		_renderer.globalShaderUniforms = uniforms;
-//	}
-}
-
 -(void)draw:(CCRenderer *)renderer transform:(const GLKMatrix4 *)transform
 {
-//    [self configureRender];
-//
-//    NSAssert(_renderer == renderer, @"CCEffectNode error!");
-//
-//    // Render children of this effect node into an FBO for use by the
-//    // remainder of the effects.
-//    [self begin];
-//
-//    [_renderer enqueueClear:self.clearFlags color:_clearColor depth:self.clearDepth stencil:self.clearStencil globalSortOrder:NSIntegerMin];
-//    
-//    //! make sure all children are drawn
-//    [self sortAllChildren];
-//    
-//    for(CCNode *child in _children){
-//        if( child != _sprite) [child visit:renderer parentTransform:&_projection];
-//    }
-//    [self endWithDebugLabel:@"CCEffectNode: Pre-render pass"];
-//
-//    // Done pre-render
-//    
-//    if (_effect)
-//    {
-//        _effectRenderer.contentSize = self.contentSizeInPoints;
-//        if ([_effect prepareForRendering] == CCEffectPrepareSuccess)
-//        {
-//            // Preparing an effect for rendering can modify its uniforms
-//            // dictionary which means we need to reinitialize our copy of the
-//            // uniforms.
-//            [self updateShaderUniformsFromEffect];
-//        }
-//        [_effectRenderer drawSprite:_sprite withEffect:_effect uniforms:_shaderUniforms renderer:_renderer transform:transform];
-//    }
-//    else
-//    {
-//        _sprite.anchorPoint = ccp(0.0f, 0.0f);
-//        _sprite.position = ccp(0.0f, 0.0f);
-//        [_sprite visit:_renderer parentTransform:transform];
-//    }
-//    
-////    if(_privateRenderer == NO)
-////			;
-////			#warning FIXME
-//////        _renderer.globalShaderUniforms = _oldGlobalUniforms;
-////    else
-////        [CCRenderer bindRenderer:nil];
-//
-//    _renderer = nil;
+    // Render children of this effect node into an FBO for use by the
+    // remainder of the effects.
+    CCRenderer *rtRenderer = [self begin];
+
+    [rtRenderer enqueueClear:self.clearFlags color:_clearColor depth:self.clearDepth stencil:self.clearStencil globalSortOrder:NSIntegerMin];
+    
+    //! make sure all children are drawn
+    [self sortAllChildren];
+    
+    for(CCNode *child in _children){
+        if( child != _sprite) [child visit:rtRenderer parentTransform:&_projection];
+    }
+    [self end];
+
+    // Done pre-render
+    
+    if (_effect)
+    {
+        _effectRenderer.contentSize = self.contentSizeInPoints;
+        if ([_effect prepareForRendering] == CCEffectPrepareSuccess)
+        {
+            // Preparing an effect for rendering can modify its uniforms
+            // dictionary which means we need to reinitialize our copy of the
+            // uniforms.
+            [self updateShaderUniformsFromEffect];
+        }
+        [_effectRenderer drawSprite:_sprite withEffect:_effect uniforms:_shaderUniforms renderer:renderer transform:transform];
+    }
+    else
+    {
+        _sprite.anchorPoint = ccp(0.0f, 0.0f);
+        _sprite.position = ccp(0.0f, 0.0f);
+        [_sprite visit:renderer parentTransform:transform];
+    }
 }
 
 - (void)updateShaderUniformsFromEffect

cocos2d/CCRendererBasicTypes_Private.h

@@ -116,11 +116,10 @@ CCGraphicsBufferPushElements(CCGraphicsBuffer *buffer, size_t requestedCount)
 @end
 
 
-@interface CCFrameBufferObject : NSObject {
-	CCTexture *_texture;
-}
+@interface CCFrameBufferObject : NSObject
 
 // Setters should be treated as protected.
+@property(nonatomic, readonly) CCTexture *texture;
 @property(nonatomic, assign) CGSize sizeInPixels;
 @property(nonatomic, assign) CGFloat contentScale;