diff --git a/README.md b/README.md index e15bcc93abc9739d4db500313c28394325d88deb..5634fbe1f71d0ba04edb99b7be3d9d77cb23cd54 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ **[Gitbook documentation](http://projectseptemberinc.gitbooks.io/gl-react/content/) / [Github](https://github.com/ProjectSeptemberInc/gl-react-native/) / [gl-react](https://github.com/ProjectSeptemberInc/gl-react/)** / [#gl-react on reactiflux](https://discordapp.com/channels/102860784329052160/106102146109325312) -# icon gl-react-native ![](https://img.shields.io/badge/react--native-%200.21.x-05F561.svg) ![](https://img.shields.io/badge/gl--react-%202.2.x-05F561.svg) +# icon gl-react-native ![](https://img.shields.io/badge/react--native-%200.25.x-05F561.svg) ![](https://img.shields.io/badge/gl--react-%202.2.x-05F561.svg) OpenGL bindings for React Native to implement complex effects over images and components, in the descriptive VDOM paradigm. @@ -50,7 +50,7 @@ import com.projectseptember.RNGL.RNGLPackage; @Override protected List getPackages() { return Arrays.asList( - new MainReactPackage(), + new MainReactPackage(), ... new RNGLPackage() ); diff --git a/RNGL.podspec b/RNGL.podspec index 89827ccd73a62bfb768144504e99c616f73125ce..1fd74deb90977074d5c1c738ae05a5687ff8276c 100644 --- a/RNGL.podspec +++ b/RNGL.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "RNGL" - s.version = "2.24.0" + s.version = "2.25.0" s.homepage = "https://github.com/ProjectSeptemberInc/gl-react-native" s.platform = :ios, "8.0" s.source = { :git => "https://github.com/ProjectSeptemberInc/gl-react-native.git" } diff --git a/example/.flowconfig b/example/.flowconfig index cbd07856baee1bb3ab2e1a8f72b8008eda51444c..f4e32c6356c3726d57731a1452caeaa91d5dff7f 100644 --- a/example/.flowconfig +++ b/example/.flowconfig @@ -22,7 +22,7 @@ .*/node_modules/fbjs/lib/crc32.js .*/node_modules/fbjs/lib/ErrorUtils.js -# Flow has a built-in definition for the 'react' module which we prefer to use +# Flow has a built-in definition for the "react" module which we prefer to use # over the currently-untyped source .*/node_modules/react/react.js .*/node_modules/react/lib/React.js diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj index a146101862f12b38c5539f4d02a3b50d0cf9eba4..e006a937449001a41ea0b7f689dd5fdc7b9c488c 100644 --- a/example/ios/example.xcodeproj/project.pbxproj +++ b/example/ios/example.xcodeproj/project.pbxproj @@ -23,7 +23,7 @@ 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 3469C4C71C723AD300AE6E0E /* libRCTMaterialKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3469C4C61C723AC400AE6E0E /* libRCTMaterialKit.a */; }; 3469C4C81C723AD300AE6E0E /* libRNFS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3469C4C01C723ABC00AE6E0E /* libRNFS.a */; }; - 3469C4C91C723AD300AE6E0E /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3469C4BA1C723AB400AE6E0E /* libRNGL.a */; }; + 34BA81381CEDCC6100FCF175 /* libRNGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3469C4BA1C723AB400AE6E0E /* libRNGL.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; /* End PBXBuildFile section */ @@ -167,9 +167,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 34BA81381CEDCC6100FCF175 /* libRNGL.a in Frameworks */, 3469C4C71C723AD300AE6E0E /* libRCTMaterialKit.a in Frameworks */, 3469C4C81C723AD300AE6E0E /* libRNFS.a in Frameworks */, - 3469C4C91C723AD300AE6E0E /* libRNGL.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, diff --git a/example/package.json b/example/package.json index 593706b9fe45db1d4a062f3a1fa849feb66867c1..95d7191642f916eb9c04970b33c903eb755e2ff3 100644 --- a/example/package.json +++ b/example/package.json @@ -7,15 +7,14 @@ }, "dependencies": { "crypto": "0.0.3", - "fbjs": "^0.6.1", "gl-react": "^2.2.0", "gl-react-blur": "^1.2.2", "gl-react-native": "file:..", "glsl-transitions": "^2016.2.15", - "react": "^0.14.7", - "react-native": "^0.24.0", - "react-native-fs": "^1.2.0", - "react-native-material-kit": "^0.3.0", + "react": "^0.14.8", + "react-native": "^0.25.1", + "react-native-fs": "^1.4.0", + "react-native-material-kit": "PyYoshi/react-native-material-kit#rn-0.25.1", "react-transform-hmr": "^1.0.2", "seedrandom": "gre/seedrandom#released" } diff --git a/example/src/AdvancedEffects/Banner.js b/example/src/AdvancedEffects/Banner.js index 179c1922cf3efff0369b864beb50f19aee78a64b..5af5f9373886c47823c13abc300daf282744bdc5 100644 --- a/example/src/AdvancedEffects/Banner.js +++ b/example/src/AdvancedEffects/Banner.js @@ -1,4 +1,4 @@ -import React from "react-native"; +import React from "react"; import GL from "gl-react"; import {Surface} from "gl-react-native"; const shaders = GL.Shaders.create({ diff --git a/example/src/AdvancedEffects/Intro.js b/example/src/AdvancedEffects/Intro.js index b68b3a395f25b6be4ed0d44a36d3e40d4350416a..8494efefdde115fd73d36d73fe12d0f0ee3a3d13 100644 --- a/example/src/AdvancedEffects/Intro.js +++ b/example/src/AdvancedEffects/Intro.js @@ -1,8 +1,8 @@ -import React from "react-native"; -const { +import React from "react"; +import { View, Text, -} = React; +} from "react-native"; import GL from "gl-react"; import {Surface} from "gl-react-native"; diff --git a/example/src/AdvancedEffects/Slideshow.js b/example/src/AdvancedEffects/Slideshow.js index 19d335ceb827ebf334495b65f9ee2cc87ec3cadf..51a7c680be3ed87e7e114cc7850d9dadb834eec8 100644 --- a/example/src/AdvancedEffects/Slideshow.js +++ b/example/src/AdvancedEffects/Slideshow.js @@ -1,4 +1,5 @@ -import React, { View, Text, StyleSheet } from "react-native"; +import React from "react"; +import {View, Text, StyleSheet} from "react-native"; import GL from "gl-react"; import {Surface} from "gl-react-native"; import TransitionGenerator from "./TransitionGenerator"; diff --git a/example/src/AdvancedEffects/Transition.js b/example/src/AdvancedEffects/Transition.js index 8e507b40cc362552dd72028dafff29ecaa11e794..1e1bb329131bb089eaa6f37095408c4a93a8ec6f 100644 --- a/example/src/AdvancedEffects/Transition.js +++ b/example/src/AdvancedEffects/Transition.js @@ -1,9 +1,10 @@ -import React from "react-native"; +import {PixelRatio} from "react-native"; +import React from "react"; import GL from "gl-react"; module.exports = GL.createComponent( ({ width, height, shader, progress, from, to, uniforms }) => { - const scale = React.PixelRatio.get(); + const scale = PixelRatio.get(); return UIManager.measure( - React.findNodeHandle(this.refs.surface), + findNodeHandle(this.refs.surface), (a, b, w, h, x, y) => this.setState({ pressed: 1, diff --git a/example/src/Simple/index.js b/example/src/Simple/index.js index 6fa741c5776072a67c6973a29d8911a16fc4095e..8aa63ca14344566091e0be01d640bb3573aa6d92 100644 --- a/example/src/Simple/index.js +++ b/example/src/Simple/index.js @@ -1,12 +1,5 @@ -import React, { - StyleSheet, - Text, - View, - Image, - TextInput, - Component, - TouchableOpacity, -} from "react-native"; +import React, {Component} from "react"; +import {StyleSheet, Text, View, Image, TextInput, TouchableOpacity} from "react-native"; import { Surface } from "gl-react-native"; diff --git a/example/src/Tests/NativeLayer.js b/example/src/Tests/NativeLayer.js index 2b8908412b5aadf6ef66bc55b424c4da4bf90c0b..376f5b6c9f2d6d6b011f2ef3279f8e337fb14650 100644 --- a/example/src/Tests/NativeLayer.js +++ b/example/src/Tests/NativeLayer.js @@ -1,4 +1,5 @@ -import React, { View } from "react-native"; +import React from "react"; +import {View} from "react-native"; class NativeLayer extends React.Component { render () { diff --git a/example/src/Tests/index.js b/example/src/Tests/index.js index 70db20bb5998f808edb8b3ca57778a47d3e934cb..e42bcae2eddfee023bda3792a5a107e3de880b44 100644 --- a/example/src/Tests/index.js +++ b/example/src/Tests/index.js @@ -1,9 +1,5 @@ -import React, { - Text, - View, - ScrollView, - Image, -} from "react-native"; +import React from "react"; +import {Text, View, ScrollView, Image} from "react-native"; import {Surface} from "gl-react-native"; import {Blur} from "gl-react-blur"; import Add from "./Add"; diff --git a/example/src/index.js b/example/src/index.js index b80079d68cc49e4cb51c2f5fd272d6062b0486b6..56b99fa55bedd46fe256d56f0c2815bacaf95ec1 100644 --- a/example/src/index.js +++ b/example/src/index.js @@ -1,13 +1,5 @@ -import React, { - StyleSheet, - Component, - View, - PropTypes, - Text, - TouchableOpacity, - Navigator, - AsyncStorage, -} from "react-native"; +import React, {Component, PropTypes} from "react"; +import {StyleSheet, View, Text, TouchableOpacity, Navigator, AsyncStorage} from "react-native"; const screens = { Simple: require("./Simple"), diff --git a/src/GLCanvas.captureFrame.android.js b/src/GLCanvas.captureFrame.android.js index 2c24195d3e51adacd1d92b1d10e3a96e9a11eee2..bdbabbd88eb850ae8a6b6b47f1e1e1da74e38f31 100644 --- a/src/GLCanvas.captureFrame.android.js +++ b/src/GLCanvas.captureFrame.android.js @@ -7,7 +7,7 @@ invariant(GLCanvas, Make sure you have properly configured it. See README install instructions. -React.NativeModules.UIManager.GLCanvas is %s`, GLCanvas); +NativeModules.UIManager.GLCanvas is %s`, GLCanvas); const {Commands} = GLCanvas; module.exports = (handle, config) => UIManager.dispatchViewManagerCommand(handle, Commands.captureFrame, [ config ]); diff --git a/src/GLCanvas.captureFrame.ios.js b/src/GLCanvas.captureFrame.ios.js index fac4a0da835c68aa0b4acc0564f6f9bcd1951838..a8f8387d397016fb168205fe7897214a0ed83e37 100644 --- a/src/GLCanvas.captureFrame.ios.js +++ b/src/GLCanvas.captureFrame.ios.js @@ -1,13 +1,11 @@ import invariant from "invariant"; -import React from "react-native"; -const { - NativeModules: { GLCanvasManager } -} = React; +import { NativeModules } from "react-native"; +const { GLCanvasManager } = NativeModules; invariant(GLCanvasManager, `gl-react-native: the native module is not available. Make sure you have properly configured it. See README install instructions. -React.NativeModules.GLCanvasManager is %s`, GLCanvasManager); +NativeModules.GLCanvasManager is %s`, GLCanvasManager); module.exports = (handle, config) => GLCanvasManager.capture(handle, config); diff --git a/src/GLCanvas.js b/src/GLCanvas.js index 46969913a8f41d750ddfac934b33f7bf6f0737f5..1297b9eb41cb49d90567b5d820acc59c596c2c2d 100644 --- a/src/GLCanvas.js +++ b/src/GLCanvas.js @@ -1,8 +1,6 @@ import invariant from "invariant"; -import React, { - Component, - requireNativeComponent, -} from "react-native"; +import React, {Component} from "react"; +import {requireNativeComponent, findNodeHandle} from "react-native"; import defer from "promise-defer"; import captureFrame from "./GLCanvas.captureFrame"; @@ -36,7 +34,7 @@ class GLCanvas extends Component { _addPendingCaptureFrame (config) { const key = serializeOption(config); return this._pendingCaptureFrame[key] || ( - (captureFrame(React.findNodeHandle(this.refs.native), config), + (captureFrame(findNodeHandle(this.refs.native), config), this._pendingCaptureFrame[key] = defer()) ); } diff --git a/src/Surface.js b/src/Surface.js index 79b279c1bb6bc4c8bc6c7ba859fcc47ccfa2e5da..88f95a81ce0e4d0346be244e5cbe8c361ef6c50f 100644 --- a/src/Surface.js +++ b/src/Surface.js @@ -1,9 +1,7 @@ import invariant from "invariant"; import {createSurface} from "gl-react"; -import React, { - View, - PixelRatio -} from "react-native"; +import React from "react"; +import {View, PixelRatio} from "react-native"; import GLCanvas from "./GLCanvas"; invariant(typeof createSurface === "function", diff --git a/src/index.js b/src/index.js index 7dcbe040cf474912badb337d9a256ff794ef1a79..436871ffa22aecc7ea51672f126bcbcda0e69f85 100644 --- a/src/index.js +++ b/src/index.js @@ -8,7 +8,7 @@ invariant(RNGLContext, Make sure you have properly configured it. See README install instructions. -React.NativeModules.RNGLContext is %s`, RNGLContext); +NativeModules.RNGLContext is %s`, RNGLContext); // Hook Shaders to RNGLContext Shaders.setImplementation({