Skip to content

Commit

Permalink
Merge 36f9de3 into 067f706
Browse files Browse the repository at this point in the history
  • Loading branch information
tsherif committed Jul 18, 2019
2 parents 067f706 + 36f9de3 commit 6b502d6
Show file tree
Hide file tree
Showing 4 changed files with 689 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/api-reference/webgl/framebuffer.md
Expand Up @@ -171,8 +171,8 @@ For color, new `Texture2D` object is created with no mipmaps and following filte
| Texture parameter | Value |
| --- | --- |
| `GL.TEXTURE_MIN_FILTER` | `GL.NEAREST` |
| `GL.TEXTURE_MAG_FILTER` | `GL.NEAREST` |
| `GL.TEXTURE_MIN_FILTER` | `GL.LINEAR` |
| `GL.TEXTURE_MAG_FILTER` | `GL.LINEAR` |
| `GL.TEXTURE_WRAP_S` | `GL.CLAMP_TO_EDGE` |
| `GL.TEXTURE_WRAP_T` | `GL.CLAMP_TO_EDGE` |
Expand Down
3 changes: 3 additions & 0 deletions modules/effects/src/index.js
Expand Up @@ -25,6 +25,9 @@ export {default as ink} from './shader-modules/fun-filters/ink';
export {default as bulgePinch} from './shader-modules/warp-filters/bulgepinch';
export {default as swirl} from './shader-modules/warp-filters/swirl';

// Postprocessing
export {default as fxaa} from './shader-modules/fxaa/fxaa';

// experimental shader modules and passes
export {default as _depth} from './experimental/shader-modules/depth';
export {default as _convolution} from './experimental/shader-modules/convolution';
Expand Down

0 comments on commit 6b502d6

Please sign in to comment.