Merge branch 'master' into gh-pages

This commit is contained in:
Gaëtan Renaudeau 2015-10-09 21:34:34 +02:00
commit 102852172c

View File

@ -9,19 +9,17 @@ const shaders = GL.Shaders.create({
});
module.exports = GL.createComponent(
({ width, height, direction, minBlur, maxBlur, blurMap, offset, children }) =>
<GL.View
shader={shaders.blur1D}
width={width}
height={height}
uniforms={{
direction,
minBlur,
maxBlur,
blurMap,
offset,
resolution: [ width, height ]
}}>
<GL.Uniform name="t">{children}</GL.Uniform>
</GL.View>,
{ displayName: "Blur1D" });
({ width, height, direction, children }) =>
<GL.View
shader={shaders.blur1D}
width={width}
height={height}
uniforms={{
direction,
resolution: [ width, height ]
}}>
<GL.Uniform name="t">{children}</GL.Uniform>
</GL.View>
, {
displayName: "Blur1D"
});