Skip to content

Commit 001f801

Browse files
committed
Fix splash-grid demo
1 parent bf537b3 commit 001f801

File tree

4 files changed

+18
-13
lines changed

4 files changed

+18
-13
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"cheerio": "^0.17.0",
1010
"class-list": "^0.1.1",
1111
"disc": "^1.3.1",
12-
"district": "^1.0.1",
12+
"district": "^1.2.1",
1313
"domify": "^1.3.0",
1414
"findup-element": "0.0.0",
1515
"frame-debounce": "0.0.0",

splash-grid/demo.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
var canvas = document.body.appendChild(document.createElement('canvas'))
2+
3+
require('./')(canvas)

splash-grid/index.js

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
var createCamera = require('orbit-camera')
22
var createTex2d = require('gl-texture2d')
33
var createGeom = require('gl-geometry')
4+
var createShader = require('gl-shader')
5+
var glslify = require('glslify')
46
var createFBO = require('gl-fbo')
5-
var createShader = require('glslify')
67

78
var clear = require('gl-clear')({ color: [1, 1, 1, 1] })
89
var mat4 = require('gl-matrix').mat4
@@ -38,15 +39,15 @@ module.exports = function(canvas) {
3839
, [0, 1, 0]
3940
)
4041

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+
)
4546

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+
)
5051

5152
var geom = createGeom(gl)
5253
.attr('aPosition', voxels.positions)

splash-grid/package.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"main": "index.js",
55
"scripts": {
6-
"start": "beefy index.js --open",
6+
"start": "budo demo.js --open",
77
"pack": "ndpack-image gradient-map.png > gradient-map.js"
88
},
99
"browserify": {
@@ -18,7 +18,7 @@
1818
},
1919
"license": "MIT",
2020
"devDependencies": {
21-
"beefy": "^2.0.3"
21+
"budo": "^6.1.0"
2222
},
2323
"dependencies": {
2424
"a-big-triangle": "0.0.0",
@@ -33,8 +33,9 @@
3333
"gl-fbo": "^1.1.3",
3434
"gl-geometry": "0.0.0",
3535
"gl-matrix": "^2.1.0",
36+
"gl-shader": "^4.0.6",
3637
"gl-texture2d": "^1.2.0",
37-
"glslify": "^1.6.0",
38+
"glslify": "^3.1.0",
3839
"mesh-combine": "^1.0.0",
3940
"ndpack-image": "^1.0.4",
4041
"orbit-camera": "^1.0.0",

0 commit comments

Comments
 (0)