|
1 | 1 | var createCamera = require('orbit-camera')
|
2 | 2 | var createTex2d = require('gl-texture2d')
|
3 | 3 | var createGeom = require('gl-geometry')
|
| 4 | +var createShader = require('gl-shader') |
| 5 | +var glslify = require('glslify') |
4 | 6 | var createFBO = require('gl-fbo')
|
5 |
| -var createShader = require('glslify') |
6 | 7 |
|
7 | 8 | var clear = require('gl-clear')({ color: [1, 1, 1, 1] })
|
8 | 9 | var mat4 = require('gl-matrix').mat4
|
@@ -38,15 +39,15 @@ module.exports = function(canvas) {
|
38 | 39 | , [0, 1, 0]
|
39 | 40 | )
|
40 | 41 |
|
41 |
| - var shader = createShader({ |
42 |
| - frag: './shaders/voxel.frag' |
43 |
| - , vert: './shaders/voxel.vert' |
44 |
| - })(gl) |
| 42 | + var shader = createShader(gl |
| 43 | + , glslify('./shaders/voxel.vert') |
| 44 | + , glslify('./shaders/voxel.frag') |
| 45 | + ) |
45 | 46 |
|
46 |
| - var heightShader = createShader({ |
47 |
| - frag: './shaders/heightmap.frag' |
48 |
| - , vert: './shaders/heightmap.vert' |
49 |
| - })(gl) |
| 47 | + var heightShader = createShader(gl |
| 48 | + , glslify('./shaders/heightmap.vert') |
| 49 | + , glslify('./shaders/heightmap.frag') |
| 50 | + ) |
50 | 51 |
|
51 | 52 | var geom = createGeom(gl)
|
52 | 53 | .attr('aPosition', voxels.positions)
|
|
0 commit comments