p90524618
/
antv-l7
mirror of https://gitee.com/antv-l7/antv-l7
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(merge):fix conflict

This commit is contained in:
thinkinggis 2019-08-19 11:15:09 +08:00
parent a1d759d16a
commit 1bccea2711
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layer/tile/vector_tile_mesh.js
View File

@ -37,7 +37,7 @@ export default class VectorTileMesh {
this.mesh = getRender(this.layer.get('type'), data.shape)(null, this.layer, data.buffer); this.mesh = getRender(this.layer.get('type'), data.shape)(null, this.layer, data.buffer);
if (this.mesh.type !== 'composer') { // 热力图的情况 if (this.mesh.type !== 'composer') { // 热力图的情况
this.mesh.onBeforeRender = renderer => { this.mesh.onBeforeRender = renderer => {
// this._renderMask(renderer); this._renderMask(renderer);
const zoom = this.layer.scene.getZoom(); const zoom = this.layer.scene.getZoom();
updateObjecteUniform(this._object3D, { updateObjecteUniform(this._object3D, {
u_time: this.layer.scene._engine.clock.getElapsedTime(), u_time: this.layer.scene._engine.clock.getElapsedTime(),