Commit aeca4572 authored by Gaëtan Renaudeau's avatar Gaëtan Renaudeau

allow images src to be described by only an URL

parent d207c436
...@@ -23,7 +23,7 @@ class AdvancedEffects extends React.Component { ...@@ -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" //"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" "wxqlQkh,G2Whuq3,0bUSEBX,giP58XN,iKdXwVm,IvpoR40,zJIxPEo,CKlmtPs,fnMylHI,vGXYiYy,MnOB9Le,YqsZKgc,0BJobQo,Otbz312"
.split(",") .split(",")
.map(id => ({ uri: `http://imgur.com/${id}.jpg` })) .map(id => `http://imgur.com/${id}.jpg`)
}; };
StatusBarIOS.setHidden(true); StatusBarIOS.setHidden(true);
......
...@@ -76,9 +76,14 @@ RCT_NOT_IMPLEMENTED(-init) ...@@ -76,9 +76,14 @@ RCT_NOT_IMPLEMENTED(-init)
NSString* srcResource (id res) NSString* srcResource (id res)
{ {
BOOL isStatic = [RCTConvert BOOL:res[@"isStatic"]]; NSString *src;
NSString *src = [RCTConvert NSString:res[@"path"]]; if ([res isKindOfClass:[NSString class]]) {
if (!src || isStatic) src = [RCTConvert NSString:res[@"uri"]]; 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; return src;
} }
......
...@@ -67,7 +67,7 @@ render () { ...@@ -67,7 +67,7 @@ render () {
Here is the correspondance of GLSL and JavaScript types. Here is the correspondance of GLSL and JavaScript types.
- `int`, `float`, `bool` : Number (e.g: `42`). - `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`) - `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. Complex struct types and uniform array **are not** currently supported.
......
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