Skip to content

Commit 3e192d3

Browse files
gnavvygnavvy
authored
more brfs cleanup (visgl#431)
* glsl clean up * more brfs cleanup
1 parent 691d9cf commit 3e192d3

39 files changed

Lines changed: 248 additions & 427 deletions

‎demo/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
"babel-preset-es2015": "^6.3.13",
4848
"babel-preset-react": "^6.3.13",
4949
"babel-preset-stage-2": "^6.3.13",
50-
"brfs-babel": "^1.0.0",
5150
"css-loader": "^0.26.1",
5251
"eslint": "^3.0.0",
5352
"eslint-config-uber-es2015": "^3.0.0",

‎demo/webpack/config.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ module.exports = {
2626
loader: 'raw-loader',
2727
include: demoSources,
2828
enforce: 'post'
29-
}, {
30-
test: /\.js$/,
31-
loader: 'transform-loader?brfs-babel'
3229
}]
3330
},
3431

‎examples/layer-browser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"build": "webpack app bundle.js --env.local --display-error-details"
66
},
77
"dependencies": {
8-
"deck.gl": "^4.0.0-beta.3",
8+
"deck.gl": "^4.0.0-rc1",
99
"extrude-polyline": "^1.0.6",
1010
"immutable": "^3.8.1",
1111
"luma.gl": "3.0.0-beta.11",

‎examples/layer-browser/webpack.config.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ module.exports = {
4141
test: /\.json$/,
4242
loader: 'json-loader',
4343
exclude: [/node_modules/]
44-
},
45-
{
46-
// Needed to inline deck.gl GLSL shaders
47-
include: [resolve(__dirname, '../sample-layers')],
48-
loader: 'transform-loader',
49-
options: 'brfs-babel'
5044
}
5145
]
5246
},

‎examples/sample-layers/plot-layer/axes-layer.js‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ import {Layer, assembleShaders} from 'deck.gl';
22
import {GL, Model, Geometry} from 'luma.gl';
33

44
import {scaleLinear} from 'd3-scale';
5-
import {readFileSync} from 'fs';
6-
import {join} from 'path';
75
import {textMatrixToTexture} from './utils';
86

7+
import fragmentShader from './fragment.glsl';
8+
import gridVertex from './grid-vertex.glsl';
9+
import labelVertex from './label-vertex.glsl';
10+
import labelFragment from './label-fragment.glsl';
11+
912
/* Constants */
1013
const FONT_SIZE = 48;
1114

