Merge branch 'master' of gitlab.alipay-inc.com:datavis/L7_beta

demos/heatmap.html

@@ -43,6 +43,14 @@ scene.on('loaded', () => {
       }
     })
     .render();
+    /*scene.PointLayer({
+      zIndex: 2
+    })
+    .source(data)
+    .shape('2d:circle')
+    .size(2) // weight映射通道
+    .color('red')
+    .render();*/
   });
 });
 </script>

src/core/engine/renderpass.js

@@ -36,8 +36,10 @@ export default class RenderPass {
   }
 
   render() {
+
     this.renderer.setClearColor(this.clearColor, this.clearAlpha);
     this.renderer.render(this.scene, this.camera, this.pass, true);
+    this.renderer.setRenderTarget(null);
     this.renderer.setClearColor(this.originClearColor, this.originClearAlpha);
   }
 }

src/layer/heatmapLayer.js

@@ -58,7 +58,7 @@ export default class HeatMapLayer extends Layer {
 
   afterRender() {
     if (this.shapeType !== 'grid' && this.shapeType !== 'hexagon') {
-      updateIntensityPass(this);
+     // updateIntensityPass(this);
     }
   }