Skip to content

G
gl-react-native-v2
Commit 813c4516 authored by Gaëtan Renaudeau's avatar Gaëtan Renaudeau
Browse files
Options

Fixes #25: replace GLShadersRegistry singleton by RNGLContext bridge 

This fix livereload issues with a more robust and react-native' compliant approach
for holding contextual gl context and shaders via the bridge.
parent d9dcbf35
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 39 deletions
RNGL.xcodeproj/project.pbxproj
View file @ 813c4516
......@@ -16,9 +16,9 @@
34D202A31B8DDDEF000A6FB5 /* GLFBO.m in Sources */ = {isa = PBXBuildFile; fileRef = 34D202A21B8DDDEF000A6FB5 /* GLFBO.m */; };
34EA054A1B82179E00A4FAFF /* GLImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EA053B1B82179E00A4FAFF /* GLImage.m */; };
34EA054B1B82179E00A4FAFF /* GLShader.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EA053D1B82179E00A4FAFF /* GLShader.m */; };
34EA054C1B82179E00A4FAFF /* GLShadersRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EA053F1B82179E00A4FAFF /* GLShadersRegistry.m */; };
34EA054D1B82179E00A4FAFF /* GLTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EA05411B82179E00A4FAFF /* GLTexture.m */; };
34EA05511B82179E00A4FAFF /* GLImageData.m in Sources */ = {isa = PBXBuildFile; fileRef = 34EA05491B82179E00A4FAFF /* GLImageData.m */; };
34F489BE1BEB8DC400148438 /* RNGLContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34F489BD1BEB8DC400148438 /* RNGLContext.m */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -63,12 +63,12 @@
34EA053B1B82179E00A4FAFF /* GLImage.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = GLImage.m; sourceTree = "<group>"; tabWidth = 2; };
34EA053C1B82179E00A4FAFF /* GLShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLShader.h; sourceTree = "<group>"; };
34EA053D1B82179E00A4FAFF /* GLShader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLShader.m; sourceTree = "<group>"; };
34EA053E1B82179E00A4FAFF /* GLShadersRegistry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLShadersRegistry.h; sourceTree = "<group>"; };
34EA053F1B82179E00A4FAFF /* GLShadersRegistry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLShadersRegistry.m; sourceTree = "<group>"; };
34EA05401B82179E00A4FAFF /* GLTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLTexture.h; sourceTree = "<group>"; };
34EA05411B82179E00A4FAFF /* GLTexture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLTexture.m; sourceTree = "<group>"; };
34EA05481B82179E00A4FAFF /* GLImageData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLImageData.h; sourceTree = "<group>"; };
34EA05491B82179E00A4FAFF /* GLImageData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLImageData.m; sourceTree = "<group>"; };
34F489BC1BEB8DC400148438 /* RNGLContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNGLContext.h; sourceTree = "<group>"; };
34F489BD1BEB8DC400148438 /* RNGLContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNGLContext.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -139,8 +139,8 @@
34EA05491B82179E00A4FAFF /* GLImageData.m */,
34EA053C1B82179E00A4FAFF /* GLShader.h */,
34EA053D1B82179E00A4FAFF /* GLShader.m */,
34EA053E1B82179E00A4FAFF /* GLShadersRegistry.h */,
34EA053F1B82179E00A4FAFF /* GLShadersRegistry.m */,
34F489BC1BEB8DC400148438 /* RNGLContext.h */,
34F489BD1BEB8DC400148438 /* RNGLContext.m */,
34EA05401B82179E00A4FAFF /* GLTexture.h */,
34EA05411B82179E00A4FAFF /* GLTexture.m */,
);
......@@ -251,8 +251,8 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
34F489BE1BEB8DC400148438 /* RNGLContext.m in Sources */,
34D202901B8DC278000A6FB5 /* RCTConvert+GLData.m in Sources */,
34EA054C1B82179E00A4FAFF /* GLShadersRegistry.m in Sources */,
34EA054A1B82179E00A4FAFF /* GLImage.m in Sources */,
34D2029F1B8DD2FC000A6FB5 /* GLRenderData.m in Sources */,
34EA054D1B82179E00A4FAFF /* GLTexture.m in Sources */,
......
RNGL/GLCanvas.h
View file @ 813c4516
......@@ -16,7 +16,6 @@
@property (nonatomic, assign) BOOL onLoad;
@property (nonatomic, assign) BOOL onChange;
- (instancetype)initWithBridge:(RCTBridge *)bridge
withContext:(EAGLContext *)context;
- (instancetype)initWithBridge:(RCTBridge *)bridge;
@end
RNGL/GLCanvas.m
View file @ 813c4516
......@@ -4,9 +4,9 @@
#import "RCTConvert.h"
#import "RCTEventDispatcher.h"
#import "RCTLog.h"
#import "RNGLContext.h"
#import "GLCanvas.h"
#import "GLShader.h"
#import "GLShadersRegistry.h"
#import "GLTexture.h"
#import "GLImage.h"
#import "GLRenderData.h"
......@@ -30,7 +30,7 @@ NSString* srcResource (id res)
@implementation GLCanvas
{
RCTBridge *_bridge; // bridge is required to instanciate GLReactImage
RCTBridge *_bridge;
GLRenderData *_renderData;
......@@ -52,7 +52,6 @@ NSString* srcResource (id res)
}
- (instancetype)initWithBridge:(RCTBridge *)bridge
withContext:(EAGLContext *)context
{
if ((self = [super init])) {
_bridge = bridge;
......@@ -60,7 +59,7 @@ NSString* srcResource (id res)
_preloaded = [[NSMutableArray alloc] init];
_preloadingDone = false;
_lastCaptureId = 0;
self.context = context;
self.context = [bridge.rnglContext getContext];
self.contentScaleFactor = RCTScreenScale();
}
return self;
......@@ -182,7 +181,7 @@ RCT_NOT_IMPLEMENTED(-init)
[children addObject:weak_traverseTree(child)];
}
GLShader *shader = [GLShadersRegistry getShader:data.shader];
GLShader *shader = [_bridge.rnglContext getShader:data.shader];
NSDictionary *uniformTypes = [shader uniformTypes];
NSMutableDictionary *uniforms = [[NSMutableDictionary alloc] init];
......@@ -210,7 +209,7 @@ RCT_NOT_IMPLEMENTED(-init)
}
else if ([type isEqualToString:@"fbo"]) {
NSNumber *id = [RCTConvert NSNumber:value[@"id"]];
GLFBO *fbo = [GLShadersRegistry getFBO:id];
GLFBO *fbo = [_bridge.rnglContext getFBO:id];
textures[uniformName] = fbo.color[0];
}
else if ([type isEqualToString:@"uri"]) {
......@@ -357,7 +356,7 @@ RCT_NOT_IMPLEMENTED(-init)
glViewport(0, 0, w, h);
}
else {
GLFBO *fbo = [GLShadersRegistry getFBO:[NSNumber numberWithInt:renderData.fboId]];
GLFBO *fbo = [_bridge.rnglContext getFBO:[NSNumber numberWithInt:renderData.fboId]];
[fbo setShapeWithWidth:w withHeight:h];
[fbo bind];
}
......
RNGL/GLCanvasManager.m
View file @ 813c4516
......@@ -4,8 +4,6 @@
#import "RCTLog.h"
#import <UIKit/UIKit.h>
#import "GLShadersRegistry.h"
@implementation GLCanvasManager
RCT_EXPORT_MODULE();
......@@ -34,7 +32,7 @@ RCT_EXPORT_VIEW_PROPERTY(onChange, BOOL);
- (UIView *)view
{
GLCanvas * v;
v = [[GLCanvas alloc] initWithBridge:self.bridge withContext:[GLShadersRegistry getContext]];
v = [[GLCanvas alloc] initWithBridge:self.bridge];
return v;
}
......
RNGL/GLShadersRegistry.h deleted 100644 → 0
View file @ d9dcbf35
#import <UIKit/UIKit.h>
#import "RCTBridgeModule.h"
#import "GLShader.h"
#import "GLFBO.h"
@interface GLShadersRegistry : NSObject <RCTBridgeModule>
/**
* Get the global shader for a given id.
*/
+ (GLShader*) getShader: (NSNumber *)id;
+ (GLFBO*) getFBO: (NSNumber *)id;
+ (EAGLContext *) getContext;
@property NSMutableDictionary *shaders;
@end
RNGL/RNGLContext.h 0 → 100644
View file @ 813c4516
#import <UIKit/UIKit.h>
#import "RCTBridge.h"
#import "GLShader.h"
#import "GLFBO.h"
@interface RNGLContext : NSObject <RCTBridgeModule>
- (GLShader*) getShader: (NSNumber *)id;
- (GLFBO*) getFBO: (NSNumber *)id;
- (EAGLContext *) getContext;
@end
@interface RCTBridge (RNGLContext)
@property (nonatomic, readonly) RNGLContext *rnglContext;
@end
RNGL/GLShadersRegistry.m → RNGL/RNGLContext.m
View file @ 813c4516
#import <UIKit/UIKit.h>
#import "RCTBridgeModule.h"
#import "RNGLContext.h"
#import "RCTConvert.h"
#import "RCTLog.h"
#import "GLShadersRegistry.h"
// FIXME: current context and fbos live here... this should be global somewhere else.
@implementation GLShadersRegistry
@implementation RNGLContext
{
NSMutableDictionary *_shaders;
EAGLContext *_context;
NSMutableDictionary *_fbos;
}
GLShadersRegistry *GLShadersRegistry_instance; // FIXME is that the proper way to do singleton?
RCT_EXPORT_MODULE();
+ (GLShader*) getShader: (NSNumber *)id
{
return [GLShadersRegistry_instance getShader:id];
}
+ (GLFBO *) getFBO: (NSNumber *)id
{
return [GLShadersRegistry_instance getFBO:id];
}
+ (EAGLContext *) getContext
{
return [GLShadersRegistry_instance getContext];
}
@synthesize bridge = _bridge;
// methods
RCT_EXPORT_MODULE()
- (instancetype)init
- (void)setBridge:(RCTBridge *)bridge
{
self = [super init];
if (self) {
_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
if (!_context) {
RCTLogError(@"Failed to initialize OpenGLES 2.0 context");
}
_shaders = @{}.mutableCopy;
_fbos = @{}.mutableCopy;
GLShadersRegistry_instance = self;
_context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
if (!_context) {
RCTLogError(@"Failed to initialize OpenGLES 2.0 context");
}
return self;
_shaders = @{}.mutableCopy;
_fbos = @{}.mutableCopy;
}
- (GLShader *) getShader: (NSNumber *)id
......@@ -73,7 +48,7 @@ RCT_EXPORT_MODULE();
static NSString* fullViewportVert = @"attribute vec2 position;varying vec2 uv;void main() {gl_Position = vec4(position,0.0,1.0);uv = vec2(0.5, 0.5) * (position+vec2(1.0, 1.0));}";
RCT_EXPORT_METHOD(register:(nonnull NSNumber *)id withConfig:(NSDictionary *)config) {
RCT_EXPORT_METHOD(addShader:(nonnull NSNumber *)id withConfig:(NSDictionary *)config) {
NSString *frag = [RCTConvert NSString:config[@"frag"]];
NSString *name = [RCTConvert NSString:config[@"name"]];
if (!frag) {
......@@ -85,3 +60,12 @@ RCT_EXPORT_METHOD(register:(nonnull NSNumber *)id withConfig:(NSDictionary *)con
}
@end
@implementation RCTBridge (RNGLContext)
- (RNGLContext *)rnglContext
{
return self.modules[RCTBridgeModuleNameForClass([RNGLContext class])];
}
@end
\ No newline at end of file
src/Shaders.js
View file @ 813c4516
const {createShaders} = require("gl-react-core");
const { NativeModules: { GLShadersRegistry } } = require("react-native");
const { NativeModules: { RNGLContext } } = require("react-native");
module.exports = createShaders(function (id, shader) {
GLShadersRegistry.register(id, shader);
RNGLContext.addShader(id, shader);
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment