Commit 5a34d05c authored by Gaëtan Renaudeau's avatar Gaëtan Renaudeau

Merge branch 'android'

parents a7231c69 06f68f66
...@@ -50,20 +50,17 @@ class AdvancedEffects extends React.Component { ...@@ -50,20 +50,17 @@ class AdvancedEffects extends React.Component {
return ( return (
<View style={styles.root}> <View style={styles.root}>
{/*
<Banner <Banner
time={time} time={time}
width={viewportW} width={viewportW}
height={viewportH - introH - imgH - transitionH} height={viewportH - introH - imgH - transitionH}
/> />
*/}
<Intro <Intro
time={time} time={time}
fps={frames/time} fps={frames/time}
width={viewportW} width={viewportW}
height={introH} height={introH}
/> />
{/*
<Vignette <Vignette
time={time} time={time}
width={imgW} width={imgW}
...@@ -79,8 +76,6 @@ class AdvancedEffects extends React.Component { ...@@ -79,8 +76,6 @@ class AdvancedEffects extends React.Component {
pauseDuration={0.5} pauseDuration={0.5}
transitionDuration={1.5} transitionDuration={1.5}
/> />
*/}
</View> </View>
); );
} }
......
{ {
"name": "gl-react-native", "name": "gl-react-native",
"version": "1.2.7", "version": "1.3.0",
"description": "OpenGL bindings for react-native to implement complex effects over images and components, in the descriptive VDOM paradigm", "description": "OpenGL bindings for react-native to implement complex effects over images and components, in the descriptive VDOM paradigm",
"repository": { "repository": {
"type": "git", "type": "git",
......
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