From b506c56061d003d25a246fa1d46cdbf280d44de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Tue, 4 Jul 2017 18:15:29 +0200 Subject: [PATCH] prettier pass: don't use es5 trailing comma --- package.json | 2 +- packages/gl-react-dom/src/GLViewDOM.js | 6 +-- packages/gl-react-dom/src/index.js | 2 +- .../src/ExponentGLObjectTextureLoader.js | 4 +- .../src/ExponentTextureLoader.js | 8 +-- packages/gl-react-expo/src/GLViewNative.js | 8 +-- packages/gl-react-expo/src/Image.js | 2 +- packages/gl-react-expo/src/index.js | 2 +- packages/gl-react-headless/src/index.js | 14 ++--- packages/gl-react-native/src/EXGLView.js | 12 ++--- packages/gl-react-native/src/GLImages.js | 2 +- packages/gl-react-native/src/GLViewNative.js | 8 +-- packages/gl-react-native/src/Image.js | 2 +- .../src/ImageSourceTextureLoader.js | 2 +- packages/gl-react-native/src/index.js | 2 +- packages/gl-react/src/Bus.js | 14 ++--- packages/gl-react/src/LinearCopy.js | 2 +- packages/gl-react/src/NearestCopy.js | 2 +- packages/gl-react/src/Node.js | 54 +++++++++---------- packages/gl-react/src/Shaders.js | 16 +++--- packages/gl-react/src/TextureLoader.js | 2 +- packages/gl-react/src/TextureLoaders.js | 2 +- packages/gl-react/src/Visitor.js | 2 +- packages/gl-react/src/VisitorLogger.js | 11 ++-- packages/gl-react/src/Visitors.js | 2 +- packages/gl-react/src/connectSize.js | 12 ++--- packages/gl-react/src/copyShader.js | 4 +- packages/gl-react/src/createSurface.js | 24 ++++----- packages/gl-react/src/index.js | 2 +- packages/gl-react/src/legacy.js | 2 +- 30 files changed, 115 insertions(+), 112 deletions(-) diff --git a/package.json b/package.json index c198ac0..c8743ca 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "scripts": { "postinstall": "lerna bootstrap && ./packages/undo-unsupported-symlinks.sh", "watch": "lerna run watch --stream --no-sort", - "prettier": "prettier --trailing-comma es5 --write 'packages/{gl-react,gl-react-dom,gl-react-expo,gl-react-headless,gl-react-native}/src/*.js'", + "prettier": "prettier --write 'packages/{gl-react,gl-react-dom,gl-react-expo,gl-react-headless,gl-react-native}/src/*.js'", "flow": "cd packages/gl-react && flow --quiet", "test": "cd packages/tests && yarn test", "test-rewrite-snapshots": "cd packages/tests && yarn test -- -u" diff --git a/packages/gl-react-dom/src/GLViewDOM.js b/packages/gl-react-dom/src/GLViewDOM.js index d2879e2..08c05e8 100755 --- a/packages/gl-react-dom/src/GLViewDOM.js +++ b/packages/gl-react-dom/src/GLViewDOM.js @@ -16,7 +16,7 @@ type WebGLContextAttributes = { premultipliedAlpha?: boolean, preserveDrawingBuffer?: boolean, preferLowPowerToHighPerformance?: boolean, - failIfMajorPerformanceCaveat?: boolean, + failIfMajorPerformanceCaveat?: boolean }; const propTypes = { @@ -28,7 +28,7 @@ const propTypes = { width: PropTypes.number.isRequired, height: PropTypes.number.isRequired, style: PropTypes.object, - pixelRatio: PropTypes.number, + pixelRatio: PropTypes.number }; export default class GLViewDOM extends Component { @@ -42,7 +42,7 @@ export default class GLViewDOM extends Component { width: number, height: number, style?: any, - debug?: number, + debug?: number }; static propTypes = propTypes; webglContextAttributes: WebGLContextAttributes; diff --git a/packages/gl-react-dom/src/index.js b/packages/gl-react-dom/src/index.js index d8c645f..53fe85f 100755 --- a/packages/gl-react-dom/src/index.js +++ b/packages/gl-react-dom/src/index.js @@ -22,5 +22,5 @@ export const Surface = createSurface({ RenderLessElement, mapRenderableContent, requestFrame: raf, - cancelFrame: raf.cancel, + cancelFrame: raf.cancel }); diff --git a/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js b/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js index 1680a5b..64e95e3 100644 --- a/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js +++ b/packages/gl-react-expo/src/ExponentGLObjectTextureLoader.js @@ -38,14 +38,14 @@ export default class ExponentGLObjectTextureLoader extends TextureLoader< promise: NativeModules.ExponentGLObjectManager .createObjectAsync({ exglCtxId, - texture, + texture }) .then(({ exglObjId }) => { if (disposed) return; const webglTexture = new WebGLTexture(exglObjId); this.textures.set(key, webglTexture); return webglTexture; - }), + }) }; this.loads.set(key, d); return d; diff --git a/packages/gl-react-expo/src/ExponentTextureLoader.js b/packages/gl-react-expo/src/ExponentTextureLoader.js index 65a06a7..21782b5 100755 --- a/packages/gl-react-expo/src/ExponentTextureLoader.js +++ b/packages/gl-react-expo/src/ExponentTextureLoader.js @@ -9,7 +9,7 @@ type Asset = { width: number, height: number, uri: string, - localUri: string, + localUri: string }; const hash = (module: number | { uri: string }) => @@ -37,9 +37,9 @@ const remoteAsset = (uri: string) => { uri, `ExponentAsset-${key}${ext}`, { - cache: true, + cache: true } - ), + ) ]).then(([size, asset]) => ({ ...size, uri, localUri: asset.uri })); remoteAssetCache[key] = promise; return promise; @@ -96,7 +96,7 @@ export default class ExponentTextureLoader extends TextureLoader<*> { dispose() { ignored = true; }, - promise, + promise }; this.loads.set(key, d); return d; diff --git a/packages/gl-react-expo/src/GLViewNative.js b/packages/gl-react-expo/src/GLViewNative.js index ed3a43b..28ae49a 100755 --- a/packages/gl-react-expo/src/GLViewNative.js +++ b/packages/gl-react-expo/src/GLViewNative.js @@ -6,14 +6,14 @@ import { GLView as EXGLView } from "expo"; const propTypes = { onContextCreate: PropTypes.func.isRequired, - style: PropTypes.any, + style: PropTypes.any }; export default class GLViewNative extends Component { props: { onContextCreate: (gl: WebGLRenderingContext) => void, style?: any, - children?: any, + children?: any }; static propTypes = propTypes; @@ -37,8 +37,8 @@ export default class GLViewNative extends Component { flex: 1, position: "absolute", top: 0, - left: 0, - }, + left: 0 + } ]} onContextCreate={onContextCreate} /> diff --git a/packages/gl-react-expo/src/Image.js b/packages/gl-react-expo/src/Image.js index 3eec4f8..46fb599 100644 --- a/packages/gl-react-expo/src/Image.js +++ b/packages/gl-react-expo/src/Image.js @@ -26,5 +26,5 @@ GLImage.prototype = { if (this.onload) this.onload(); }); } - }, + } }; diff --git a/packages/gl-react-expo/src/index.js b/packages/gl-react-expo/src/index.js index 7d65614..8564340 100755 --- a/packages/gl-react-expo/src/index.js +++ b/packages/gl-react-expo/src/index.js @@ -14,5 +14,5 @@ export const Surface = createSurface({ GLView, RenderLessElement, requestFrame: global.requestAnimationFrame, - cancelFrame: global.cancelAnimationFrame, + cancelFrame: global.cancelAnimationFrame }); diff --git a/packages/gl-react-headless/src/index.js b/packages/gl-react-headless/src/index.js index 095034a..e93dfda 100755 --- a/packages/gl-react-headless/src/index.js +++ b/packages/gl-react-headless/src/index.js @@ -18,7 +18,7 @@ type WebGLContextAttributes = { premultipliedAlpha?: boolean, preserveDrawingBuffer?: boolean, preferLowPowerToHighPerformance?: boolean, - failIfMajorPerformanceCaveat?: boolean, + failIfMajorPerformanceCaveat?: boolean }; const propTypes = { @@ -28,7 +28,7 @@ const propTypes = { onContextFailure: PropTypes.func.isRequired, webglContextAttributes: PropTypes.object, width: PropTypes.number.isRequired, - height: PropTypes.number.isRequired, + height: PropTypes.number.isRequired }; class GLView extends Component { @@ -39,7 +39,7 @@ class GLView extends Component { onContextRestored: (gl: ?WebGLRenderingContext) => void, webglContextAttributes?: WebGLContextAttributes, width: number, - height: number, + height: number }; static propTypes = propTypes; webglContextAttributes: WebGLContextAttributes; @@ -55,7 +55,7 @@ class GLView extends Component { const { webglContextAttributes, onContextCreate, - onContextFailure, + onContextFailure } = this.props; const gl: ?WebGLRenderingContext = getContext( this.canvas, @@ -110,7 +110,7 @@ class GLView extends Component { class RenderLessElement extends Component { static propTypes = { - children: PropTypes.any, + children: PropTypes.any }; // we keep ref so we can actually mapRenderableContent() on refs. // These are all escape hatch for testing. @@ -137,7 +137,7 @@ class RenderLessElement extends Component { : component => { cloneRef(component); originalRef(component); - }, + } }); })} @@ -151,5 +151,5 @@ export const Surface = createSurface({ // $FlowFixMe trust me flow xD mapRenderableContent: (el: RenderLessElement) => el.getFirstChild(), requestFrame: raf, - cancelFrame: raf.cancel, + cancelFrame: raf.cancel }); diff --git a/packages/gl-react-native/src/EXGLView.js b/packages/gl-react-native/src/EXGLView.js index 25edb65..76b11d6 100644 --- a/packages/gl-react-native/src/EXGLView.js +++ b/packages/gl-react-native/src/EXGLView.js @@ -8,7 +8,7 @@ import { View, ViewPropTypes, Platform, - requireNativeComponent, + requireNativeComponent } from "react-native"; // A component that acts as an OpenGL render target. @@ -26,11 +26,11 @@ export default class EXGLView extends React.Component { // [iOS only] Number of samples for Apple"s built-in multisampling. msaaSamples: PropTypes.number, - ...ViewPropTypes, + ...ViewPropTypes }; static defaultProps = { - msaaSamples: 4, + msaaSamples: 4 }; render() { @@ -63,7 +63,7 @@ export default class EXGLView extends React.Component { }; static NativeView = requireNativeComponent("EXGLView", EXGLView, { - nativeOnly: { onSurfaceCreate: true }, + nativeOnly: { onSurfaceCreate: true } }); } @@ -142,7 +142,7 @@ const wrapMethods = gl => { [gl.FRAMEBUFFER_BINDING]: WebGLFramebuffer, [gl.RENDERBUFFER_BINDING]: WebGLRenderbuffer, [gl.TEXTURE_BINDING_2D]: WebGLTexture, - [gl.TEXTURE_BINDING_CUBE_MAP]: WebGLTexture, + [gl.TEXTURE_BINDING_CUBE_MAP]: WebGLTexture }; wrap("getParameter", orig => pname => { let ret = orig.call(gl, pname); @@ -311,7 +311,7 @@ const wrapMethods = gl => { "vertexAttrib1fv", "vertexAttrib2fv", "vertexAttrib3fv", - "vertexAttrib4fv", + "vertexAttrib4fv" ], orig => (index, val) => orig.call(gl, index, new Float32Array(val)) ); diff --git a/packages/gl-react-native/src/GLImages.js b/packages/gl-react-native/src/GLImages.js index 5a9f9f3..bbf906c 100644 --- a/packages/gl-react-native/src/GLImages.js +++ b/packages/gl-react-native/src/GLImages.js @@ -46,5 +46,5 @@ const load = (source: ImageSource): Promise => { }; export default { - load, + load }; diff --git a/packages/gl-react-native/src/GLViewNative.js b/packages/gl-react-native/src/GLViewNative.js index a485737..86b29f5 100755 --- a/packages/gl-react-native/src/GLViewNative.js +++ b/packages/gl-react-native/src/GLViewNative.js @@ -6,14 +6,14 @@ import EXGLView from "./EXGLView"; const propTypes = { onContextCreate: PropTypes.func.isRequired, - style: PropTypes.any, + style: PropTypes.any }; export default class GLViewNative extends Component { props: { onContextCreate: (gl: WebGLRenderingContext) => void, style?: any, - children?: any, + children?: any }; static propTypes = propTypes; @@ -37,8 +37,8 @@ export default class GLViewNative extends Component { flex: 1, position: "absolute", top: 0, - left: 0, - }, + left: 0 + } ]} onContextCreate={onContextCreate} /> diff --git a/packages/gl-react-native/src/Image.js b/packages/gl-react-native/src/Image.js index 3d9ea4e..c959024 100644 --- a/packages/gl-react-native/src/Image.js +++ b/packages/gl-react-native/src/Image.js @@ -28,5 +28,5 @@ GLImage.prototype = { if (this.onload) this.onload(); }); } - }, + } }; diff --git a/packages/gl-react-native/src/ImageSourceTextureLoader.js b/packages/gl-react-native/src/ImageSourceTextureLoader.js index 5d31fea..533f3e4 100644 --- a/packages/gl-react-native/src/ImageSourceTextureLoader.js +++ b/packages/gl-react-native/src/ImageSourceTextureLoader.js @@ -42,7 +42,7 @@ export default class ImageSourceTextureLoader extends TextureLoader< texture = gl.createTexture(); gl.bindTexture(gl.TEXTURE_2D, texture); gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, { - glAssetId, + glAssetId }); this.textures.set(glAssetId, texture); } diff --git a/packages/gl-react-native/src/index.js b/packages/gl-react-native/src/index.js index 5b49770..eee0e75 100755 --- a/packages/gl-react-native/src/index.js +++ b/packages/gl-react-native/src/index.js @@ -15,5 +15,5 @@ export const Surface = createSurface({ GLView, RenderLessElement, requestFrame: global.requestAnimationFrame, - cancelFrame: global.cancelAnimationFrame, + cancelFrame: global.cancelAnimationFrame }); diff --git a/packages/gl-react/src/Bus.js b/packages/gl-react/src/Bus.js index 525f6b6..e3f15a3 100755 --- a/packages/gl-react/src/Bus.js +++ b/packages/gl-react/src/Bus.js @@ -11,7 +11,7 @@ import type { NDArray } from "ndarray"; type Props = {| children?: React.Element<*> | ((redraw?: () => void) => React.Element<*>), uniform?: string, - index: number, + index: number |}; /** @@ -47,21 +47,21 @@ export default class Bus extends Component<{ index: number }, Props, void> { props: Props; context: { glParent: Surface | Node, - glSurface: Surface, + glSurface: Surface }; dependents: Array = []; static defaultProps = { - index: 0, + index: 0 }; static contextTypes = { glParent: PropTypes.object.isRequired, - glSurface: PropTypes.object.isRequired, + glSurface: PropTypes.object.isRequired }; static childContextTypes = { - glParent: PropTypes.object.isRequired, + glParent: PropTypes.object.isRequired }; componentWillMount() { @@ -111,7 +111,7 @@ export default class Bus extends Component<{ index: number }, Props, void> { getChildContext(): { glParent: Bus } { return { - glParent: this, + glParent: this }; } @@ -205,7 +205,7 @@ export default class Bus extends Component<{ index: number }, Props, void> { render() { const { children } = this.props; const { - glSurface: { RenderLessElement, mapRenderableContent }, + glSurface: { RenderLessElement, mapRenderableContent } } = this.context; return ( diff --git a/packages/gl-react/src/LinearCopy.js b/packages/gl-react/src/LinearCopy.js index 4e7d600..ab6e358 100755 --- a/packages/gl-react/src/LinearCopy.js +++ b/packages/gl-react/src/LinearCopy.js @@ -4,7 +4,7 @@ import Node from "./Node"; import copyShader from "./copyShader"; type Props = {| - children?: any, + children?: any |}; /** diff --git a/packages/gl-react/src/NearestCopy.js b/packages/gl-react/src/NearestCopy.js index 4d7c840..d7df3f1 100755 --- a/packages/gl-react/src/NearestCopy.js +++ b/packages/gl-react/src/NearestCopy.js @@ -4,7 +4,7 @@ import Node from "./Node"; import copyShader from "./copyShader"; type Props = {| - children?: any, + children?: any |}; /** diff --git a/packages/gl-react/src/Node.js b/packages/gl-react/src/Node.js index bb6cb64..cc5318e 100755 --- a/packages/gl-react/src/Node.js +++ b/packages/gl-react/src/Node.js @@ -10,7 +10,7 @@ import Shaders, { isShaderIdentifier, ensureShaderDefinition, shaderDefinitionToShaderInfo, - shaderInfoEquals, + shaderInfoEquals } from "./Shaders"; import invariantNoDependentsLoop from "./helpers/invariantNoDependentsLoop"; import genId from "./genId"; @@ -34,7 +34,7 @@ const blendFuncAliases = { "one minus constant color": "ONE_MINUS_CONSTANT_COLOR", "constant alpha": "CONSTANT_ALPHA", "one minus constant alpha": "ONE_MINUS_CONSTANT_ALPHA", - "src alpha saturate": "SRC_ALPHA_SATURATE", + "src alpha saturate": "SRC_ALPHA_SATURATE" }; /** @@ -63,7 +63,7 @@ type WrapMode = "clamp to edge" | "repeat" | "mirrored repeat"; */ type TextureOptions = { interpolation: Interpolation, - wrap: [WrapMode, WrapMode] | WrapMode, + wrap: [WrapMode, WrapMode] | WrapMode }; /** @@ -93,7 +93,7 @@ type BlendFunc = $Keys; */ type BlendFuncSrcDst = {| src: BlendFunc, - dst: BlendFunc, + dst: BlendFunc |}; /** @@ -105,7 +105,7 @@ type Vec4 = [number, number, number, number]; * The GL clear mode. */ type Clear = {| - color: Vec4, + color: Vec4 |}; /** @@ -149,11 +149,11 @@ type Clear = {| * */ type Uniforms = { - [_: string]: mixed, + [_: string]: mixed }; type UniformsOptions = { - [_: string]: ?$Shape, + [_: string]: ?$Shape }; type Props = {| @@ -167,7 +167,7 @@ type Props = {| backbuffering?: boolean, blendFunc: BlendFuncSrcDst, clear: ?Clear, - onDraw?: () => void, + onDraw?: () => void |}; // not sure why, but we must define this for Flow to properly type check @@ -175,7 +175,7 @@ type DefaultProps = { uniformsOptions: UniformsOptions, uniforms: Uniforms, blendFunc: BlendFuncSrcDst, - clear: ?Clear, + clear: ?Clear }; type AsyncMixed = (redraw?: () => void) => mixed; @@ -240,7 +240,7 @@ type Framebuffer = { color: WebGLTexture, bind: () => void, dispose: () => void, - syncSize: (w: number, h: number) => void, + syncSize: (w: number, h: number) => void }; // minimal version of gl-fbo @@ -304,13 +304,13 @@ const createFBO = ( dispose: () => { gl.deleteFramebuffer(handle); gl.deleteTexture(color); - }, + } }; }; const defaultTextureOptions: TextureOptions = { interpolation: "linear", - wrap: ["clamp to edge", "clamp to edge"], + wrap: ["clamp to edge", "clamp to edge"] }; const applyTextureOptions = ( @@ -355,7 +355,7 @@ const NodePropTypes = { backbuffering: PropTypes.bool, blendFunc: PropTypes.object, clear: PropTypes.object, - onDraw: PropTypes.func, + onDraw: PropTypes.func }; /** @@ -397,28 +397,28 @@ export default class Node extends Component { blendFunc: { // FIXME should this actually just be null by default? opt-in? src: "src alpha", - dst: "one minus src alpha", + dst: "one minus src alpha" }, clear: { - color: [0, 0, 0, 0], - }, + color: [0, 0, 0, 0] + } }; static contextTypes = { glParent: PropTypes.object.isRequired, glSurface: PropTypes.object.isRequired, - glSizable: PropTypes.object.isRequired, + glSizable: PropTypes.object.isRequired }; static childContextTypes = { glParent: PropTypes.object.isRequired, - glSizable: PropTypes.object.isRequired, + glSizable: PropTypes.object.isRequired }; getChildContext() { return { glParent: this, - glSizable: this, + glSizable: this }; } @@ -555,7 +555,7 @@ export default class Node extends Component { // $FlowFixMe const nextProps: Props = { ...this.drawProps, - ...patch, + ...patch }; this._syncNextDrawProps(nextProps, this.context); this.redraw(); @@ -782,7 +782,7 @@ export default class Node extends Component { shader: shaderProp, blendFunc, clear, - onDraw, + onDraw } = this.drawProps; //~ PREPARE phase @@ -850,7 +850,7 @@ export default class Node extends Component { ); } result = { - directTexture: this.getGLOutput(), + directTexture: this.getGLOutput() }; } else if (obj instanceof Node) { // maybe it's a Node? @@ -909,7 +909,7 @@ export default class Node extends Component { initialObj, obj, dependency, - textureOptions, + textureOptions }); const prepare = () => { const texture: WebGLTexture = @@ -930,7 +930,7 @@ export default class Node extends Component { }; return { getMetaInfo, - prepare, + prepare }; }; @@ -955,7 +955,7 @@ export default class Node extends Component { key, type: uniformType, getMetaInfo, - prepare, + prepare }; } else if (Array.isArray(uniformType) && uniformType[0] === "sampler2D") { let values; @@ -988,7 +988,7 @@ export default class Node extends Component { type: uniformType, getMetaInfo: () => all.reduce((acc, o) => acc.concat(o.getMetaInfo()), []), - prepare: () => all.map(o => o.prepare()), + prepare: () => all.map(o => o.prepare()) }; } else { if (uniformValue === undefined) { @@ -997,7 +997,7 @@ export default class Node extends Component { return { key, type: uniformType, - value: uniformValue, + value: uniformValue }; } }; diff --git a/packages/gl-react/src/Shaders.js b/packages/gl-react/src/Shaders.js index c225630..6034c44 100755 --- a/packages/gl-react/src/Shaders.js +++ b/packages/gl-react/src/Shaders.js @@ -13,7 +13,7 @@ const ShaderID = "ShaderID"; * } */ type ShaderDefinition = {| - frag: GLSLCode, + frag: GLSLCode |}; export type { ShaderDefinition }; @@ -23,13 +23,13 @@ export type { ShaderDefinition }; */ type ShaderIdentifier = { type: typeof ShaderID, - id: string, + id: string }; export type { ShaderIdentifier }; type ShaderIdentifierMap = { - [key: string]: T, + [key: string]: T }; /** @@ -42,19 +42,19 @@ type ShaderIdentifierMap = { * } */ type ShadersDefinition = { - [key: string]: ShaderDefinition, + [key: string]: ShaderDefinition }; /** * An object map from a key string to a **ShaderIdentifier** that you can pass to `` */ type ShadersSheet = { - [key: $Keys]: ShaderIdentifier, + [key: $Keys]: ShaderIdentifier }; type ShaderInfo = { frag: GLSLCode, - vert: GLSLCode, + vert: GLSLCode }; export type { ShaderInfo }; @@ -98,7 +98,7 @@ export function shaderDefinitionToShaderInfo( ): ShaderInfo { return { frag: definition.frag, - vert: staticVert, // FIXME this is static for now. we will eventually improve this. + vert: staticVert // FIXME this is static for now. we will eventually improve this. }; } @@ -157,6 +157,6 @@ const Shaders = { shaderIdentifier.id ); return shaderResults[shaderIdentifier.id]; - }, + } }; export default Shaders; diff --git a/packages/gl-react/src/TextureLoader.js b/packages/gl-react/src/TextureLoader.js index 8cc7547..51b11fd 100755 --- a/packages/gl-react/src/TextureLoader.js +++ b/packages/gl-react/src/TextureLoader.js @@ -43,7 +43,7 @@ export default class TextureLoader { // noop default implementation return { promise: new Promise(noop), - dispose: noop, + dispose: noop }; } } diff --git a/packages/gl-react/src/TextureLoaders.js b/packages/gl-react/src/TextureLoaders.js index 384cd02..a401e73 100755 --- a/packages/gl-react/src/TextureLoaders.js +++ b/packages/gl-react/src/TextureLoaders.js @@ -27,7 +27,7 @@ const TextureLoaders = { }, get() { return loaderClasses; - }, + } }; export default TextureLoaders; diff --git a/packages/gl-react/src/Visitor.js b/packages/gl-react/src/Visitor.js index 3c309f8..961a174 100755 --- a/packages/gl-react/src/Visitor.js +++ b/packages/gl-react/src/Visitor.js @@ -22,7 +22,7 @@ export type VisitorLike = { deletions: Array ) => void, +onNodeDraw: (node: Node, preparedUniforms: Array<*>) => void, - +onNodeDrawEnd: (node: Node) => void, + +onNodeDrawEnd: (node: Node) => void }; /** diff --git a/packages/gl-react/src/VisitorLogger.js b/packages/gl-react/src/VisitorLogger.js index f34dfe1..2777d29 100755 --- a/packages/gl-react/src/VisitorLogger.js +++ b/packages/gl-react/src/VisitorLogger.js @@ -99,9 +99,10 @@ export default class VisitorLogger extends Visitor { preparedUniforms.forEach(obj => { let { key, type, value, getMetaInfo } = obj; type = String(type || "UNKNOWN"); - const values = value === undefined - ? "" - : Array.isArray(value) + const values = + value === undefined + ? "" + : Array.isArray(value) ? "[" + value.map(v => "`" + String(v) + "`").join(",") + "]" : "`" + String(value) + "`"; let spaces = ""; @@ -109,7 +110,9 @@ export default class VisitorLogger extends Visitor { spaces += " "; } log( - `${spaces}*${type === "UNKNOWN" ? "[c='color:red']UNKNOWN[c]" : type}* _${key}_ = ${values}`, + `${spaces}*${type === "UNKNOWN" + ? "[c='color:red']UNKNOWN[c]" + : type}* _${key}_ = ${values}`, ...(getMetaInfo ? aggregateInfo(getMetaInfo()) : []) ); }); diff --git a/packages/gl-react/src/Visitors.js b/packages/gl-react/src/Visitors.js index 9e9b94c..8d06326 100755 --- a/packages/gl-react/src/Visitors.js +++ b/packages/gl-react/src/Visitors.js @@ -24,7 +24,7 @@ const Visitors = { get() { return _globalVisitors; - }, + } }; export default Visitors; diff --git a/packages/gl-react/src/connectSize.js b/packages/gl-react/src/connectSize.js index 0ed23b1..63fbc9b 100755 --- a/packages/gl-react/src/connectSize.js +++ b/packages/gl-react/src/connectSize.js @@ -23,23 +23,23 @@ const connectSize = ( props: { width?: number, height?: number, - children?: any, + children?: any }; context: { - glSizable: { +getGLSize: () => [number, number] }, + glSizable: { +getGLSize: () => [number, number] } }; static displayName = `connectSize(${GLComponent.displayName || GLComponent.name || "?"})`; static propTypes = { width: PropTypes.number, - height: PropTypes.number, + height: PropTypes.number }; static contextTypes = { - glSizable: PropTypes.object.isRequired, + glSizable: PropTypes.object.isRequired }; static childContextTypes = { - glSizable: PropTypes.object.isRequired, + glSizable: PropTypes.object.isRequired }; getGLSize(): [number, number] { const { props: { width, height }, context: { glSizable } } = this; @@ -49,7 +49,7 @@ const connectSize = ( } getChildContext() { return { - glSizable: this, + glSizable: this }; } component: ?GLComponent; diff --git a/packages/gl-react/src/copyShader.js b/packages/gl-react/src/copyShader.js index f2083c7..4f7eb5f 100755 --- a/packages/gl-react/src/copyShader.js +++ b/packages/gl-react/src/copyShader.js @@ -10,6 +10,6 @@ varying vec2 uv; uniform sampler2D t; void main(){ gl_FragColor=texture2D(t,uv); -}`, - }, +}` + } }).copy; diff --git a/packages/gl-react/src/createSurface.js b/packages/gl-react/src/createSurface.js index 5fde98f..ddce4f0 100755 --- a/packages/gl-react/src/createSurface.js +++ b/packages/gl-react/src/createSurface.js @@ -29,7 +29,7 @@ type SurfaceProps = { onLoadError?: (e: Error) => void, onContextLost?: () => void, onContextRestored?: () => void, - visitor?: VisitorLike, + visitor?: VisitorLike }; interface ISurface extends Component { @@ -61,7 +61,7 @@ interface ISurface extends Component { +_getShader: (shaderId: ShaderIdentifier) => Shader, +_makeShader: (shaderInfo: ShaderInfo) => Shader, +_draw: () => void, - +_bindRootNode: () => void, + +_bindRootNode: () => void } export type Surface = ISurface; @@ -69,7 +69,7 @@ export type Surface = ISurface; export type SurfaceContext = { glParent: Node | Surface | Bus, glSurface: Surface, - glSizable: { +getGLSize: () => [number, number] }, + glSizable: { +getGLSize: () => [number, number] } }; const SurfacePropTypes = { @@ -80,7 +80,7 @@ const SurfacePropTypes = { onLoadError: PropTypes.func, onContextLost: PropTypes.func, onContextRestored: PropTypes.func, - visitor: PropTypes.object, + visitor: PropTypes.object }; let surfaceId = 0; @@ -94,7 +94,7 @@ type SurfaceOpts = { RenderLessElement: ReactClassLike<*>, mapRenderableContent?: (instance: mixed) => mixed, requestFrame: (f: Function) => number, - cancelFrame: (id: number) => void, + cancelFrame: (id: number) => void }; export default ({ @@ -103,7 +103,7 @@ export default ({ RenderLessElement, mapRenderableContent, requestFrame, - cancelFrame, + cancelFrame }: SurfaceOpts): Class => { /** * **Renders the final tree of [Node](#node) in a WebGL Canvas / OpenGLView /...** @@ -172,11 +172,11 @@ export default ({ state: { ready: boolean, rebootId: number, - debug: boolean, + debug: boolean } = { ready: false, rebootId: 0, - debug: false, + debug: false }; RenderLessElement = RenderLessElement; @@ -186,14 +186,14 @@ export default ({ static childContextTypes: { [_: $Keys]: any } = { glSurface: PropTypes.object.isRequired, glParent: PropTypes.object.isRequired, - glSizable: PropTypes.object.isRequired, + glSizable: PropTypes.object.isRequired }; getChildContext(): SurfaceContext { return { glParent: this, glSurface: this, - glSizable: this, + glSizable: this }; } @@ -250,7 +250,7 @@ export default ({ this.setState(({ rebootId }) => ({ rebootId: rebootId + 1, ready: false, - debug: true, + debug: true })); } @@ -366,7 +366,7 @@ export default ({ const onSuccess = () => { this.setState( { - ready: true, + ready: true }, () => { try { diff --git a/packages/gl-react/src/index.js b/packages/gl-react/src/index.js index 8396abf..09afc4f 100755 --- a/packages/gl-react/src/index.js +++ b/packages/gl-react/src/index.js @@ -33,7 +33,7 @@ export { TextureLoaders, Visitor, VisitorLogger, - Visitors, + Visitors }; export type { Surface } from "./createSurface"; diff --git a/packages/gl-react/src/legacy.js b/packages/gl-react/src/legacy.js index f1954a2..9b805d4 100755 --- a/packages/gl-react/src/legacy.js +++ b/packages/gl-react/src/legacy.js @@ -24,7 +24,7 @@ export function createComponent( type UniformProps = { children?: React.Element<*>, - name: string, + name: string }; export class Uniform extends React.Component { props: UniformProps;