From 06ac7c0f45704c398e4133ed99ddc037e6548c1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Fri, 27 Nov 2015 18:22:24 +0100 Subject: [PATCH] Fixes #30 --- ios/GLCanvasManager.m | 17 +++++++++++++++++ ios/GLFBO.m | 8 ++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/ios/GLCanvasManager.m b/ios/GLCanvasManager.m index cc41340..5ca3543 100644 --- a/ios/GLCanvasManager.m +++ b/ios/GLCanvasManager.m @@ -29,6 +29,23 @@ RCT_EXPORT_VIEW_PROPERTY(onLoad, BOOL); RCT_EXPORT_VIEW_PROPERTY(onProgress, BOOL); RCT_EXPORT_VIEW_PROPERTY(onChange, BOOL); +/* TODO + + RCT_EXPORT_METHOD(capture: + (nonnull NSNumber *)reactTag + callback:(RCTResponseSenderBlock)callback) + { + + UIView *view = [self.bridge.uiManager viewForReactTag:reactTag]; + if ([view isKindOfClass:[GLCanvas class]]) { + [((GLCanvas*)view) capture: callback]; + } + else { + callback(@[@"view is not a GLCanvas"]); + } + } + */ + - (UIView *)view { GLCanvas * v; diff --git a/ios/GLFBO.m b/ios/GLFBO.m index 2a0e6ac..1c73c21 100644 --- a/ios/GLFBO.m +++ b/ios/GLFBO.m @@ -32,8 +32,8 @@ - (void)restore { glBindFramebuffer(GL_FRAMEBUFFER, _fbo); - glBindRenderbuffer(GL_FRAMEBUFFER, _rbo); - glBindTexture(GL_FRAMEBUFFER, _tex); + glBindRenderbuffer(GL_RENDERBUFFER, _rbo); + glBindTexture(GL_TEXTURE_2D, _tex); } @end @@ -128,8 +128,8 @@ GLuint initRenderBuffer (float width, float height, GLuint component, GLuint att if (width == _width && height == _height) return; GLint maxFBOSize; glGetIntegerv(GL_MAX_RENDERBUFFER_SIZE, &maxFBOSize); - if( _width < 0 || _width > maxFBOSize || - _height < 0 || _height > maxFBOSize) { + if( width < 0 || width > maxFBOSize || + height < 0 || height > maxFBOSize) { RCTLogError(@"Can't resize framebuffer. Invalid dimensions"); return; } -- 2.26.2