diff --git a/Examples/AdvancedEffects/package.json b/Examples/AdvancedEffects/package.json
index 15135c74bd52190fad7cee1c27d5098a4f4de588..bb1bfcdbce742dcb14c1d952f6605c53142c333b 100644
--- a/Examples/AdvancedEffects/package.json
+++ b/Examples/AdvancedEffects/package.json
@@ -7,6 +7,7 @@
},
"dependencies": {
"gl-react-native": "file:../..",
+ "gl-react-core": "file:../../../gl-react-core",
"glsl-transitions": "^2015.11.8",
"react-native": "^0.14.2"
}
diff --git a/Examples/AdvancedEffects/src/Banner.js b/Examples/AdvancedEffects/src/Banner.js
index e05bab690e50a19bbe04ff4b1f6c8152b1263a6c..7e8edc7341c66b1602e65ca97c2cf5b3ba9e5941 100644
--- a/Examples/AdvancedEffects/src/Banner.js
+++ b/Examples/AdvancedEffects/src/Banner.js
@@ -1,6 +1,6 @@
const React = require("react-native");
-
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
+const {Surface} = require("gl-react-native");
const shaders = GL.Shaders.create({
banner: {
frag: `
@@ -27,13 +27,9 @@ void main( void ) {
class Banner extends React.Component {
render () {
const { width, height, time } = this.props;
- return ;
+ return
+
+ ;
}
}
diff --git a/Examples/AdvancedEffects/src/Intro.js b/Examples/AdvancedEffects/src/Intro.js
index dc243e9c5e7a098d07fc8d7ce68f95deb357df52..e5d69912ac6a657309bddef53de821ac478859a8 100644
--- a/Examples/AdvancedEffects/src/Intro.js
+++ b/Examples/AdvancedEffects/src/Intro.js
@@ -3,8 +3,8 @@ const {
View,
Text,
} = React;
-
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
+const {Surface} = require("gl-react-native");
const shaders = GL.Shaders.create({
drunkEffect: {
@@ -40,38 +40,37 @@ void main() {
class Intro extends React.Component {
render () {
const { time, fps, width, height } = this.props;
- return
-
-
-
- GL REACT NATIVE
-
-
-
-
- {time.toFixed(2)}s
-
-
- {(fps).toFixed(0)} fps
-
-
- {""}
+ return
+
+
+
+
+ GL REACT NATIVE
+
+
+
+ {time.toFixed(2)}s
+
+
+ {(fps).toFixed(0)} fps
+
+
+ {""}
+
+
-
-
- ;
+
+
+ ;
}
}
diff --git a/Examples/AdvancedEffects/src/Slideshow.js b/Examples/AdvancedEffects/src/Slideshow.js
index 32744d0fcdf81beecf5496fba81cc186653c7888..22ee0d094edef232fddc409d336969388334d332 100644
--- a/Examples/AdvancedEffects/src/Slideshow.js
+++ b/Examples/AdvancedEffects/src/Slideshow.js
@@ -1,6 +1,7 @@
const React = require("react-native");
const { View, Text, StyleSheet } = React;
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
+const {Surface} = require("gl-react-native");
const TransitionGenerator = require("./TransitionGenerator");
const Transition = require("./Transition");
@@ -33,15 +34,15 @@ class Slideshow extends React.Component {
const transitionUniforms = this._uniforms;
return
-
+
+
+
{transitionName}
(GLSL.io)
diff --git a/Examples/AdvancedEffects/src/Transition.js b/Examples/AdvancedEffects/src/Transition.js
index cfe273a72cba4b704c28b0185e9bb067478231bb..29f1dab6ef8a45ae706e00dd9392f88d0cfee804 100644
--- a/Examples/AdvancedEffects/src/Transition.js
+++ b/Examples/AdvancedEffects/src/Transition.js
@@ -1,10 +1,10 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
module.exports = GL.createComponent(
({ width, height, shader, progress, from, to, uniforms }) => {
const scale = React.PixelRatio.get();
- return true}
- onMoveShouldSetResponder={() => true}
- onResponderMove={this.onResponderMove}
- shader={shaders.imageVignette}
+ return ;
+ preload
+ onStartShouldSetResponder={() => true}
+ onMoveShouldSetResponder={() => true}
+ onResponderMove={this.onResponderMove}>
+
+ ;
}
}
diff --git a/Examples/AdvancedEffects/src/index.js b/Examples/AdvancedEffects/src/index.js
index 46ad8f249ee1bb095f1d384c43e8a97886d65c4a..d9bae7f9be52d83fc91631eb678fc7905a088355 100644
--- a/Examples/AdvancedEffects/src/index.js
+++ b/Examples/AdvancedEffects/src/index.js
@@ -1,3 +1,4 @@
+require("gl-react-core/react-native");
const React = require("react-native");
const {
StyleSheet,
@@ -61,6 +62,7 @@ class AdvancedEffects extends React.Component {
width={viewportW}
height={introH}
/>
+
;
+ return
+
+ ;
}
}
diff --git a/Examples/Simple/src/Blur.js b/Examples/Simple/src/Blur.js
index 234c0cc7b676d6e45c24121046488b75140428c1..aa0d88fa3a91e0bc8b09062b64b3a003fcfdd159 100644
--- a/Examples/Simple/src/Blur.js
+++ b/Examples/Simple/src/Blur.js
@@ -1,5 +1,5 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
const Blur1D = require("./Blur1D");
module.exports = GL.createComponent(({ width, height, factor, children }) =>
diff --git a/Examples/Simple/src/Blur1D.js b/Examples/Simple/src/Blur1D.js
index b9a73371d60a83560d2b0d4bb9e5a37cff74a6bb..fe2514efe16f1e3bea9138fd29800ce4192c1e8b 100644
--- a/Examples/Simple/src/Blur1D.js
+++ b/Examples/Simple/src/Blur1D.js
@@ -1,5 +1,5 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
const shaders = GL.Shaders.create({
blur1D: {
@@ -35,7 +35,7 @@ void main () {
module.exports = GL.createComponent(
({ width, height, direction, children }) =>
-
{children}
-
+
, {
displayName: "Blur1D"
});
diff --git a/Examples/Simple/src/HelloGL.js b/Examples/Simple/src/HelloGL.js
index 30ac478d37ca26fbf3ee3793623dc4698acee7ad..66bb819f7ac01b13643b6f1a1681c35f71cc4ea1 100644
--- a/Examples/Simple/src/HelloGL.js
+++ b/Examples/Simple/src/HelloGL.js
@@ -1,5 +1,5 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
const shaders = GL.Shaders.create({
helloGL: {
@@ -14,11 +14,7 @@ void main () { // This function is called FOR EACH PIXEL
}
});
-module.exports = GL.createComponent(({ width, height }) =>
- ,
+module.exports = GL.createComponent(() =>
+ ,
{ displayName: "HelloGL" }
);
diff --git a/Examples/Simple/src/HueRotate.js b/Examples/Simple/src/HueRotate.js
index cc1e0d26148a7649b9d1ae14c1fed08f550e2cf2..7a799fa19fa798fdb09676e588ce5932c4dd161b 100644
--- a/Examples/Simple/src/HueRotate.js
+++ b/Examples/Simple/src/HueRotate.js
@@ -1,5 +1,5 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
const shaders = GL.Shaders.create({
hueRotate: {
@@ -26,10 +26,10 @@ void main() {
module.exports = GL.createComponent(
({ hue, children, ...rest }) =>
-
{children}
-
+
, { displayName: "HueRotate" });
diff --git a/Examples/Simple/src/OneFingerResponse.js b/Examples/Simple/src/OneFingerResponse.js
index 3f360311eb32d49ecad9850baaaecc65cfc300ce..b1f3e6dac8aef9671749b8fdce0561cda80a81b5 100644
--- a/Examples/Simple/src/OneFingerResponse.js
+++ b/Examples/Simple/src/OneFingerResponse.js
@@ -1,5 +1,6 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
+const {Surface} = require("gl-react-native");
const shaders = GL.Shaders.create({
oneFingerResponse: {
@@ -55,7 +56,7 @@ class OneFingerResponse extends React.Component {
render () {
const { width, height } = this.props;
const { pressed, position } = this.state;
- return true}
onMoveShouldSetResponderCapture={() => true}
onResponderTerminationRequest={() => false}
@@ -64,10 +65,12 @@ class OneFingerResponse extends React.Component {
onResponderRelease={this.onTouchEnd}
onResponderTerminate={this.onTouchEnd}
width={width}
- height={height}
- shader={shaders.oneFingerResponse}
- uniforms={{ pressed, position }}
- />;
+ height={height}>
+
+ ;
}
}
diff --git a/Examples/Simple/src/PieProgress.js b/Examples/Simple/src/PieProgress.js
index 5435c5cc14e2e93f94a4f4e7b9c9601fc67a3306..f8037e6cdba51a116c578f98243eeb33a013a440 100644
--- a/Examples/Simple/src/PieProgress.js
+++ b/Examples/Simple/src/PieProgress.js
@@ -1,5 +1,5 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
const shaders = GL.Shaders.create({
pieProgress: {
@@ -41,11 +41,8 @@ module.exports = GL.createComponent(
colorOutside,
radius
}) =>
-
- this.setState({ current })} value={current}>
-
+
+
+
{captured && }
@@ -117,12 +123,12 @@ class Simple extends Component {
-
+
+
this.setState({ saturationFactor })}
@@ -130,15 +136,13 @@ class Simple extends Component {
-
-
- Throw me to the wolves
- {text}
-
+
+
+
+ Throw me to the wolves
+ {text}
+
+
this.setState({ hue })}
@@ -161,11 +165,9 @@ class Simple extends Component {
}}
source={{ uri: "http://i.imgur.com/qM9BHCy.jpg" }}/>
-
+
+
+
-
- http://i.imgur.com/3On9QEu.jpg
-
+
+
+ http://i.imgur.com/3On9QEu.jpg
+
+
this.setState({ factor })} />
-
-
+
-
- this.setState({ factor })}
- />
-
- this.setState({ switch1 })} />
- this.setState({ switch2 })} />
- this.setState({ switch3 })} />
-
-
+ factor={factor}>
+
+
+ this.setState({ factor })}
+ />
+
+ this.setState({ switch1 })} />
+ this.setState({ switch2 })} />
+ this.setState({ switch3 })} />
+
+
-
+
+
-
-
+
+
diff --git a/Examples/Tests/package.json b/Examples/Tests/package.json
index 4202c44cd905f5a16c5b2f3d7cf4886738de9c0e..dc88e9e23da6d6a190dc431d1af4ee87f1fcff50 100644
--- a/Examples/Tests/package.json
+++ b/Examples/Tests/package.json
@@ -7,7 +7,8 @@
},
"dependencies": {
"gl-react-native": "file:../..",
- "react-native": "^0.15.0"
+ "gl-react-core": "file:../../../gl-react-core",
+ "react-native": "^0.14.2"
},
"devDependencies": {
"react-native-cli": "^0.1.7"
diff --git a/Examples/Tests/src/Add.js b/Examples/Tests/src/Add.js
index 348abd7e6024167879bd2def5f80629604295dd3..2bc17581c4717595cfab9e5d3e83d8aae280c81f 100644
--- a/Examples/Tests/src/Add.js
+++ b/Examples/Tests/src/Add.js
@@ -1,5 +1,5 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
const shaders = GL.Shaders.create({
add: {
@@ -23,7 +23,7 @@ module.exports = GL.createComponent(
({ width, height, children }) => {
if (!children || children.length !== 2) throw new Error("You must provide 2 children to Add");
const [t1, t2] = children;
- return
-
{children}
-
+
, {
displayName: "Blur1D"
});
diff --git a/Examples/Tests/src/Copy.js b/Examples/Tests/src/Copy.js
index 85da29376448556b5353069f9fa6a75954298d5d..e6d7cedb853cbc844a8e4b6b503abc5ec53675af 100644
--- a/Examples/Tests/src/Copy.js
+++ b/Examples/Tests/src/Copy.js
@@ -1,5 +1,5 @@
const React = require("react-native");
-const GL = require("gl-react-native");
+const GL = require("gl-react-core");
const shaders = GL.Shaders.create({
Copy: {
@@ -23,7 +23,7 @@ void main () {
module.exports = GL.createComponent(
({ width, height, children: t, last, ...rest }) =>
-
- {
if (!children || children.length !== 2) throw new Error("You must provide 2 children to Layer");
const [t1, t2] = children;
- return {
if (!children || children.length !== 2) throw new Error("You must provide 2 children to Multiply");
const [t1, t2] = children;
- return
- )}
;
- const img = "http://i.imgur.com/zJIxPEo.jpg?t="+Date.now();
+ const img = "http://i.imgur.com/zJIxPEo.jpg";
const blurredImage =
@@ -68,22 +68,23 @@ class Tests extends React.Component {
;
return
-
-
- {txt}
- {helloGL}
-
-
-
-
- {blurredImageOverText}
- {helloGL}
-
-
- {blurredImage}
+
+
+
+ {txt}
+ {helloGL}
+
+
+
+
+ {blurredImageOverText}
+ {helloGL}
+
+
+ {blurredImage}
+
-
-
+
@@ -94,47 +95,40 @@ class Tests extends React.Component {
-
- http://i.imgur.com/mp79p5T.png
-
-
-
-
-
-
-
+
+
http://i.imgur.com/mp79p5T.png
-
+
-
-
+
+
http://i.imgur.com/mp79p5T.png
-
+
-
-
+
+
http://i.imgur.com/mp79p5T.png
-
+
-
+
@@ -144,28 +138,35 @@ class Tests extends React.Component {
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+ http://i.imgur.com/mp79p5T.png
+
+
+
+
+
+
-
+
-
+
@@ -173,42 +174,62 @@ class Tests extends React.Component {
-
-
+
+
-
- http://i.imgur.com/S22HNaU.png
-
+
-
-
+
+
-
- http://i.imgur.com/mp79p5T.png
-
-
-
-
+
+
+
+
+
+
+
+ http://i.imgur.com/S22HNaU.png
+
+
+
+
+
+
-
- http://i.imgur.com/mp79p5T.png
-
-
-
-
- http://i.imgur.com/S22HNaU.png
-
-
-
-
-
+
+
+ http://i.imgur.com/mp79p5T.png
+
+
+
+
+
+
+
+
+
+
+
+ http://i.imgur.com/mp79p5T.png
+
+
+
+
+ http://i.imgur.com/S22HNaU.png
+
+
+
+
+
+