Skip to content

Commit

Permalink
Fix build errors across browserify and webpack. see:
Browse files Browse the repository at this point in the history
  • Loading branch information
vicapow committed Feb 19, 2016
1 parent 06857ef commit e731c7e
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 13 deletions.
8 changes: 6 additions & 2 deletions heatmap-heights.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
'use strict';

var HeatmapShader = require('./heatmap-shader');
var vertexShaderBlit = require('./vertex-shader-blit.glsl');
var fragmentShaderBlit = require('./fragment-shader-blit.glsl');
var fs = require('fs');
var path = require('path');
/* eslint-disable max-len */
var vertexShaderBlit = fs.readFileSync(path.join(__dirname, './vertex-shader-blit.glsl'), 'utf-8');
var fragmentShaderBlit = fs.readFileSync(path.join(__dirname, './fragment-shader-blit.glsl'), 'utf-8');
/* eslint-enable max-len */
var HeatmapNode = require('./heatmap-node');

function HeatmapHeights(heatmap, gl, width, height) {
Expand Down
8 changes: 6 additions & 2 deletions index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,11 @@
"author": "Victor Powell <[email protected]>",
"license": "MIT",
"dependencies": {
"browserify-shader": "^0.1.2",
"brfs": "^1.4.1",
"global": "^4.3.0"
},
"browserify": {
"transform": [
[
"browserify-shader",
{
"parameterize": false
}
],
"brfs"
]
},
Expand Down
8 changes: 6 additions & 2 deletions webgl-heatmap.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@

var document = require('global/document');
var window = require('global/window');
var vertexShaderBlit = require('./vertex-shader-blit.glsl');
var fragmentShaderBlit = require('./fragment-shader-blit.glsl');
var fs = require('fs');
var path = require('path');
/* eslint-disable max-len */
var vertexShaderBlit = fs.readFileSync(path.join(__dirname, './vertex-shader-blit.glsl'), 'utf-8');
var fragmentShaderBlit = fs.readFileSync(path.join(__dirname, './fragment-shader-blit.glsl'), 'utf-8');
/* eslint-enable max-len */
var HeatmapTexture = require('./heatmap-texture');
var HeatmapHeights = require('./heatmap-heights');
var HeatmapShader = require('./heatmap-shader');
Expand Down

0 comments on commit e731c7e

Please sign in to comment.