Skip to content

Commit

Permalink
Added circle-translate
Browse files Browse the repository at this point in the history
  • Loading branch information
Lucas Wojciechowski committed Aug 7, 2015
1 parent bc6ab68 commit 9d43bf1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion js/render/draw_circle.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ function drawCircles(painter, layer, posMatrix, tile) {
// short-circuit if tile is empty
if (!tile.buffers) return;

posMatrix = painter.translateMatrix(posMatrix, tile, layer.paint['circle-translate'], layer.paint['circle-translate-anchor']);

var elementGroups = tile.elementGroups[layer.ref || layer.id];
if (!elementGroups) return;

Expand All @@ -17,7 +19,7 @@ function drawCircles(painter, layer, posMatrix, tile) {
// large circles are not clipped to tiles
gl.disable(gl.STENCIL_TEST);

gl.switchShader(painter.circleShader, tile.posMatrix, tile.exMatrix);
gl.switchShader(painter.circleShader, posMatrix, tile.exMatrix);

var vertex = tile.buffers.circleVertex;
var shader = painter.circleShader;
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"gl-matrix": "https://github.com/toji/gl-matrix/archive/v2.2.1.tar.gz",
"glify": "0.5.0",
"mapbox-gl-function": "^1.0.0",
"mapbox-gl-style-spec": "git+https://github.com/mapbox/mapbox-gl-style-spec.git#ec04e5d3dc6cdd83bdc07fd091896427b65ee425",
"mapbox-gl-style-spec": "git+https://github.com/mapbox/mapbox-gl-style-spec.git#30c3f6fcd6d125563ae170cef14f645531e6fe84",
"minifyify": "^6.1.0",
"pbf": "^1.2.0",
"pngjs": "^0.4.0",
Expand All @@ -39,7 +39,7 @@
"documentation": "git+https://github.com/documentationjs/documentation#d341019b32a8a257a93bd55586e7f09f42e29341",
"eslint": "^0.14.1",
"istanbul": "^0.3.0",
"mapbox-gl-test-suite": "git+https://github.com/mapbox/mapbox-gl-test-suite.git#f20ffce95212d3f716157a473adccfdb0e1ee8fd",
"mapbox-gl-test-suite": "git+https://github.com/mapbox/mapbox-gl-test-suite.git#b7e38a3e4ec6ee2051ac4e8e2215994be91951e4",
"marked": "0.3.x",
"mkdirp": "^0.5.0",
"prova": "^2.1.2",
Expand Down

0 comments on commit 9d43bf1

Please sign in to comment.