cartodb/torque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compatibilizes ballrenderer with cartocss

Browse Source
This commit is contained in:
Francisco Dans 2015-05-12 12:14:03 +02:00
parent eb4d739bca
commit 59a84690c2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/torque/renderer/point.js
View File

@ -223,6 +223,7 @@ var ballRenderer = require('./ball.js');
// the torque tile // the torque tile
// //
_renderTile: function(tile, key, frame_offset, sprites, shader, shaderVars, pos) { _renderTile: function(tile, key, frame_offset, sprites, shader, shaderVars, pos) {
shaderVars = shaderVars || { zoom: tile.z, 'frame-offset': frame_offset }
if (!this._canvas) return; if (!this._canvas) return;
var prof = Profiler.metric('torque.renderer.point.renderTile').start(); var prof = Profiler.metric('torque.renderer.point.renderTile').start();
@ -245,7 +246,10 @@ var ballRenderer = require('./ball.js');
if (c) { if (c) {
var x = tile.x[posIdx]; var x = tile.x[posIdx];
var y = tileMax - tile.y[posIdx]; // flip mercator var y = tileMax - tile.y[posIdx]; // flip mercator
this.ballRenderer.addBall(pos.x + x, pos.y + y); var st = shader.getStyle({
value: c
}, shaderVars);
this.ballRenderer.addBall(pos.x + x, pos.y + y, st);
// var sp = sprites[c]; // var sp = sprites[c];
// if (sp === undefined) { // if (sp === undefined) {
// sp = sprites[c] = this.generateSprite(shader, c, torque.extend({ zoom: tile.z, 'frame-offset': frame_offset }, shaderVars)); // sp = sprites[c] = this.generateSprite(shader, c, torque.extend({ zoom: tile.z, 'frame-offset': frame_offset }, shaderVars));
@ -369,6 +373,7 @@ var ballRenderer = require('./ball.js');
}, },
applyFilters: function(){ applyFilters: function(){
return;
if(this._style){ if(this._style){
if(this._style['image-filters']){ if(this._style['image-filters']){
function gradientKey(imf){ function gradientKey(imf){