diff --git a/Examples/AdvancedEffects/src/index.js b/Examples/AdvancedEffects/src/index.js index c06a26291d33251d19fa925313cf3c20182b76dc..3bc33dcac4d3d5c5833db82c8e21af630524e502 100644 --- a/Examples/AdvancedEffects/src/index.js +++ b/Examples/AdvancedEffects/src/index.js @@ -23,7 +23,7 @@ class AdvancedEffects extends React.Component { //"MQtLWbD,N8a9CkZ,adCmISK,AedZQ4N,y9qRJR3,brzKTYZ,NSyk07l,EaZiWfn,I1KZdnl,DoQBdzT,slIt2Ww,DA12puU,IYLdRFW,oqmO4Po,T6NaLyI,6XAPrAY,thYzbif,4qmqo3o,8xT2J96,ZCa2pWq,loQfDN2,oabfA68,uOXqDRY,MyyS4vK,fhNYTX4" "wxqlQkh,G2Whuq3,0bUSEBX,giP58XN,iKdXwVm,IvpoR40,zJIxPEo,CKlmtPs,fnMylHI,vGXYiYy,MnOB9Le,YqsZKgc,0BJobQo,Otbz312" .split(",") - .map(id => ({ uri: `http://imgur.com/${id}.jpg` })) + .map(id => `http://imgur.com/${id}.jpg`) }; StatusBarIOS.setHidden(true); diff --git a/RNGL/GLView.m b/RNGL/GLView.m index acf8355a2becbd2bf7f4da2503f5cc878cfa22d7..71d42f6d6ca2bcbe1c1fbca8e7237d1ba3862795 100644 --- a/RNGL/GLView.m +++ b/RNGL/GLView.m @@ -76,9 +76,14 @@ RCT_NOT_IMPLEMENTED(-init) NSString* srcResource (id res) { - BOOL isStatic = [RCTConvert BOOL:res[@"isStatic"]]; - NSString *src = [RCTConvert NSString:res[@"path"]]; - if (!src || isStatic) src = [RCTConvert NSString:res[@"uri"]]; + NSString *src; + if ([res isKindOfClass:[NSString class]]) { + src = [RCTConvert NSString:res]; + } else { + BOOL isStatic = [RCTConvert BOOL:res[@"isStatic"]]; + src = [RCTConvert NSString:res[@"path"]]; + if (!src || isStatic) src = [RCTConvert NSString:res[@"uri"]]; + } return src; } diff --git a/docs/api/View.md b/docs/api/View.md index e14d37576c3c0306fe09b69784927dd4c46f482b..99959191f5a71dcb435cd30db37967314869638d 100644 --- a/docs/api/View.md +++ b/docs/api/View.md @@ -67,7 +67,7 @@ render () { Here is the correspondance of GLSL and JavaScript types. - `int`, `float`, `bool` : Number (e.g: `42`). -- `sampler2D` : an object with an `uri` (`require("image!id")` is also supported), exactly like the `source` prop of `React.Image`. +- `sampler2D` : either the image URL (String) OR an Object with an `uri` (`require("image!id")` is also supported), exactly like the `source` prop of `React.Image`. - `vecN`,`ivecN`,`bvecN` where N is {2,3,4} : an array of N Number (e.g: `[1, 2, 3.5]` for a `vec3`) Complex struct types and uniform array **are not** currently supported.