@deck.gl/aggregation-layers 8.7.9 → 8.7.12

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/aggregation-layers",
   "description": "deck.gl layers that aggregate the input data into alternative representations",
   "license": "MIT",
-  "version": "8.7.9",
+  "version": "8.7.12",
   "publishConfig": {
     "access": "public"
   },
@@ -37,5 +37,5 @@
     "@deck.gl/core": "^8.0.0",
     "@deck.gl/layers": "^8.0.0"
   },
-  "gitHead": "c060732d18d0dcf68b277da889a79bc428aca347"
+  "gitHead": "8982b5d2b1add585af1f7144bc259e2216707319"
 }

package/src/heatmap-layer/heatmap-layer-utils.js

@@ -80,9 +80,14 @@ export function getTextureCoordinates(point, bounds) {
 
 // Returns format and type for creating texture objects
 export function getTextureParams({gl, floatTargetSupport}) {
-  return {
-    // format:  should be RGBA32F on WebGL2 (float textures), RGBA in WebGL1 for float or non float textures
-    format: isWebGL2(gl) ? GL.RGBA32F : GL.RGBA,
-    type: floatTargetSupport ? GL.FLOAT : GL.UNSIGNED_BYTE
-  };
+  return floatTargetSupport
+    ? {
+        // format:  should be RGBA32F on WebGL2 (float textures), RGBA in WebGL1 for float or non float textures
+        format: isWebGL2(gl) ? GL.RGBA32F : GL.RGBA,
+        type: GL.FLOAT
+      }
+    : {
+        format: GL.RGBA,
+        type: GL.UNSIGNED_BYTE
+      };
 }

package/src/heatmap-layer/heatmap-layer.js

@@ -28,7 +28,15 @@ import {
   getTextureCoordinates,
   getTextureParams
 } from './heatmap-layer-utils';
-import {Buffer, Texture2D, Transform, getParameters, FEATURES, hasFeatures} from '@luma.gl/core';
+import {
+  Buffer,
+  Texture2D,
+  Transform,
+  getParameters,
+  withParameters,
+  FEATURES,
+  hasFeatures
+} from '@luma.gl/core';
 import {AttributeManager, COORDINATE_SYSTEM, log} from '@deck.gl/core';
 import TriangleLayer from './triangle-layer';
 import AggregationLayer from '../aggregation-layer';
@@ -72,7 +80,11 @@ const defaultProps = {
 const REQUIRED_FEATURES = [
   FEATURES.BLEND_EQUATION_MINMAX, // max weight calculation
   FEATURES.TEXTURE_FLOAT // weight-map as texture
-  // FEATURES.FLOAT_BLEND, // implictly supported when TEXTURE_FLOAT is supported
+];
+
+const FLOAT_TARGET_FEATURES = [
+  FEATURES.COLOR_ATTACHMENT_RGBA32F, // ability to render to float texture
+  FEATURES.FLOAT_BLEND // ability to blend when rendering to float texture
 ];
 
 const DIMENSIONS = {
@@ -266,7 +278,7 @@ export default class HeatmapLayer extends AggregationLayer {
     const {weightsTextureSize} = this.props;
 
     const textureSize = Math.min(weightsTextureSize, getParameters(gl, gl.MAX_TEXTURE_SIZE));
-    const floatTargetSupport = hasFeatures(gl, FEATURES.COLOR_ATTACHMENT_RGBA32F);
+    const floatTargetSupport = hasFeatures(gl, FLOAT_TARGET_FEATURES);
     const {format, type} = getTextureParams({gl, floatTargetSupport});
     const weightsScale = floatTargetSupport ? 1 : 1 / 255;
     this.setState({textureSize, format, type, weightsScale});
@@ -480,17 +492,20 @@ export default class HeatmapLayer extends AggregationLayer {
     weightsTransform.update({
       elementCount: this.getNumInstances()
     });
-    weightsTransform.run({
-      uniforms,
-      parameters: {
-        blend: true,
-        depthTest: false,
-        blendFunc: [GL.ONE, GL.ONE],
-        blendEquation: GL.FUNC_ADD
-      },
-      clearRenderTarget: true,
-      attributes: this.getAttributes(),
-      moduleSettings: this.getModuleSettings()
+    // Need to explictly specify clearColor as external context may have modified it
+    withParameters(this.context.gl, {clearColor: [0, 0, 0, 0]}, () => {
+      weightsTransform.run({
+        uniforms,
+        parameters: {
+          blend: true,
+          depthTest: false,
+          blendFunc: [GL.ONE, GL.ONE],
+          blendEquation: GL.FUNC_ADD
+        },
+        clearRenderTarget: true,
+        attributes: this.getAttributes(),
+        moduleSettings: this.getModuleSettings()
+      });
     });
     this._updateMaxWeightValue();