Skip to content

Commit

Permalink
roll back property function support for line-width + line-dasharray
Browse files Browse the repository at this point in the history
  • Loading branch information
Molly Lloyd committed Dec 3, 2016
1 parent 6b0bb7e commit e4697a2
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion js/data/bucket/line_bucket.js
Expand Up @@ -48,7 +48,6 @@ const lineInterface = {
{property: 'line-color', type: 'Uint8'},
{property: 'line-blur', multiplier: 10, type: 'Uint8'},
{property: 'line-opacity', multiplier: 10, type: 'Uint8'},
{property: 'line-width', multiplier: 10, type: 'Uint8'},
{property: 'line-gap-width', multiplier: 10, type: 'Uint8', name: 'a_gapwidth'},
{property: 'line-offset', multiplier: 1, type: 'Int8'},
],
Expand Down
2 changes: 1 addition & 1 deletion js/render/draw_line.js
Expand Up @@ -104,7 +104,7 @@ function drawLineTile(program, painter, tile, buffers, layer, coord, layerData,
gl.uniform2fv(program.u_pattern_br_b, imagePosB.br);
gl.uniform1f(program.u_fade, image.t);
}

gl.uniform1f(program.u_width, layer.paint['line-width']);

gl.uniformMatrix2fv(program.u_antialiasingmatrix, false, painter.transform.lineAntialiasingMatrix);
gl.uniform1f(program.u_extra, painter.transform.lineStretch);
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -22,7 +22,7 @@
"geojson-vt": "^2.4.0",
"grid-index": "^1.0.0",
"mapbox-gl-function": "mapbox/mapbox-gl-function#41c6724e2bbd7bd1eb5991451bbf118b7d02b525",
"mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#26733535ba2f1b164dd6a231d4d1868c3218eafd",
"mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#94518afb141b376e7f86e492c1b022c0159ca4a3",
"mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#e85407a377510acb647161de6be6357ab4f606dd",
"mapbox-gl-supported": "^1.2.0",
"package-json-versionify": "^1.0.2",
Expand Down Expand Up @@ -62,7 +62,7 @@
"in-publish": "^2.0.0",
"jsdom": "^9.4.2",
"lodash.template": "^4.4.0",
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#623745e501a90a12cb5c750f3f8276cdf5c88bc4",
"mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#178f0789feb6011bba5965b75913e883a8615464",
"minifyify": "^7.0.1",
"npm-run-all": "^3.0.0",
"nyc": "^8.3.0",
Expand Down

0 comments on commit e4697a2

Please sign in to comment.