@deck.gl/aggregation-layers 9.0.35 → 9.1.0-beta.1

package/dist/heatmap-layer/heatmap-layer.js

@@ -1,33 +1,18 @@
-// Copyright (c) 2015 - 2019 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 /* global setTimeout clearTimeout */
 import { getBounds, boundsContain, packVertices, scaleToAspectRatio, getTextureCoordinates } from "./heatmap-layer-utils.js";
 import { TextureTransform } from '@luma.gl/engine';
-import { AttributeManager, COORDINATE_SYSTEM, log } from '@deck.gl/core';
+import { AttributeManager, COORDINATE_SYSTEM, log, project32 } from '@deck.gl/core';
 import TriangleLayer from "./triangle-layer.js";
-import AggregationLayer from "../aggregation-layer.js";
-import { defaultColorRange, colorRangeToFlatArray } from "../utils/color-utils.js";
+import AggregationLayer from "./aggregation-layer.js";
+import { defaultColorRange, colorRangeToFlatArray } from "../common/utils/color-utils.js";
 import weightsVs from "./weights-vs.glsl.js";
 import weightsFs from "./weights-fs.glsl.js";
 import maxVs from "./max-vs.glsl.js";
 import maxFs from "./max-fs.glsl.js";
+import { maxWeightUniforms, weightUniforms } from "./heatmap-layer-uniforms.js";
 const RESOLUTION = 2; // (number of common space pixels) / (number texels)
 const TEXTURE_PROPS = {
     format: 'rgba8unorm',
@@ -68,6 +53,13 @@ const DIMENSIONS = {
 };
 /** Visualizes the spatial distribution of data. */
 class HeatmapLayer extends AggregationLayer {
+    getShaders(shaders) {
+        let modules = [project32];
+        if (shaders.modules) {
+            modules = [...modules, ...shaders.modules];
+        }
+        return super.getShaders({ ...shaders, modules });
+    }
     initializeState() {
         super.initializeAggregationLayer(DIMENSIONS);
         this.setState({ colorDomain: DEFAULT_COLOR_DOMAIN });
@@ -231,7 +223,8 @@ class HeatmapLayer extends AggregationLayer {
                 blendAlphaDstFactor: 'one'
             },
             topology: 'point-list',
-            ...shaders
+            ...shaders,
+            modules: [...shaders.modules, weightUniforms]
         });
         this.setState({ weightsTransform });
     }
@@ -244,11 +237,13 @@ class HeatmapLayer extends AggregationLayer {
             fs: weightsFs
         });
         this._createWeightsTransform(weightsTransformShaders);
-        const maxWeightsTransformShaders = this.getShaders({ vs: maxVs, fs: maxFs });
+        const maxWeightsTransformShaders = this.getShaders({
+            vs: maxVs,
+            fs: maxFs,
+            modules: [maxWeightUniforms]
+        });
         const maxWeightTransform = new TextureTransform(device, {
             id: `${this.id}-max-weights-transform`,
-            bindings: { inTexture: weightsTexture },
-            uniforms: { textureSize },
             targetTexture: maxWeightsTexture,
             ...maxWeightsTransformShaders,
             vertexCount: textureSize * textureSize,
@@ -263,6 +258,10 @@ class HeatmapLayer extends AggregationLayer {
                 blendAlphaDstFactor: 'one'
             }
         });
