From aeca457276103e0bda23daeb0bdad00c356c9509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Sat, 22 Aug 2015 23:21:32 +0200 Subject: [PATCH] allow images src to be described by only an URL --- Examples/AdvancedEffects/src/index.js | 2 +- RNGL/GLView.m | 11 ++++++++--- docs/api/View.md | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Examples/AdvancedEffects/src/index.js b/Examples/AdvancedEffects/src/index.js index c06a262..3bc33dc 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 acf8355..71d42f6 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 e14d375..9995919 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. -- 2.26.2