@@ -120,8 +123,8 @@ export default class AxesLayer extends Layer {
120123
* show/hide is toggled by the vertex shader
121124
*/
122125
const gridShaders = assembleShaders(gl, {
123-
vs: readFileSync(join(__dirname, './grid-vertex.glsl'), 'utf8'),
124-
fs: readFileSync(join(__dirname, './fragment.glsl'), 'utf8')
126+
vs: gridVertex,
127+
fs: fragmentShader
125128
});
126129

127130
/*
@@ -178,8 +181,8 @@ export default class AxesLayer extends Layer {
178181
* show/hide is toggled by the vertex shader
179182
*/
180183
const labelShaders = assembleShaders(gl, {
181-
vs: readFileSync(join(__dirname, './label-vertex.glsl'), 'utf8'),
182-
fs: readFileSync(join(__dirname, './label-fragment.glsl'), 'utf8')
184+
vs: labelVertex,
185+
fs: labelFragment
183186
});
184187

185188
let labelTexCoords = [];

examples/sample-layers/plot-layer/fragment.glsl renamed to examples/sample-layers/plot-layer/fragment.glsl.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1919
// THE SOFTWARE.
2020

21+
export default `\
2122
#define SHADER_NAME graph-layer-fragment-shader
2223
2324
#ifdef GL_ES
@@ -33,3 +34,4 @@ void main(void) {
3334
}
3435
gl_FragColor = vColor;
3536
}
37+
`;

examples/sample-layers/plot-layer/grid-vertex.glsl renamed to examples/sample-layers/plot-layer/grid-vertex.glsl.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1919
// THE SOFTWARE.
2020

21+
export default `\
2122
#define SHADER_NAME graph-layer-axis-vertex-shader
2223
2324
attribute vec3 positions;
@@ -40,7 +41,7 @@ float frontFacing(vec3 v) {
4041
}
4142
4243
void main(void) {
43-
44+
4445
// rotated rectangle to align with slice:
4546
// for each x tick, draw rectangle on yz plane
4647
// for each y tick, draw rectangle on zx plane
@@ -63,7 +64,8 @@ void main(void) {
6364
// do not draw grid line in front of the graph
6465
shouldDiscard = frontFacing(gridLineNormal);
6566
66-
vec3 position_modelspace = (vec3(instancePositions.x) - modelCenter) * instanceNormals + gridVertexOffset * modelDim / 2.0;
67+
vec3 position_modelspace = (vec3(instancePositions.x) - modelCenter) *
68+
instanceNormals + gridVertexOffset * modelDim / 2.0;
6769
6870
// scale bounding box to fit into a unit cube that centers at [0, 0, 0]
6971
float scale = 1.0 / max(modelDim.x, max(modelDim.y, modelDim.z));
@@ -76,3 +78,4 @@ void main(void) {
7678
7779
vColor = strokeColor / 255.0;
7880
}
81+
`;

examples/sample-layers/plot-layer/label-fragment.glsl renamed to examples/sample-layers/plot-layer/label-fragment.glsl.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1919
// THE SOFTWARE.
2020

21+
export default `\
2122
#define SHADER_NAME graph-layer-fragment-shader
2223
2324
#ifdef GL_ES
@@ -39,3 +40,4 @@ void main(void) {
3940
}
4041
gl_FragColor = color;
4142
}
43+
`;

examples/sample-layers/plot-layer/label-vertex.glsl renamed to examples/sample-layers/plot-layer/label-vertex.glsl.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1919
// THE SOFTWARE.
2020

21+
export default `\
2122
#define SHADER_NAME graph-layer-axis-vertex-shader
2223
2324
attribute vec3 positions;
@@ -55,7 +56,7 @@ float frontFacing(vec3 v) {
5556
}
5657
5758
void main(void) {
58-
59+
5960
// rotated rectangle to align with slice:
6061
// for each x tick, draw rectangle on yz plane
6162
// for each y tick, draw rectangle on zx plane
@@ -95,8 +96,9 @@ void main(void) {
9596
vTexCoords = (textureOrigin + textureSize * texCoords) / labelTextureDim;
9697
vTexCoords.y = 1.0 - vTexCoords.y;
9798
98-
vec3 position_modelspace = (vec3(instancePositions.x) - modelCenter) * instanceNormals + gridVertexOffset * modelDim / 2.0;
99-
99+
vec3 position_modelspace = (vec3(instancePositions.x) - modelCenter) *
100+
instanceNormals + gridVertexOffset * modelDim / 2.0;
101+
100102
// scale bounding box to fit into a unit cube that centers at [0, 0, 0]
101103
float scale = 1.0 / max(modelDim.x, max(modelDim.y, modelDim.z));
102104
position_modelspace *= scale;
@@ -116,3 +118,4 @@ void main(void) {
116118
gl_Position = position_clipspace + vec4(labelVertexOffset, 0.0, 0.0);
117119
118120
}
121+
`;

‎examples/sample-layers/plot-layer/surface-layer.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {Layer, assembleShaders} from 'deck.gl';
2-
32
import {GL, Model, Geometry} from 'luma.gl';
4-
import {readFileSync} from 'fs';
5-
import {join} from 'path';
3+
4+
import surfaceVertex from './surface-vertex.glsl';
5+
import fragmentShader from './fragment.glsl';
66

77
const DEFAULT_COLOR = [0, 0, 0, 255];
88

@@ -84,8 +84,8 @@ export default class SurfaceLayer extends Layer {
8484
getModel(gl) {
8585
// 3d surface
8686
const graphShaders = assembleShaders(gl, {
87-
vs: readFileSync(join(__dirname, './surface-vertex.glsl'), 'utf8'),
88-
fs: readFileSync(join(__dirname, './fragment.glsl'), 'utf8')
87+
vs: surfaceVertex,
88+
fs: fragmentShader
8989
});
9090

9191
return new Model({

0 commit comments

Comments
 (0)