@deck.gl/aggregation-layers 9.3.0-alpha.3 → 9.3.0-alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.d.ts +3 -1
- package/dist/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.d.ts.map +1 -1
- package/dist/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.js +3 -2
- package/dist/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.js.map +1 -1
- package/dist/common/aggregator/gpu-aggregator/bin-sorter-uniforms.d.ts +1 -1
- package/dist/common/aggregator/gpu-aggregator/bin-sorter-uniforms.js +1 -1
- package/dist/contour-layer/bin-options-uniforms.d.ts +1 -1
- package/dist/contour-layer/bin-options-uniforms.js +1 -1
- package/dist/dist.dev.js +15 -14
- package/dist/grid-layer/bin-options-uniforms.d.ts +1 -1
- package/dist/grid-layer/bin-options-uniforms.js +1 -1
- package/dist/grid-layer/grid-layer-uniforms.d.ts +1 -1
- package/dist/grid-layer/grid-layer-uniforms.js +1 -1
- package/dist/heatmap-layer/heatmap-layer-uniforms.d.ts +2 -2
- package/dist/heatmap-layer/heatmap-layer-uniforms.js +2 -2
- package/dist/heatmap-layer/triangle-layer-uniforms.d.ts +2 -2
- package/dist/heatmap-layer/triangle-layer-uniforms.js +1 -1
- package/dist/hexagon-layer/bin-options-uniforms.d.ts +1 -1
- package/dist/hexagon-layer/bin-options-uniforms.js +1 -1
- package/dist/hexagon-layer/hexagon-layer-uniforms.d.ts +1 -1
- package/dist/hexagon-layer/hexagon-layer-uniforms.js +1 -1
- package/dist/index.cjs +15 -14
- package/dist/index.cjs.map +2 -2
- package/dist/screen-grid-layer/bin-options-uniforms.d.ts +1 -1
- package/dist/screen-grid-layer/bin-options-uniforms.js +1 -1
- package/dist/screen-grid-layer/screen-grid-layer-uniforms.d.ts +1 -1
- package/dist/screen-grid-layer/screen-grid-layer-uniforms.js +1 -1
- package/dist/screen-grid-layer/screen-grid-layer.js +1 -1
- package/dist.min.js +14 -14
- package/package.json +7 -8
- package/src/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.ts +4 -2
- package/src/common/aggregator/gpu-aggregator/bin-sorter-uniforms.ts +1 -1
- package/src/contour-layer/bin-options-uniforms.ts +1 -1
- package/src/grid-layer/bin-options-uniforms.ts +1 -1
- package/src/grid-layer/grid-layer-uniforms.ts +1 -1
- package/src/heatmap-layer/heatmap-layer-uniforms.ts +2 -2
- package/src/heatmap-layer/triangle-layer-uniforms.ts +1 -1
- package/src/hexagon-layer/bin-options-uniforms.ts +1 -1
- package/src/hexagon-layer/hexagon-layer-uniforms.ts +1 -1
- package/src/screen-grid-layer/bin-options-uniforms.ts +1 -1
- package/src/screen-grid-layer/screen-grid-layer-uniforms.ts +1 -1
- package/src/screen-grid-layer/screen-grid-layer.ts +1 -1
|
@@ -4,15 +4,17 @@ export type AggregatorTransformProps = {
|
|
|
4
4
|
binIdRange: NumberArray4;
|
|
5
5
|
isCount: NumberArray3;
|
|
6
6
|
isMean: NumberArray3;
|
|
7
|
+
naN: number;
|
|
7
8
|
bins: Texture;
|
|
8
9
|
};
|
|
9
10
|
export declare const aggregatorTransformUniforms: {
|
|
10
11
|
readonly name: "aggregatorTransform";
|
|
11
|
-
readonly vs: "uniform aggregatorTransformUniforms {\n ivec4 binIdRange;\n bvec3 isCount;\n bvec3 isMean;\n float naN;\n} aggregatorTransform;\n";
|
|
12
|
+
readonly vs: "layout(std140) uniform aggregatorTransformUniforms {\n ivec4 binIdRange;\n bvec3 isCount;\n bvec3 isMean;\n float naN;\n} aggregatorTransform;\n";
|
|
12
13
|
readonly uniformTypes: {
|
|
13
14
|
readonly binIdRange: "vec4<i32>";
|
|
14
15
|
readonly isCount: "vec3<f32>";
|
|
15
16
|
readonly isMean: "vec3<f32>";
|
|
17
|
+
readonly naN: "f32";
|
|
16
18
|
};
|
|
17
19
|
};
|
|
18
20
|
//# sourceMappingURL=aggregation-transform-uniforms.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregation-transform-uniforms.d.ts","sourceRoot":"","sources":["../../../../src/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAWtC,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,YAAY,CAAC;IACzB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,2BAA2B
|
|
1
|
+
{"version":3,"file":"aggregation-transform-uniforms.d.ts","sourceRoot":"","sources":["../../../../src/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,YAAY,EAAE,YAAY,EAAC,MAAM,eAAe,CAAC;AAEzD,OAAO,EAAC,OAAO,EAAC,MAAM,eAAe,CAAC;AAWtC,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,EAAE,YAAY,CAAC;IACzB,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,2BAA2B;;;;;;;;;CASmB,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
const uniformBlock = /* glsl */ `\
|
|
5
|
-
uniform aggregatorTransformUniforms {
|
|
5
|
+
layout(std140) uniform aggregatorTransformUniforms {
|
|
6
6
|
ivec4 binIdRange;
|
|
7
7
|
bvec3 isCount;
|
|
8
8
|
bvec3 isMean;
|
|
@@ -15,7 +15,8 @@ export const aggregatorTransformUniforms = {
|
|
|
15
15
|
uniformTypes: {
|
|
16
16
|
binIdRange: 'vec4<i32>',
|
|
17
17
|
isCount: 'vec3<f32>',
|
|
18
|
-
isMean: 'vec3<f32>'
|
|
18
|
+
isMean: 'vec3<f32>',
|
|
19
|
+
naN: 'f32'
|
|
19
20
|
}
|
|
20
21
|
};
|
|
21
22
|
//# sourceMappingURL=aggregation-transform-uniforms.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregation-transform-uniforms.js","sourceRoot":"","sources":["../../../../src/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;CAO/B,CAAC;
|
|
1
|
+
{"version":3,"file":"aggregation-transform-uniforms.js","sourceRoot":"","sources":["../../../../src/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAMpC,MAAM,YAAY,GAAG,UAAU,CAAC;;;;;;;CAO/B,CAAC;AAUF,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,IAAI,EAAE,qBAAqB;IAC3B,EAAE,EAAE,YAAY;IAChB,YAAY,EAAE;QACZ,UAAU,EAAE,WAAW;QACvB,OAAO,EAAE,WAAW;QACpB,MAAM,EAAE,WAAW;QACnB,GAAG,EAAE,KAAK;KACX;CACwD,CAAC"}
|
|
@@ -5,7 +5,7 @@ export type BinSorterProps = {
|
|
|
5
5
|
};
|
|
6
6
|
export declare const binSorterUniforms: {
|
|
7
7
|
readonly name: "binSorter";
|
|
8
|
-
readonly vs: "uniform binSorterUniforms {\n ivec4 binIdRange;\n ivec2 targetSize;\n} binSorter;\n";
|
|
8
|
+
readonly vs: "layout(std140) uniform binSorterUniforms {\n ivec4 binIdRange;\n ivec2 targetSize;\n} binSorter;\n";
|
|
9
9
|
readonly uniformTypes: {
|
|
10
10
|
readonly binIdRange: "vec4<i32>";
|
|
11
11
|
readonly targetSize: "vec2<i32>";
|
|
@@ -4,7 +4,7 @@ export type BinOptions = {
|
|
|
4
4
|
};
|
|
5
5
|
export declare const binOptionsUniforms: {
|
|
6
6
|
readonly name: "binOptions";
|
|
7
|
-
readonly vs: "uniform binOptionsUniforms {\n vec2 cellOriginCommon;\n vec2 cellSizeCommon;\n} binOptions;\n";
|
|
7
|
+
readonly vs: "layout(std140) uniform binOptionsUniforms {\n vec2 cellOriginCommon;\n vec2 cellSizeCommon;\n} binOptions;\n";
|
|
8
8
|
readonly uniformTypes: {
|
|
9
9
|
readonly cellOriginCommon: "vec2<f32>";
|
|
10
10
|
readonly cellSizeCommon: "vec2<f32>";
|
package/dist/dist.dev.js
CHANGED
|
@@ -416,7 +416,7 @@ var __exports__ = (() => {
|
|
|
416
416
|
// src/common/aggregator/gpu-aggregator/bin-sorter-uniforms.ts
|
|
417
417
|
var uniformBlock = (
|
|
418
418
|
/* glsl */
|
|
419
|
-
`uniform binSorterUniforms {
|
|
419
|
+
`layout(std140) uniform binSorterUniforms {
|
|
420
420
|
ivec4 binIdRange;
|
|
421
421
|
ivec2 targetSize;
|
|
422
422
|
} binSorter;
|
|
@@ -648,7 +648,7 @@ void main() {
|
|
|
648
648
|
// src/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.ts
|
|
649
649
|
var uniformBlock2 = (
|
|
650
650
|
/* glsl */
|
|
651
|
-
`uniform aggregatorTransformUniforms {
|
|
651
|
+
`layout(std140) uniform aggregatorTransformUniforms {
|
|
652
652
|
ivec4 binIdRange;
|
|
653
653
|
bvec3 isCount;
|
|
654
654
|
bvec3 isMean;
|
|
@@ -662,7 +662,8 @@ void main() {
|
|
|
662
662
|
uniformTypes: {
|
|
663
663
|
binIdRange: "vec4<i32>",
|
|
664
664
|
isCount: "vec3<f32>",
|
|
665
|
-
isMean: "vec3<f32>"
|
|
665
|
+
isMean: "vec3<f32>",
|
|
666
|
+
naN: "f32"
|
|
666
667
|
}
|
|
667
668
|
};
|
|
668
669
|
|
|
@@ -1250,7 +1251,7 @@ void main(void) {
|
|
|
1250
1251
|
// src/screen-grid-layer/screen-grid-layer-uniforms.ts
|
|
1251
1252
|
var uniformBlock3 = (
|
|
1252
1253
|
/* glsl */
|
|
1253
|
-
`uniform screenGridUniforms {
|
|
1254
|
+
`layout(std140) uniform screenGridUniforms {
|
|
1254
1255
|
vec2 cellSizeClipspace;
|
|
1255
1256
|
vec2 gridSizeClipspace;
|
|
1256
1257
|
vec2 colorDomain;
|
|
@@ -1349,7 +1350,7 @@ void main(void) {
|
|
|
1349
1350
|
// src/screen-grid-layer/bin-options-uniforms.ts
|
|
1350
1351
|
var uniformBlock4 = (
|
|
1351
1352
|
/* glsl */
|
|
1352
|
-
`uniform binOptionsUniforms {
|
|
1353
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
1353
1354
|
float cellSizePixels;
|
|
1354
1355
|
} binOptions;
|
|
1355
1356
|
`
|
|
@@ -1409,7 +1410,7 @@ void main(void) {
|
|
|
1409
1410
|
|
|
1410
1411
|
void getBin(out ivec2 binId) {
|
|
1411
1412
|
vec4 pos = project_position_to_clipspace(positions, positions64Low, vec3(0.0));
|
|
1412
|
-
vec2 screenCoords = vec2(pos.x / pos.w + 1.0, 1.0 - pos.y / pos.w) / 2.0 * project.viewportSize / project.devicePixelRatio;
|
|
1413
|
+
vec2 screenCoords = vec2(pos.x / pos.w + 1.0, 1.0 - pos.y / pos.w) / 2.0 * project.viewportSize.xy / project.devicePixelRatio;
|
|
1413
1414
|
vec2 gridCoords = floor(screenCoords / binOptions.cellSizePixels);
|
|
1414
1415
|
binId = ivec2(gridCoords);
|
|
1415
1416
|
}
|
|
@@ -1875,7 +1876,7 @@ void main(void) {
|
|
|
1875
1876
|
// src/hexagon-layer/hexagon-layer-uniforms.ts
|
|
1876
1877
|
var uniformBlock5 = (
|
|
1877
1878
|
/* glsl */
|
|
1878
|
-
`uniform hexagonUniforms {
|
|
1879
|
+
`layout(std140) uniform hexagonUniforms {
|
|
1879
1880
|
vec4 colorDomain;
|
|
1880
1881
|
vec4 elevationDomain;
|
|
1881
1882
|
vec2 elevationRange;
|
|
@@ -2003,7 +2004,7 @@ void main(void) {
|
|
|
2003
2004
|
// src/hexagon-layer/bin-options-uniforms.ts
|
|
2004
2005
|
var uniformBlock6 = (
|
|
2005
2006
|
/* glsl */
|
|
2006
|
-
`uniform binOptionsUniforms {
|
|
2007
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
2007
2008
|
vec2 hexOriginCommon;
|
|
2008
2009
|
float radiusCommon;
|
|
2009
2010
|
} binOptions;
|
|
@@ -4589,7 +4590,7 @@ void main(void) {
|
|
|
4589
4590
|
// src/contour-layer/bin-options-uniforms.ts
|
|
4590
4591
|
var uniformBlock7 = (
|
|
4591
4592
|
/* glsl */
|
|
4592
|
-
`uniform binOptionsUniforms {
|
|
4593
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
4593
4594
|
vec2 cellOriginCommon;
|
|
4594
4595
|
vec2 cellSizeCommon;
|
|
4595
4596
|
} binOptions;
|
|
@@ -4933,7 +4934,7 @@ void main(void) {
|
|
|
4933
4934
|
// src/grid-layer/grid-layer-uniforms.ts
|
|
4934
4935
|
var uniformBlock8 = (
|
|
4935
4936
|
/* glsl */
|
|
4936
|
-
`uniform gridUniforms {
|
|
4937
|
+
`layout(std140) uniform gridUniforms {
|
|
4937
4938
|
vec4 colorDomain;
|
|
4938
4939
|
vec4 elevationDomain;
|
|
4939
4940
|
vec2 elevationRange;
|
|
@@ -5064,7 +5065,7 @@ void main(void) {
|
|
|
5064
5065
|
// src/grid-layer/bin-options-uniforms.ts
|
|
5065
5066
|
var uniformBlock9 = (
|
|
5066
5067
|
/* glsl */
|
|
5067
|
-
`uniform binOptionsUniforms {
|
|
5068
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
5068
5069
|
vec2 cellOriginCommon;
|
|
5069
5070
|
vec2 cellSizeCommon;
|
|
5070
5071
|
} binOptions;
|
|
@@ -5568,7 +5569,7 @@ void main(void) {
|
|
|
5568
5569
|
`;
|
|
5569
5570
|
|
|
5570
5571
|
// src/heatmap-layer/triangle-layer-uniforms.ts
|
|
5571
|
-
var uniformBlock10 = `uniform triangleUniforms {
|
|
5572
|
+
var uniformBlock10 = `layout(std140) uniform triangleUniforms {
|
|
5572
5573
|
float aggregationMode;
|
|
5573
5574
|
vec2 colorDomain;
|
|
5574
5575
|
float intensity;
|
|
@@ -5844,7 +5845,7 @@ void main() {
|
|
|
5844
5845
|
`;
|
|
5845
5846
|
|
|
5846
5847
|
// src/heatmap-layer/heatmap-layer-uniforms.ts
|
|
5847
|
-
var uniformBlock11 = `uniform weightUniforms {
|
|
5848
|
+
var uniformBlock11 = `layout(std140) uniform weightUniforms {
|
|
5848
5849
|
vec4 commonBounds;
|
|
5849
5850
|
float radiusPixels;
|
|
5850
5851
|
float textureWidth;
|
|
@@ -5863,7 +5864,7 @@ void main() {
|
|
|
5863
5864
|
};
|
|
5864
5865
|
var maxWeightUniforms = {
|
|
5865
5866
|
name: "maxWeight",
|
|
5866
|
-
vs: `uniform maxWeightUniforms {
|
|
5867
|
+
vs: `layout(std140) uniform maxWeightUniforms {
|
|
5867
5868
|
float textureSize;
|
|
5868
5869
|
} maxWeight;
|
|
5869
5870
|
`,
|
|
@@ -4,7 +4,7 @@ export type BinOptions = {
|
|
|
4
4
|
};
|
|
5
5
|
export declare const binOptionsUniforms: {
|
|
6
6
|
readonly name: "binOptions";
|
|
7
|
-
readonly vs: "uniform binOptionsUniforms {\n vec2 cellOriginCommon;\n vec2 cellSizeCommon;\n} binOptions;\n";
|
|
7
|
+
readonly vs: "layout(std140) uniform binOptionsUniforms {\n vec2 cellOriginCommon;\n vec2 cellSizeCommon;\n} binOptions;\n";
|
|
8
8
|
readonly uniformTypes: {
|
|
9
9
|
readonly cellOriginCommon: "vec2<f32>";
|
|
10
10
|
readonly cellSizeCommon: "vec2<f32>";
|
|
@@ -9,7 +9,7 @@ export type GridProps = {
|
|
|
9
9
|
};
|
|
10
10
|
export declare const gridUniforms: {
|
|
11
11
|
readonly name: "grid";
|
|
12
|
-
readonly vs: "uniform gridUniforms {\n vec4 colorDomain;\n vec4 elevationDomain;\n vec2 elevationRange;\n vec2 originCommon;\n vec2 sizeCommon;\n} grid;\n";
|
|
12
|
+
readonly vs: "layout(std140) uniform gridUniforms {\n vec4 colorDomain;\n vec4 elevationDomain;\n vec2 elevationRange;\n vec2 originCommon;\n vec2 sizeCommon;\n} grid;\n";
|
|
13
13
|
readonly uniformTypes: {
|
|
14
14
|
readonly colorDomain: "vec4<f32>";
|
|
15
15
|
readonly elevationDomain: "vec4<f32>";
|
|
@@ -8,7 +8,7 @@ export type WeightProps = {
|
|
|
8
8
|
};
|
|
9
9
|
export declare const weightUniforms: {
|
|
10
10
|
readonly name: "weight";
|
|
11
|
-
readonly vs: "uniform weightUniforms {\n vec4 commonBounds;\n float radiusPixels;\n float textureWidth;\n float weightsScale;\n} weight;\n";
|
|
11
|
+
readonly vs: "layout(std140) uniform weightUniforms {\n vec4 commonBounds;\n float radiusPixels;\n float textureWidth;\n float weightsScale;\n} weight;\n";
|
|
12
12
|
readonly uniformTypes: {
|
|
13
13
|
readonly commonBounds: "vec4<f32>";
|
|
14
14
|
readonly radiusPixels: "f32";
|
|
@@ -22,7 +22,7 @@ export type MaxWeightProps = {
|
|
|
22
22
|
};
|
|
23
23
|
export declare const maxWeightUniforms: {
|
|
24
24
|
readonly name: "maxWeight";
|
|
25
|
-
readonly vs: "uniform maxWeightUniforms {\n float textureSize;\n} maxWeight;\n";
|
|
25
|
+
readonly vs: "layout(std140) uniform maxWeightUniforms {\n float textureSize;\n} maxWeight;\n";
|
|
26
26
|
readonly uniformTypes: {
|
|
27
27
|
readonly textureSize: "f32";
|
|
28
28
|
};
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: MIT
|
|
3
3
|
// Copyright (c) vis.gl contributors
|
|
4
4
|
const uniformBlock = `\
|
|
5
|
-
uniform weightUniforms {
|
|
5
|
+
layout(std140) uniform weightUniforms {
|
|
6
6
|
vec4 commonBounds;
|
|
7
7
|
float radiusPixels;
|
|
8
8
|
float textureWidth;
|
|
@@ -22,7 +22,7 @@ export const weightUniforms = {
|
|
|
22
22
|
export const maxWeightUniforms = {
|
|
23
23
|
name: 'maxWeight',
|
|
24
24
|
vs: `\
|
|
25
|
-
uniform maxWeightUniforms {
|
|
25
|
+
layout(std140) uniform maxWeightUniforms {
|
|
26
26
|
float textureSize;
|
|
27
27
|
} maxWeight;
|
|
28
28
|
`,
|
|
@@ -10,8 +10,8 @@ export type TriangleProps = {
|
|
|
10
10
|
};
|
|
11
11
|
export declare const triangleUniforms: {
|
|
12
12
|
readonly name: "triangle";
|
|
13
|
-
readonly vs: "uniform triangleUniforms {\n float aggregationMode;\n vec2 colorDomain;\n float intensity;\n float threshold;\n} triangle;\n";
|
|
14
|
-
readonly fs: "uniform triangleUniforms {\n float aggregationMode;\n vec2 colorDomain;\n float intensity;\n float threshold;\n} triangle;\n";
|
|
13
|
+
readonly vs: "layout(std140) uniform triangleUniforms {\n float aggregationMode;\n vec2 colorDomain;\n float intensity;\n float threshold;\n} triangle;\n";
|
|
14
|
+
readonly fs: "layout(std140) uniform triangleUniforms {\n float aggregationMode;\n vec2 colorDomain;\n float intensity;\n float threshold;\n} triangle;\n";
|
|
15
15
|
readonly uniformTypes: {
|
|
16
16
|
readonly aggregationMode: "f32";
|
|
17
17
|
readonly colorDomain: "vec2<f32>";
|
|
@@ -5,7 +5,7 @@ export type BinOptions = {
|
|
|
5
5
|
};
|
|
6
6
|
export declare const binOptionsUniforms: {
|
|
7
7
|
readonly name: "binOptions";
|
|
8
|
-
readonly vs: "uniform binOptionsUniforms {\n vec2 hexOriginCommon;\n float radiusCommon;\n} binOptions;\n";
|
|
8
|
+
readonly vs: "layout(std140) uniform binOptionsUniforms {\n vec2 hexOriginCommon;\n float radiusCommon;\n} binOptions;\n";
|
|
9
9
|
readonly uniformTypes: {
|
|
10
10
|
readonly hexOriginCommon: "vec2<f32>";
|
|
11
11
|
readonly radiusCommon: "f32";
|
|
@@ -8,7 +8,7 @@ export type HexagonProps = {
|
|
|
8
8
|
};
|
|
9
9
|
export declare const hexagonUniforms: {
|
|
10
10
|
readonly name: "hexagon";
|
|
11
|
-
readonly vs: "uniform hexagonUniforms {\n vec4 colorDomain;\n vec4 elevationDomain;\n vec2 elevationRange;\n vec2 originCommon;\n} hexagon;\n";
|
|
11
|
+
readonly vs: "layout(std140) uniform hexagonUniforms {\n vec4 colorDomain;\n vec4 elevationDomain;\n vec2 elevationRange;\n vec2 originCommon;\n} hexagon;\n";
|
|
12
12
|
readonly uniformTypes: {
|
|
13
13
|
readonly colorDomain: "vec4<f32>";
|
|
14
14
|
readonly elevationDomain: "vec4<f32>";
|
package/dist/index.cjs
CHANGED
|
@@ -346,7 +346,7 @@ function createRenderTarget(device, width, height) {
|
|
|
346
346
|
// dist/common/aggregator/gpu-aggregator/bin-sorter-uniforms.js
|
|
347
347
|
var uniformBlock = (
|
|
348
348
|
/* glsl */
|
|
349
|
-
`uniform binSorterUniforms {
|
|
349
|
+
`layout(std140) uniform binSorterUniforms {
|
|
350
350
|
ivec4 binIdRange;
|
|
351
351
|
ivec2 targetSize;
|
|
352
352
|
} binSorter;
|
|
@@ -571,7 +571,7 @@ var import_engine2 = require("@luma.gl/engine");
|
|
|
571
571
|
// dist/common/aggregator/gpu-aggregator/aggregation-transform-uniforms.js
|
|
572
572
|
var uniformBlock2 = (
|
|
573
573
|
/* glsl */
|
|
574
|
-
`uniform aggregatorTransformUniforms {
|
|
574
|
+
`layout(std140) uniform aggregatorTransformUniforms {
|
|
575
575
|
ivec4 binIdRange;
|
|
576
576
|
bvec3 isCount;
|
|
577
577
|
bvec3 isMean;
|
|
@@ -585,7 +585,8 @@ var aggregatorTransformUniforms = {
|
|
|
585
585
|
uniformTypes: {
|
|
586
586
|
binIdRange: "vec4<i32>",
|
|
587
587
|
isCount: "vec3<f32>",
|
|
588
|
-
isMean: "vec3<f32>"
|
|
588
|
+
isMean: "vec3<f32>",
|
|
589
|
+
naN: "f32"
|
|
589
590
|
}
|
|
590
591
|
};
|
|
591
592
|
|
|
@@ -1157,7 +1158,7 @@ DECKGL_FILTER_COLOR(fragColor, geometry);
|
|
|
1157
1158
|
// dist/screen-grid-layer/screen-grid-layer-uniforms.js
|
|
1158
1159
|
var uniformBlock3 = (
|
|
1159
1160
|
/* glsl */
|
|
1160
|
-
`uniform screenGridUniforms {
|
|
1161
|
+
`layout(std140) uniform screenGridUniforms {
|
|
1161
1162
|
vec2 cellSizeClipspace;
|
|
1162
1163
|
vec2 gridSizeClipspace;
|
|
1163
1164
|
vec2 colorDomain;
|
|
@@ -1255,7 +1256,7 @@ var screen_grid_cell_layer_default = ScreenGridCellLayer;
|
|
|
1255
1256
|
// dist/screen-grid-layer/bin-options-uniforms.js
|
|
1256
1257
|
var uniformBlock4 = (
|
|
1257
1258
|
/* glsl */
|
|
1258
|
-
`uniform binOptionsUniforms {
|
|
1259
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
1259
1260
|
float cellSizePixels;
|
|
1260
1261
|
} binOptions;
|
|
1261
1262
|
`
|
|
@@ -1315,7 +1316,7 @@ var ScreenGridLayer = class extends aggregation_layer_default {
|
|
|
1315
1316
|
|
|
1316
1317
|
void getBin(out ivec2 binId) {
|
|
1317
1318
|
vec4 pos = project_position_to_clipspace(positions, positions64Low, vec3(0.0));
|
|
1318
|
-
vec2 screenCoords = vec2(pos.x / pos.w + 1.0, 1.0 - pos.y / pos.w) / 2.0 * project.viewportSize / project.devicePixelRatio;
|
|
1319
|
+
vec2 screenCoords = vec2(pos.x / pos.w + 1.0, 1.0 - pos.y / pos.w) / 2.0 * project.viewportSize.xy / project.devicePixelRatio;
|
|
1319
1320
|
vec2 gridCoords = floor(screenCoords / binOptions.cellSizePixels);
|
|
1320
1321
|
binId = ivec2(gridCoords);
|
|
1321
1322
|
}
|
|
@@ -1753,7 +1754,7 @@ DECKGL_FILTER_COLOR(vColor, geometry);
|
|
|
1753
1754
|
// dist/hexagon-layer/hexagon-layer-uniforms.js
|
|
1754
1755
|
var uniformBlock5 = (
|
|
1755
1756
|
/* glsl */
|
|
1756
|
-
`uniform hexagonUniforms {
|
|
1757
|
+
`layout(std140) uniform hexagonUniforms {
|
|
1757
1758
|
vec4 colorDomain;
|
|
1758
1759
|
vec4 elevationDomain;
|
|
1759
1760
|
vec2 elevationRange;
|
|
@@ -1871,7 +1872,7 @@ var hexagon_cell_layer_default = HexagonCellLayer;
|
|
|
1871
1872
|
// dist/hexagon-layer/bin-options-uniforms.js
|
|
1872
1873
|
var uniformBlock6 = (
|
|
1873
1874
|
/* glsl */
|
|
1874
|
-
`uniform binOptionsUniforms {
|
|
1875
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
1875
1876
|
vec2 hexOriginCommon;
|
|
1876
1877
|
float radiusCommon;
|
|
1877
1878
|
} binOptions;
|
|
@@ -2757,7 +2758,7 @@ var import_core8 = require("@math.gl/core");
|
|
|
2757
2758
|
// dist/contour-layer/bin-options-uniforms.js
|
|
2758
2759
|
var uniformBlock7 = (
|
|
2759
2760
|
/* glsl */
|
|
2760
|
-
`uniform binOptionsUniforms {
|
|
2761
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
2761
2762
|
vec2 cellOriginCommon;
|
|
2762
2763
|
vec2 cellSizeCommon;
|
|
2763
2764
|
} binOptions;
|
|
@@ -3080,7 +3081,7 @@ DECKGL_FILTER_COLOR(vColor, geometry);
|
|
|
3080
3081
|
// dist/grid-layer/grid-layer-uniforms.js
|
|
3081
3082
|
var uniformBlock8 = (
|
|
3082
3083
|
/* glsl */
|
|
3083
|
-
`uniform gridUniforms {
|
|
3084
|
+
`layout(std140) uniform gridUniforms {
|
|
3084
3085
|
vec4 colorDomain;
|
|
3085
3086
|
vec4 elevationDomain;
|
|
3086
3087
|
vec2 elevationRange;
|
|
@@ -3200,7 +3201,7 @@ GridCellLayer.layerName = "GridCellLayer";
|
|
|
3200
3201
|
// dist/grid-layer/bin-options-uniforms.js
|
|
3201
3202
|
var uniformBlock9 = (
|
|
3202
3203
|
/* glsl */
|
|
3203
|
-
`uniform binOptionsUniforms {
|
|
3204
|
+
`layout(std140) uniform binOptionsUniforms {
|
|
3204
3205
|
vec2 cellOriginCommon;
|
|
3205
3206
|
vec2 cellSizeCommon;
|
|
3206
3207
|
} binOptions;
|
|
@@ -3666,7 +3667,7 @@ fragColor = linearColor;
|
|
|
3666
3667
|
`;
|
|
3667
3668
|
|
|
3668
3669
|
// dist/heatmap-layer/triangle-layer-uniforms.js
|
|
3669
|
-
var uniformBlock10 = `uniform triangleUniforms {
|
|
3670
|
+
var uniformBlock10 = `layout(std140) uniform triangleUniforms {
|
|
3670
3671
|
float aggregationMode;
|
|
3671
3672
|
vec2 colorDomain;
|
|
3672
3673
|
float intensity;
|
|
@@ -3923,7 +3924,7 @@ fragColor.g = outTexture.r / max(1.0, outTexture.a);
|
|
|
3923
3924
|
`;
|
|
3924
3925
|
|
|
3925
3926
|
// dist/heatmap-layer/heatmap-layer-uniforms.js
|
|
3926
|
-
var uniformBlock11 = `uniform weightUniforms {
|
|
3927
|
+
var uniformBlock11 = `layout(std140) uniform weightUniforms {
|
|
3927
3928
|
vec4 commonBounds;
|
|
3928
3929
|
float radiusPixels;
|
|
3929
3930
|
float textureWidth;
|
|
@@ -3942,7 +3943,7 @@ var weightUniforms = {
|
|
|
3942
3943
|
};
|
|
3943
3944
|
var maxWeightUniforms = {
|
|
3944
3945
|
name: "maxWeight",
|
|
3945
|
-
vs: `uniform maxWeightUniforms {
|
|
3946
|
+
vs: `layout(std140) uniform maxWeightUniforms {
|
|
3946
3947
|
float textureSize;
|
|
3947
3948
|
} maxWeight;
|
|
3948
3949
|
`,
|