+        const maxWeightProps = { inTexture: weightsTexture, textureSize };
+        maxWeightTransform.model.shaderInputs.setProps({
+            maxWeight: maxWeightProps
+        });
         this.setState({
             weightsTexture,
             maxWeightsTexture,
@@ -296,8 +295,8 @@ class HeatmapLayer extends AggregationLayer {
         const viewportCorners = [
             viewport.unproject([0, 0]),
             viewport.unproject([viewport.width, 0]),
-            viewport.unproject([viewport.width, viewport.height]),
-            viewport.unproject([0, viewport.height])
+            viewport.unproject([0, viewport.height]),
+            viewport.unproject([viewport.width, viewport.height])
         ].map(p => p.map(Math.fround));
         // #1: get world bounds for current viewport extends
         const visibleWorldBounds = getBounds(viewportCorners); // TODO: Change to visible bounds
@@ -341,10 +340,11 @@ class HeatmapLayer extends AggregationLayer {
         const colors = colorRangeToFlatArray(colorRange, false, Uint8Array);
         if (colorTexture && colorTexture?.width === colorRange.length) {
             // TODO(v9): Unclear whether `setSubImageData` is a public API, or what to use if not.
-            colorTexture.setSubImageData({ data: colors });
+            colorTexture.setTexture2DData({ data: colors });
         }
         else {
             colorTexture?.destroy();
+            // @ts-expect-error TODO(ib) - texture API change
             colorTexture = this.context.device.createTexture({
                 ...TEXTURE_PROPS,
                 data: colors,
@@ -356,7 +356,7 @@ class HeatmapLayer extends AggregationLayer {
     }
     _updateWeightmap() {
         const { radiusPixels, colorDomain, aggregation } = this.props;
-        const { worldBounds, textureSize, weightsScale } = this.state;
+        const { worldBounds, textureSize, weightsScale, weightsTexture } = this.state;
         const weightsTransform = this.state.weightsTransform;
         this.state.isWeightMapDirty = false;
         // convert world bounds to common using Layer's coordiante system and origin
@@ -376,11 +376,21 @@ class HeatmapLayer extends AggregationLayer {
         const attributeManager = this.getAttributeManager();
         const attributes = attributeManager.getAttributes();
         const moduleSettings = this.getModuleSettings();
-        const uniforms = { radiusPixels, commonBounds, textureWidth: textureSize, weightsScale };
         this._setModelAttributes(weightsTransform.model, attributes);
         weightsTransform.model.setVertexCount(this.getNumInstances());
-        weightsTransform.model.setUniforms(uniforms);
-        weightsTransform.model.updateModuleSettings(moduleSettings);
+        const weightProps = {
+            radiusPixels,
+            commonBounds,
+            textureWidth: textureSize,
+            weightsScale,
+            weightsTexture: weightsTexture
+        };
+        const { viewport, devicePixelRatio, coordinateSystem, coordinateOrigin } = moduleSettings;
+        const { modelMatrix } = this.props;
+        weightsTransform.model.shaderInputs.setProps({
+            project: { viewport, devicePixelRatio, modelMatrix, coordinateSystem, coordinateOrigin },
+            weight: weightProps
+        });
         weightsTransform.run({
             parameters: { viewport: [0, 0, textureSize, textureSize] },
             clearColor: [0, 0, 0, 0]

package/dist/heatmap-layer/max-fs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"max-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-fs.glsl.ts"],"names":[],"mappings":";AAAA,wBAQE"}
+{"version":3,"file":"max-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-fs.glsl.ts"],"names":[],"mappings":";AAIA,wBAQE"}

package/dist/heatmap-layer/max-fs.glsl.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export default `\
 #version 300 es
 in vec4 outTexture;

package/dist/heatmap-layer/max-vs.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\nuniform sampler2D inTexture;\nuniform float textureSize;\nout vec4 outTexture;\n\nvoid main()\n{\n  // Sample every pixel in texture\n  int yIndex = gl_VertexID / int(textureSize);\n  int xIndex = gl_VertexID - (yIndex * int(textureSize));\n  vec2 uv = (0.5 + vec2(float(xIndex), float(yIndex))) / textureSize;\n  outTexture = texture(inTexture, uv);\n\n  gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n  // Enforce default value for ANGLE issue (https://bugs.chromium.org/p/angleproject/issues/detail?id=3941)\n  gl_PointSize = 1.0;\n}\n";
+declare const _default: "#version 300 es\nuniform sampler2D inTexture;\nout vec4 outTexture;\n\nvoid main()\n{\n  // Sample every pixel in texture\n  int yIndex = gl_VertexID / int(maxWeight.textureSize);\n  int xIndex = gl_VertexID - (yIndex * int(maxWeight.textureSize));\n  vec2 uv = (0.5 + vec2(float(xIndex), float(yIndex))) / maxWeight.textureSize;\n  outTexture = texture(inTexture, uv);\n\n  gl_Position = vec4(0.0, 0.0, 0.0, 1.0);\n  // Enforce default value for ANGLE issue (https://bugs.chromium.org/p/angleproject/issues/detail?id=3941)\n  gl_PointSize = 1.0;\n}\n";
 export default _default;
 //# sourceMappingURL=max-vs.glsl.d.ts.map

package/dist/heatmap-layer/max-vs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"max-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-vs.glsl.ts"],"names":[],"mappings":";AAAA,wBAkBE"}
+{"version":3,"file":"max-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/max-vs.glsl.ts"],"names":[],"mappings":";AAIA,wBAiBE"}

package/dist/heatmap-layer/max-vs.glsl.js

@@ -1,13 +1,15 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export default `\
 #version 300 es
 uniform sampler2D inTexture;
-uniform float textureSize;
 out vec4 outTexture;
 void main()
 {
-int yIndex = gl_VertexID / int(textureSize);
-int xIndex = gl_VertexID - (yIndex * int(textureSize));
-vec2 uv = (0.5 + vec2(float(xIndex), float(yIndex))) / textureSize;
+int yIndex = gl_VertexID / int(maxWeight.textureSize);
+int xIndex = gl_VertexID - (yIndex * int(maxWeight.textureSize));
+vec2 uv = (0.5 + vec2(float(xIndex), float(yIndex))) / maxWeight.textureSize;
 outTexture = texture(inTexture, uv);
 gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
 gl_PointSize = 1.0;

package/dist/heatmap-layer/triangle-layer-fragment.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\n#define SHADER_NAME triangle-layer-fragment-shader\n\nprecision highp float;\n\nuniform float opacity;\nuniform sampler2D weightsTexture;\nuniform sampler2D colorTexture;\nuniform float aggregationMode;\n\nin vec2 vTexCoords;\nin float vIntensityMin;\nin float vIntensityMax;\n\nout vec4 fragColor;\n\nvec4 getLinearColor(float value) {\n  float factor = clamp(value * vIntensityMax, 0., 1.);\n  vec4 color = texture(colorTexture, vec2(factor, 0.5));\n  color.a *= min(value * vIntensityMin, 1.0);\n  return color;\n}\n\nvoid main(void) {\n  vec4 weights = texture(weightsTexture, vTexCoords);\n  float weight = weights.r;\n\n  if (aggregationMode > 0.5) {\n    weight /= max(1.0, weights.a);\n  }\n\n  // discard pixels with 0 weight.\n  if (weight <= 0.) {\n     discard;\n  }\n\n  vec4 linearColor = getLinearColor(weight);\n  linearColor.a *= opacity;\n  fragColor = linearColor;\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME triangle-layer-fragment-shader\n\nprecision highp float;\n\nuniform sampler2D weightsTexture;\nuniform sampler2D colorTexture;\n\nin vec2 vTexCoords;\nin float vIntensityMin;\nin float vIntensityMax;\n\nout vec4 fragColor;\n\nvec4 getLinearColor(float value) {\n  float factor = clamp(value * vIntensityMax, 0., 1.);\n  vec4 color = texture(colorTexture, vec2(factor, 0.5));\n  color.a *= min(value * vIntensityMin, 1.0);\n  return color;\n}\n\nvoid main(void) {\n  vec4 weights = texture(weightsTexture, vTexCoords);\n  float weight = weights.r;\n\n  if (triangle.aggregationMode > 0.5) {\n    weight /= max(1.0, weights.a);\n  }\n\n  // discard pixels with 0 weight.\n  if (weight <= 0.) {\n     discard;\n  }\n\n  vec4 linearColor = getLinearColor(weight);\n  linearColor.a *= layer.opacity;\n  fragColor = linearColor;\n}\n";
 export default _default;
 //# sourceMappingURL=triangle-layer-fragment.glsl.d.ts.map

package/dist/heatmap-layer/triangle-layer-fragment.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangle-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-fragment.glsl.ts"],"names":[],"mappings":";AAoBA,wBAyCE"}
+{"version":3,"file":"triangle-layer-fragment.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-fragment.glsl.ts"],"names":[],"mappings":";AAIA,wBAuCE"}

package/dist/heatmap-layer/triangle-layer-fragment.glsl.js

@@ -1,30 +1,12 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export default `\
 #version 300 es
 #define SHADER_NAME triangle-layer-fragment-shader
 precision highp float;
-uniform float opacity;
 uniform sampler2D weightsTexture;
 uniform sampler2D colorTexture;
-uniform float aggregationMode;
 in vec2 vTexCoords;
 in float vIntensityMin;
 in float vIntensityMax;
@@ -38,14 +20,14 @@ return color;
 void main(void) {
 vec4 weights = texture(weightsTexture, vTexCoords);
 float weight = weights.r;
-if (aggregationMode > 0.5) {
+if (triangle.aggregationMode > 0.5) {
 weight /= max(1.0, weights.a);
 }
 if (weight <= 0.) {
 discard;
 }
 vec4 linearColor = getLinearColor(weight);
-linearColor.a *= opacity;
+linearColor.a *= layer.opacity;
 fragColor = linearColor;
 }
 `;

package/dist/heatmap-layer/triangle-layer-uniforms.d.ts

@@ -0,0 +1,22 @@
+import { Texture } from '@luma.gl/core';
+export type TriangleProps = {
+    aggregationMode: number;
+    colorDomain: [number, number];
+    intensity: number;
+    threshold: number;
+    colorTexture: Texture;
+    maxTexture: Texture;
+    weightsTexture: Texture;
+};
+export declare const triangleUniforms: {
+    readonly name: "triangle";
+    readonly vs: "uniform triangleUniforms {\n  float aggregationMode;\n  vec2 colorDomain;\n  float intensity;\n  float threshold;\n} triangle;\n";
+    readonly fs: "uniform triangleUniforms {\n  float aggregationMode;\n  vec2 colorDomain;\n  float intensity;\n  float threshold;\n} triangle;\n";
+    readonly uniformTypes: {
+        readonly aggregationMode: "f32";
+        readonly colorDomain: "vec2<f32>";
+        readonly intensity: "f32";
+        readonly threshold: "f32";
+    };
+};
+//# sourceMappingURL=triangle-layer-uniforms.d.ts.map

package/dist/heatmap-layer/triangle-layer-uniforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"triangle-layer-uniforms.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-uniforms.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAYtC,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;CAUmB,CAAC"}

package/dist/heatmap-layer/triangle-layer-uniforms.js

@@ -0,0 +1,22 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+const uniformBlock = `\
+uniform triangleUniforms {
+  float aggregationMode;
+  vec2 colorDomain;
+  float intensity;
+  float threshold;
+} triangle;
+`;
+export const triangleUniforms = {
+    name: 'triangle',
+    vs: uniformBlock,
+    fs: uniformBlock,
+    uniformTypes: {
+        aggregationMode: 'f32',
+        colorDomain: 'vec2<f32>',
+        intensity: 'f32',
+        threshold: 'f32'
+    }
+};

package/dist/heatmap-layer/triangle-layer-vertex.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\n#define SHADER_NAME heatp-map-layer-vertex-shader\n\nuniform sampler2D maxTexture;\nuniform float intensity;\nuniform vec2 colorDomain;\nuniform float threshold;\nuniform float aggregationMode;\n\nin vec3 positions;\nin vec2 texCoords;\n\nout vec2 vTexCoords;\nout float vIntensityMin;\nout float vIntensityMax;\n\nvoid main(void) {\n  gl_Position = project_position_to_clipspace(positions, vec3(0.0), vec3(0.0));\n  vTexCoords = texCoords;\n  vec4 maxTexture = texture(maxTexture, vec2(0.5));\n  float maxValue = aggregationMode < 0.5 ? maxTexture.r : maxTexture.g;\n  float minValue = maxValue * threshold;\n  if (colorDomain[1] > 0.) {\n    // if user specified custom domain use it.\n    maxValue = colorDomain[1];\n    minValue = colorDomain[0];\n  }\n  vIntensityMax = intensity / maxValue;\n  vIntensityMin = intensity / minValue;\n}\n";
+declare const _default: "#version 300 es\n#define SHADER_NAME heatp-map-layer-vertex-shader\n\nuniform sampler2D maxTexture;\n\nin vec3 positions;\nin vec2 texCoords;\n\nout vec2 vTexCoords;\nout float vIntensityMin;\nout float vIntensityMax;\n\nvoid main(void) {\n  gl_Position = project_position_to_clipspace(positions, vec3(0.0), vec3(0.0));\n  vTexCoords = texCoords;\n  vec4 maxTexture = texture(maxTexture, vec2(0.5));\n  float maxValue = triangle.aggregationMode < 0.5 ? maxTexture.r : maxTexture.g;\n  float minValue = maxValue * triangle.threshold;\n  if (triangle.colorDomain[1] > 0.) {\n    // if user specified custom domain use it.\n    maxValue = triangle.colorDomain[1];\n    minValue = triangle.colorDomain[0];\n  }\n  vIntensityMax = triangle.intensity / maxValue;\n  vIntensityMin = triangle.intensity / minValue;\n}\n";
 export default _default;
 //# sourceMappingURL=triangle-layer-vertex.glsl.d.ts.map

package/dist/heatmap-layer/triangle-layer-vertex.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangle-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-vertex.glsl.ts"],"names":[],"mappings":";AAsBA,wBA+BE"}
+{"version":3,"file":"triangle-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer-vertex.glsl.ts"],"names":[],"mappings":";AAMA,wBA2BE"}

package/dist/heatmap-layer/triangle-layer-vertex.glsl.js

@@ -1,31 +1,11 @@
-// Copyright (c) 2015 - 2017 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 // Inspired by screen-grid-layer vertex shader in deck.gl
 export default `\
 #version 300 es
 #define SHADER_NAME heatp-map-layer-vertex-shader
 uniform sampler2D maxTexture;
-uniform float intensity;
-uniform vec2 colorDomain;
-uniform float threshold;
-uniform float aggregationMode;
 in vec3 positions;
 in vec2 texCoords;
 out vec2 vTexCoords;
@@ -35,13 +15,13 @@ void main(void) {
 gl_Position = project_position_to_clipspace(positions, vec3(0.0), vec3(0.0));
 vTexCoords = texCoords;
 vec4 maxTexture = texture(maxTexture, vec2(0.5));
-float maxValue = aggregationMode < 0.5 ? maxTexture.r : maxTexture.g;
-float minValue = maxValue * threshold;
-if (colorDomain[1] > 0.) {
-maxValue = colorDomain[1];
-minValue = colorDomain[0];
+float maxValue = triangle.aggregationMode < 0.5 ? maxTexture.r : maxTexture.g;
+float minValue = maxValue * triangle.threshold;
+if (triangle.colorDomain[1] > 0.) {
+maxValue = triangle.colorDomain[1];
+minValue = triangle.colorDomain[0];
 }
-vIntensityMax = intensity / maxValue;
-vIntensityMin = intensity / minValue;
+vIntensityMax = triangle.intensity / maxValue;
+vIntensityMin = triangle.intensity / minValue;
 }
 `;

package/dist/heatmap-layer/triangle-layer.d.ts

@@ -8,8 +8,8 @@ type _TriangleLayerProps = {
             texCoords: Buffer;
         };
     };
-    colorDomain: number[];
-    aggregationMode: string;
+    colorDomain: [number, number];
+    aggregationMode: number;
     threshold: number;
     intensity: number;
     vertexCount: number;
@@ -24,16 +24,10 @@ export default class TriangleLayer extends Layer<_TriangleLayerProps> {
         positions: Buffer;
         texCoords: Buffer;
     };
-    getShaders(): {
-        vs: string;
-        fs: string;
-        modules: import("@luma.gl/shadertools").ShaderModule[];
-    };
+    getShaders(): any;
     initializeState({ device }: LayerContext): void;
     _getModel(device: Device): Model;
-    draw({ uniforms }: {
-        uniforms: any;
-    }): void;
+    draw(): void;
 }
 export {};
 //# sourceMappingURL=triangle-layer.d.ts.map

package/dist/heatmap-layer/triangle-layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"triangle-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,KAAK,EAAE,YAAY,EAAY,MAAM,eAAe,CAAC;AAI7D,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE;QAAC,UAAU,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAC,CAAA;KAAC,CAAC;IAC3D,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,mBAAmB,CAAC;IACnE,MAAM,CAAC,SAAS,SAAmB;IAEnC,KAAK,EAAG;QACN,KAAK,EAAE,KAAK,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IAEF,UAAU;;;;;IAIV,eAAe,CAAC,EAAC,MAAM,EAAC,EAAE,YAAY,GAAG,IAAI;IAI7C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK;IAiBhC,IAAI,CAAC,EAAC,QAAQ,EAAC;;KAAA,GAAG,IAAI;CAYvB"}
+{"version":3,"file":"triangle-layer.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/triangle-layer.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAC,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAC,KAAK,EAAC,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAC,KAAK,EAAE,YAAY,EAAY,MAAM,eAAe,CAAC;AAK7D,KAAK,mBAAmB,GAAG;IACzB,IAAI,EAAE;QAAC,UAAU,EAAE;YAAC,SAAS,EAAE,MAAM,CAAC;YAAC,SAAS,EAAE,MAAM,CAAA;SAAC,CAAA;KAAC,CAAC;IAC3D,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,KAAK,CAAC,mBAAmB,CAAC;IACnE,MAAM,CAAC,SAAS,SAAmB;IAEnC,KAAK,EAAG;QACN,KAAK,EAAE,KAAK,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IAEF,UAAU;IAIV,eAAe,CAAC,EAAC,MAAM,EAAC,EAAE,YAAY,GAAG,IAAI;IAI7C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK;IAgBhC,IAAI,IAAI,IAAI;CAuBb"}

package/dist/heatmap-layer/triangle-layer.js

@@ -1,58 +1,45 @@
-// Copyright (c) 2015 - 2019 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { Model } from '@luma.gl/engine';
 import { Layer, project32 } from '@deck.gl/core';
 import vs from "./triangle-layer-vertex.glsl.js";
 import fs from "./triangle-layer-fragment.glsl.js";
+import { triangleUniforms } from "./triangle-layer-uniforms.js";
 class TriangleLayer extends Layer {
     getShaders() {
-        return { vs, fs, modules: [project32] };
+        return super.getShaders({ vs, fs, modules: [project32, triangleUniforms] });
     }
     initializeState({ device }) {
         this.setState({ model: this._getModel(device) });
     }
     _getModel(device) {
-        const { vertexCount, data, weightsTexture, maxTexture, colorTexture } = this.props;
+        const { vertexCount, data } = this.props;
         return new Model(device, {
             ...this.getShaders(),
             id: this.props.id,
-            bindings: { weightsTexture, maxTexture, colorTexture },
             attributes: data.attributes,
             bufferLayout: [
                 { name: 'positions', format: 'float32x3' },
                 { name: 'texCoords', format: 'float32x2' }
             ],
-            topology: 'triangle-fan-webgl',
+            topology: 'triangle-strip',
             vertexCount
         });
     }
-    draw({ uniforms }) {
+    draw() {
         const { model } = this.state;
-        const { intensity, threshold, aggregationMode, colorDomain } = this.props;
-        model.setUniforms({
-            ...uniforms,
+        const { aggregationMode, colorDomain, intensity, threshold, colorTexture, maxTexture, weightsTexture } = this.props;
+        const triangleProps = {
+            aggregationMode,
+            colorDomain,
             intensity,
             threshold,
-            aggregationMode,
-            colorDomain
-        });
+            colorTexture,
+            maxTexture,
+            weightsTexture
+        };
+        model.shaderInputs.setProps({ triangle: triangleProps });
         model.draw(this.context.renderPass);
     }
 }

package/dist/heatmap-layer/weights-fs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"weights-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-fs.glsl.ts"],"names":[],"mappings":";AAAA,wBAoBE"}
+{"version":3,"file":"weights-fs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-fs.glsl.ts"],"names":[],"mappings":";AAIA,wBAoBE"}

package/dist/heatmap-layer/weights-fs.glsl.js

@@ -1,3 +1,6 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export default `\
 #version 300 es
 in vec4 weightsTexture;

package/dist/heatmap-layer/weights-vs.glsl.d.ts

@@ -1,3 +1,3 @@
-declare const _default: "#version 300 es\nin vec3 positions;\nin vec3 positions64Low;\nin float weights;\nout vec4 weightsTexture;\nuniform float radiusPixels;\nuniform float textureWidth;\nuniform vec4 commonBounds;\nuniform float weightsScale;\n\nvoid main()\n{\n  weightsTexture = vec4(weights * weightsScale, 0., 0., 1.);\n\n  float radiusTexels = project_pixel_size(radiusPixels) * textureWidth / (commonBounds.z - commonBounds.x);\n  gl_PointSize = radiusTexels * 2.;\n\n  vec3 commonPosition = project_position(positions, positions64Low);\n\n  // // map xy from commonBounds to [-1, 1]\n  gl_Position.xy = (commonPosition.xy - commonBounds.xy) / (commonBounds.zw - commonBounds.xy) ;\n  gl_Position.xy = (gl_Position.xy * 2.) - (1.);\n  gl_Position.w = 1.0;\n}\n";
+declare const _default: "#version 300 es\nin vec3 positions;\nin vec3 positions64Low;\nin float weights;\nout vec4 weightsTexture;\n\nvoid main()\n{\n  weightsTexture = vec4(weights * weight.weightsScale, 0., 0., 1.);\n\n  float radiusTexels = project_pixel_size(weight.radiusPixels) * weight.textureWidth / (weight.commonBounds.z - weight.commonBounds.x);\n  gl_PointSize = radiusTexels * 2.;\n\n  vec3 commonPosition = project_position(positions, positions64Low);\n\n  // // map xy from commonBounds to [-1, 1]\n  gl_Position.xy = (commonPosition.xy - weight.commonBounds.xy) / (weight.commonBounds.zw - weight.commonBounds.xy) ;\n  gl_Position.xy = (gl_Position.xy * 2.) - (1.);\n  gl_Position.w = 1.0;\n}\n";
 export default _default;
 //# sourceMappingURL=weights-vs.glsl.d.ts.map

package/dist/heatmap-layer/weights-vs.glsl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"weights-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-vs.glsl.ts"],"names":[],"mappings":";AAAA,wBAyBE"}
+{"version":3,"file":"weights-vs.glsl.d.ts","sourceRoot":"","sources":["../../src/heatmap-layer/weights-vs.glsl.ts"],"names":[],"mappings":";AAIA,wBAqBE"}

package/dist/heatmap-layer/weights-vs.glsl.js

@@ -1,20 +1,19 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 export default `\
 #version 300 es
 in vec3 positions;
 in vec3 positions64Low;
 in float weights;
 out vec4 weightsTexture;
-uniform float radiusPixels;
-uniform float textureWidth;
-uniform vec4 commonBounds;
-uniform float weightsScale;
 void main()
 {
-weightsTexture = vec4(weights * weightsScale, 0., 0., 1.);
-float radiusTexels = project_pixel_size(radiusPixels) * textureWidth / (commonBounds.z - commonBounds.x);
+weightsTexture = vec4(weights * weight.weightsScale, 0., 0., 1.);
+float radiusTexels = project_pixel_size(weight.radiusPixels) * weight.textureWidth / (weight.commonBounds.z - weight.commonBounds.x);
 gl_PointSize = radiusTexels * 2.;
 vec3 commonPosition = project_position(positions, positions64Low);
-gl_Position.xy = (commonPosition.xy - commonBounds.xy) / (commonBounds.zw - commonBounds.xy) ;
+gl_Position.xy = (commonPosition.xy - weight.commonBounds.xy) / (weight.commonBounds.zw - weight.commonBounds.xy) ;
 gl_Position.xy = (gl_Position.xy * 2.) - (1.);
 gl_Position.w = 1.0;
 }

package/dist/hexagon-layer/bin-options-uniforms.d.ts

@@ -0,0 +1,14 @@
+import { NumberArray2 } from '@math.gl/core';
+export type BinOptions = {
+    hexOriginCommon: NumberArray2;
+    radiusCommon: number;
+};
+export declare const binOptionsUniforms: {
+    readonly name: "binOptions";
+    readonly vs: "uniform binOptionsUniforms {\n  vec2 hexOriginCommon;\n  float radiusCommon;\n} binOptions;\n";
+    readonly uniformTypes: {
+        readonly hexOriginCommon: "vec2<f32>";
+        readonly radiusCommon: "f32";
+    };
+};
+//# sourceMappingURL=bin-options-uniforms.d.ts.map

package/dist/hexagon-layer/bin-options-uniforms.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bin-options-uniforms.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/bin-options-uniforms.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAS3C,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,YAAY,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,kBAAkB;;;;;;;CAOc,CAAC"}

package/dist/hexagon-layer/bin-options-uniforms.js

@@ -0,0 +1,17 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+const uniformBlock = /* glsl */ `\
+uniform binOptionsUniforms {
+  vec2 hexOriginCommon;
+  float radiusCommon;
+} binOptions;
+`;
+export const binOptionsUniforms = {
+    name: 'binOptions',
+    vs: uniformBlock,
+    uniformTypes: {
+        hexOriginCommon: 'vec2<f32>',
+        radiusCommon: 'f32'
+    }
+};

package/dist/hexagon-layer/hexagon-cell-layer-vertex.glsl.d.ts

@@ -0,0 +1,3 @@
+declare const _default: string;
+export default _default;
+//# sourceMappingURL=hexagon-cell-layer-vertex.glsl.d.ts.map

package/dist/hexagon-layer/hexagon-cell-layer-vertex.glsl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hexagon-cell-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-cell-layer-vertex.glsl.ts"],"names":[],"mappings":";AAMA,wBAkEE"}