changes with latest gl-react-core

Examples/Simple/iOS/AppDelegate.m

@@ -31,7 +31,7 @@
    * on the same Wi-Fi network.
    */
 
-  //jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle"];
+  jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle"];
 
   /**
    * OPTION 2
@@ -43,7 +43,7 @@
    * see http://facebook.github.io/react-native/docs/runningondevice.html
    */
 
-  jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+  //jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"Simple"

RNGL/GLCanvas.m

@@ -180,8 +180,14 @@ NSString* srcResource (id res)
         id value = [data.uniforms objectForKey:uniformName];
         GLenum type = [uniformTypes[uniformName] intValue];
         
-        if (value && (type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE)) {
+        if (type == GL_SAMPLER_2D || type == GL_SAMPLER_CUBE) {
           uniforms[uniformName] = [NSNumber numberWithInt:units++];
+          if (!value) {
+            GLTexture *emptyTexture = [[GLTexture alloc] init];
+            [emptyTexture setPixelsEmpty];
+            textures[uniformName] = emptyTexture;
+          }
+          else {
             NSString *type = [RCTConvert NSString:value[@"type"]];
             if ([type isEqualToString:@"content"]) {
               int id = [[RCTConvert NSNumber:value[@"id"]] intValue];
@@ -190,16 +196,15 @@ NSString* srcResource (id res)
               }
               textures[uniformName] = _contentTextures[id];
             }
-          else if ([type isEqualToString:@"framebuffer"]) {
+            else if ([type isEqualToString:@"fbo"]) {
               NSNumber *id = [RCTConvert NSNumber:value[@"id"]];
               GLFBO *fbo = [GLShadersRegistry getFBO:id];
               textures[uniformName] = fbo.color[0];
             }
-          else if ([type isEqualToString:@"image"]) {
-            NSObject *val = value[@"value"];
-            NSString *src = srcResource(val);
+            else if ([type isEqualToString:@"uri"]) {
+              NSString *src = srcResource(value);
               if (!src) {
-              RCTLogError(@"invalid uniform '%@' texture value '%@'", uniformName, value);
+                RCTLogError(@"texture uniform '%@': Invalid uri format '%@'", uniformName, value);
               }
               
               GLImage *image = images[src];
@@ -218,7 +223,8 @@ NSString* srcResource (id res)
               textures[uniformName] = [image getTexture];
             }
             else {
-            RCTLogError(@"invalid uniform '%@' value of type '%@'", uniformName, type);
+              RCTLogError(@"texture uniform '%@': Unexpected type '%@'", uniformName, type);
+            }
           }
         }
         else {

package.json

@@ -25,7 +25,7 @@
   "dependencies": {
     "invariant": "2.1.0",
     "react-native": ">=0.9.0 <0.12.0",
-    "gl-react-core": "1.0.0"
+    "gl-react-core": "git+ssh://git@github.com:ProjectSeptemberInc/gl-react-core.git"
   },
   "devDependencies": {
     "eslint": "^1.3.1",