@deck.gl/aggregation-layers 9.3.6 → 9.4.0-alpha.1

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.
@@ -1 +1 @@
1
- {"version":3,"file":"aggregation-layer.d.ts","sourceRoot":"","sources":["../../src/common/aggregation-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EACd,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,SAAS,EACT,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,UAAU,EAAC,mCAAgC;AAEnD,MAAM,MAAM,qBAAqB,CAAC,KAAK,IAAI,mBAAmB,GAAG;IAC/D,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAC5C,KAAK,EACL,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC;IACvE,MAAM,CAAC,SAAS,SAAsB;IAEtC,KAAK,EAAG;QACN,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,UAAU,CAAC;KACxB,CAAC;IAEF,yDAAyD;IACzD,IAAI,UAAU,YAEb;IAED,QAAQ,CAAC,iBAAiB,IAAI,MAAM;IACpC,8CAA8C;IAC9C,QAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IACnD,+EAA+E;IAC/E,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAE5C,eAAe,IAAI,IAAI;IAMvB,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAiBpD,aAAa,CAAC,OAAO,EAAE,YAAY;IAMnC,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE;QAAC,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;IAkBvE,IAAI,CAAC,EAAC,iBAAiB,EAAC;;KAAA;IAYxB,oBAAoB;CAMrB"}
1
+ {"version":3,"file":"aggregation-layer.d.ts","sourceRoot":"","sources":["../../src/common/aggregation-layer.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EACd,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,SAAS,EACT,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,UAAU,EAAC,mCAAgC;AAEnD,MAAM,MAAM,qBAAqB,CAAC,KAAK,IAAI,mBAAmB,GAAG;IAC/D,IAAI,EAAE,eAAe,CAAC,KAAK,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,QAAQ,OAAO,gBAAgB,CAC5C,KAAK,EACL,WAAW,SAAS,EAAE,GAAG,EAAE,CAC3B,SAAQ,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,GAAG,WAAW,CAAC;IACvE,MAAM,CAAC,SAAS,SAAsB;IAEtC,KAAK,EAAG;QACN,cAAc,EAAE,MAAM,CAAC;QACvB,UAAU,EAAE,UAAU,CAAC;KACxB,CAAC;IAEF,yDAAyD;IACzD,IAAI,UAAU,YAEb;IAED,QAAQ,CAAC,iBAAiB,IAAI,MAAM;IACpC,8CAA8C;IAC9C,QAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU;IACnD,+EAA+E;IAC/E,QAAQ,CAAC,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAE5C,eAAe,IAAI,IAAI;IAIvB,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO;IAiBpD,aAAa,CAAC,OAAO,EAAE,YAAY;IAMnC,SAAS,CAAC,gBAAgB,CAAC,iBAAiB,EAAE;QAAC,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,CAAA;KAAC;IAkBvE,IAAI,CAAC,EAAC,iBAAiB,EAAC;;KAAA;IAYxB,oBAAoB;CAMrB"}
@@ -7,9 +7,7 @@ class AggregationLayer extends CompositeLayer {
7
7
  get isDrawable() {
8
8
  return true;
9
9
  }
10
- initializeState() {
11
- this.getAttributeManager().remove(['instancePickingColors']);
12
- }
10
+ initializeState() { }
13
11
  // Extend Layer.updateState to update the Aggregator instance
14
12
  // returns true if aggregator is changed
15
13
  updateState(params) {
@@ -1 +1 @@
1
- {"version":3,"file":"aggregation-layer.js","sourceRoot":"","sources":["../../src/common/aggregation-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,cAAc,EAMd,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAOvB,MAA8B,gBAG5B,SAAQ,cAA+D;IAQvE,yDAAyD;IACzD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,eAAe;QACb,IAAI,CAAC,mBAAmB,EAAG,CAAC,MAAM,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,6DAA6D;IAC7D,wCAAwC;IACxC,WAAW,CAAC,MAA8B;QACxC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE1B,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAChD,IAAI,MAAM,CAAC,WAAW,CAAC,iBAAiB,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,KAAK,cAAc,EAAE,CAAC;YACzF,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACzD,UAAU,CAAC,QAAQ,CAAC;gBAClB,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU;aACnD,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,EAAC,UAAU,EAAE,cAAc,EAAC,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,kEAAkE;IAClE,aAAa,CAAC,OAAqB;QACjC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,2DAA2D;IACjD,gBAAgB,CAAC,iBAA4C;QACrE,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,UAAU,CAAC,QAAQ,CAAC;YAClB,UAAU,EAAE,iBAAiB;SAC9B,CAAC,CAAC;QAEH,KAAK,MAAM,EAAE,IAAI,iBAAiB,EAAE,CAAC;YACnC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;QAED,kFAAkF;QAClF,uFAAuF;QACvF,0DAA0D;QAC1D,6DAA6D;QAC7D,yFAAyF;QACzF,UAAU,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,EAAC,iBAAiB,EAAC;QACtB,kHAAkH;QAClH,2HAA2H;QAC3H,oGAAoG;QACpG,4GAA4G;QAC5G,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,gDAAgD;QAChD,UAAU,CAAC,QAAQ,CAAC,EAAC,iBAAiB,EAAC,CAAC,CAAC;QACzC,UAAU,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,mFAAmF;IACnF,oBAAoB;QAClB,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/C,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;YACjB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;SAC1B,CAAC,CAAC;IACL,CAAC;;AAlFM,0BAAS,GAAG,kBAAkB,CAAC;eAJV,gBAAgB"}
1
+ {"version":3,"file":"aggregation-layer.js","sourceRoot":"","sources":["../../src/common/aggregation-layer.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EACL,cAAc,EAMd,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAOvB,MAA8B,gBAG5B,SAAQ,cAA+D;IAQvE,yDAAyD;IACzD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IAQD,eAAe,KAAU,CAAC;IAE1B,6DAA6D;IAC7D,wCAAwC;IACxC,WAAW,CAAC,MAA8B;QACxC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAE1B,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAChD,IAAI,MAAM,CAAC,WAAW,CAAC,iBAAiB,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,KAAK,cAAc,EAAE,CAAC;YACzF,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC;YACjC,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;YACzD,UAAU,CAAC,QAAQ,CAAC;gBAClB,UAAU,EAAE,IAAI,CAAC,mBAAmB,EAAE,EAAE,UAAU;aACnD,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,EAAC,UAAU,EAAE,cAAc,EAAC,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,kEAAkE;IAClE,aAAa,CAAC,OAAqB;QACjC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAC7B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IAClC,CAAC;IAED,2DAA2D;IACjD,gBAAgB,CAAC,iBAA4C;QACrE,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,UAAU,CAAC,QAAQ,CAAC;YAClB,UAAU,EAAE,iBAAiB;SAC9B,CAAC,CAAC;QAEH,KAAK,MAAM,EAAE,IAAI,iBAAiB,EAAE,CAAC;YACnC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;QAED,kFAAkF;QAClF,uFAAuF;QACvF,0DAA0D;QAC1D,6DAA6D;QAC7D,yFAAyF;QACzF,UAAU,CAAC,MAAM,EAAE,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,EAAC,iBAAiB,EAAC;QACtB,kHAAkH;QAClH,2HAA2H;QAC3H,oGAAoG;QACpG,4GAA4G;QAC5G,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAChC,gDAAgD;QAChD,UAAU,CAAC,QAAQ,CAAC,EAAC,iBAAiB,EAAC,CAAC,CAAC;QACzC,UAAU,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,mFAAmF;IACnF,oBAAoB;QAClB,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YAC/C,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE;YACjB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;SAC1B,CAAC,CAAC;IACL,CAAC;;AAhFM,0BAAS,GAAG,kBAAkB,CAAC;eAJV,gBAAgB"}
package/dist/dist.dev.js CHANGED
@@ -1077,7 +1077,6 @@ void main() {
1077
1077
  return true;
1078
1078
  }
1079
1079
  initializeState() {
1080
- this.getAttributeManager().remove(["instancePickingColors"]);
1081
1080
  }
1082
1081
  // Extend Layer.updateState to update the Aggregator instance
1083
1082
  // returns true if aggregator is changed
@@ -1199,7 +1198,6 @@ void main() {
1199
1198
  in vec2 positions;
1200
1199
  in vec2 instancePositions;
1201
1200
  in float instanceWeights;
1202
- in vec3 instancePickingColors;
1203
1201
 
1204
1202
  uniform sampler2D colorRange;
1205
1203
 
@@ -1226,7 +1224,7 @@ void main(void) {
1226
1224
  vColor.a *= layer.opacity;
1227
1225
 
1228
1226
  // Set color to be rendered to picking fbo (also used to check for selection highlight).
1229
- picking_setPickingColor(instancePickingColors);
1227
+ picking_setPickingColorFromInstanceID();
1230
1228
  }
1231
1229
  `
1232
1230
  );
@@ -1817,7 +1815,6 @@ in vec3 normals;
1817
1815
  in vec2 instancePositions;
1818
1816
  in float instanceElevationValues;
1819
1817
  in float instanceColorValues;
1820
- in vec3 instancePickingColors;
1821
1818
 
1822
1819
  uniform sampler2D colorRange;
1823
1820
 
@@ -1837,7 +1834,7 @@ vec4 interp(float value, vec2 domain, sampler2D range) {
1837
1834
  }
1838
1835
 
1839
1836
  void main(void) {
1840
- geometry.pickingColor = instancePickingColors;
1837
+ geometry.pickingColor = picking_getPickingColorFromInstanceID();
1841
1838
 
1842
1839
  if (isnan(instanceColorValues) ||
1843
1840
  instanceColorValues < hexagon.colorDomain.z ||
@@ -4875,7 +4872,6 @@ in vec3 normals;
4875
4872
  in vec2 instancePositions;
4876
4873
  in float instanceElevationValues;
4877
4874
  in float instanceColorValues;
4878
- in vec3 instancePickingColors;
4879
4875
 
4880
4876
  uniform sampler2D colorRange;
4881
4877
 
@@ -4893,7 +4889,7 @@ vec4 interp(float value, vec2 domain, sampler2D range) {
4893
4889
  }
4894
4890
 
4895
4891
  void main(void) {
4896
- geometry.pickingColor = instancePickingColors;
4892
+ geometry.pickingColor = picking_getPickingColorFromInstanceID();
4897
4893
 
4898
4894
  if (isnan(instanceColorValues) ||
4899
4895
  instanceColorValues < grid.colorDomain.z ||
@@ -1,3 +1,3 @@
1
- declare const _default: "#version 300 es\n\n#define SHADER_NAME grid-cell-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin vec2 instancePositions;\nin float instanceElevationValues;\nin float instanceColorValues;\nin vec3 instancePickingColors;\n\nuniform sampler2D colorRange;\n\n// Result\nout vec4 vColor;\n\nfloat interp(float value, vec2 domain, vec2 range) {\n float r = min(max((value - domain.x) / (domain.y - domain.x), 0.), 1.);\n return mix(range.x, range.y, r);\n}\n\nvec4 interp(float value, vec2 domain, sampler2D range) {\n float r = (value - domain.x) / (domain.y - domain.x);\n return texture(range, vec2(r, 0.5));\n}\n\nvoid main(void) {\n geometry.pickingColor = instancePickingColors;\n\n if (isnan(instanceColorValues) ||\n instanceColorValues < grid.colorDomain.z ||\n instanceColorValues > grid.colorDomain.w ||\n instanceElevationValues < grid.elevationDomain.z ||\n instanceElevationValues > grid.elevationDomain.w\n ) {\n gl_Position = vec4(0.);\n return;\n }\n \n vec2 commonPosition = (instancePositions + (positions.xy + 1.0) / 2.0 * column.coverage) * grid.sizeCommon + grid.originCommon - project.commonOrigin.xy;\n geometry.position = vec4(commonPosition, 0.0, 1.0);\n geometry.normal = project_normal(normals);\n\n // calculate z, if 3d not enabled set to 0\n float elevation = 0.0;\n if (column.extruded) {\n elevation = interp(instanceElevationValues, grid.elevationDomain.xy, grid.elevationRange);\n elevation = project_size(elevation);\n // cylindar gemoetry height are between -1.0 to 1.0, transform it to between 0, 1\n geometry.position.z = (positions.z + 1.0) / 2.0 * elevation;\n }\n\n gl_Position = project_common_position_to_clipspace(geometry.position);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n vColor = interp(instanceColorValues, grid.colorDomain.xy, colorRange);\n vColor.a *= layer.opacity;\n if (column.extruded) {\n vColor.rgb = lighting_getLightColor(vColor.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);\n }\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
1
+ declare const _default: "#version 300 es\n\n#define SHADER_NAME grid-cell-layer-vertex-shader\n\nin vec3 positions;\nin vec3 normals;\n\nin vec2 instancePositions;\nin float instanceElevationValues;\nin float instanceColorValues;\n\nuniform sampler2D colorRange;\n\n// Result\nout vec4 vColor;\n\nfloat interp(float value, vec2 domain, vec2 range) {\n float r = min(max((value - domain.x) / (domain.y - domain.x), 0.), 1.);\n return mix(range.x, range.y, r);\n}\n\nvec4 interp(float value, vec2 domain, sampler2D range) {\n float r = (value - domain.x) / (domain.y - domain.x);\n return texture(range, vec2(r, 0.5));\n}\n\nvoid main(void) {\n geometry.pickingColor = picking_getPickingColorFromInstanceID();\n\n if (isnan(instanceColorValues) ||\n instanceColorValues < grid.colorDomain.z ||\n instanceColorValues > grid.colorDomain.w ||\n instanceElevationValues < grid.elevationDomain.z ||\n instanceElevationValues > grid.elevationDomain.w\n ) {\n gl_Position = vec4(0.);\n return;\n }\n \n vec2 commonPosition = (instancePositions + (positions.xy + 1.0) / 2.0 * column.coverage) * grid.sizeCommon + grid.originCommon - project.commonOrigin.xy;\n geometry.position = vec4(commonPosition, 0.0, 1.0);\n geometry.normal = project_normal(normals);\n\n // calculate z, if 3d not enabled set to 0\n float elevation = 0.0;\n if (column.extruded) {\n elevation = interp(instanceElevationValues, grid.elevationDomain.xy, grid.elevationRange);\n elevation = project_size(elevation);\n // cylindar gemoetry height are between -1.0 to 1.0, transform it to between 0, 1\n geometry.position.z = (positions.z + 1.0) / 2.0 * elevation;\n }\n\n gl_Position = project_common_position_to_clipspace(geometry.position);\n DECKGL_FILTER_GL_POSITION(gl_Position, geometry);\n\n vColor = interp(instanceColorValues, grid.colorDomain.xy, colorRange);\n vColor.a *= layer.opacity;\n if (column.extruded) {\n vColor.rgb = lighting_getLightColor(vColor.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);\n }\n DECKGL_FILTER_COLOR(vColor, geometry);\n}\n";
2
2
  export default _default;
3
3
  //# sourceMappingURL=grid-cell-layer-vertex.glsl.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"grid-cell-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-cell-layer-vertex.glsl.ts"],"names":[],"mappings":";AAIA,wBA+DE"}
1
+ {"version":3,"file":"grid-cell-layer-vertex.glsl.d.ts","sourceRoot":"","sources":["../../src/grid-layer/grid-cell-layer-vertex.glsl.ts"],"names":[],"mappings":";AAIA,wBA8DE"}
@@ -8,7 +8,6 @@ in vec3 normals;
8
8
  in vec2 instancePositions;
9
9
  in float instanceElevationValues;
10
10
  in float instanceColorValues;
11
- in vec3 instancePickingColors;
12
11
  uniform sampler2D colorRange;
13
12
  out vec4 vColor;
14
13
  float interp(float value, vec2 domain, vec2 range) {
@@ -20,7 +19,7 @@ float r = (value - domain.x) / (domain.y - domain.x);
20
19
  return texture(range, vec2(r, 0.5));
21
20
  }
22
21
  void main(void) {
23
- geometry.pickingColor = instancePickingColors;
22
+ geometry.pickingColor = picking_getPickingColorFromInstanceID();
24
23
  if (isnan(instanceColorValues) ||
25
24
  instanceColorValues < grid.colorDomain.z ||
26
25
  instanceColorValues > grid.colorDomain.w ||
@@ -1 +1 @@
1
- {"version":3,"file":"grid-cell-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/grid-layer/grid-cell-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,eAAe,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+DvB"}
1
+ {"version":3,"file":"grid-cell-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/grid-layer/grid-cell-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,eAAe,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8DvB"}
@@ -1 +1 @@
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"}
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,wBAiEE"}
@@ -10,7 +10,6 @@ in vec3 normals;
10
10
  in vec2 instancePositions;
11
11
  in float instanceElevationValues;
12
12
  in float instanceColorValues;
13
- in vec3 instancePickingColors;
14
13
  uniform sampler2D colorRange;
15
14
  out vec4 vColor;
16
15
  ${getHexbinCentroidGLSL}
@@ -23,7 +22,7 @@ float r = (value - domain.x) / (domain.y - domain.x);
23
22
  return texture(range, vec2(r, 0.5));
24
23
  }
25
24
  void main(void) {
26
- geometry.pickingColor = instancePickingColors;
25
+ geometry.pickingColor = picking_getPickingColorFromInstanceID();
27
26
  if (isnan(instanceColorValues) ||
28
27
  instanceColorValues < hexagon.colorDomain.z ||
29
28
  instanceColorValues > hexagon.colorDomain.w ||
@@ -1 +1 @@
1
- {"version":3,"file":"hexagon-cell-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-cell-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,qBAAqB,EAAC,oBAAiB;AAE/C,eAAe,UAAU,CAAC;;;;;;;;;;;EAiBxB,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDtB,CAAC"}
1
+ {"version":3,"file":"hexagon-cell-layer-vertex.glsl.js","sourceRoot":"","sources":["../../src/hexagon-layer/hexagon-cell-layer-vertex.glsl.ts"],"names":[],"mappings":"AAAA,UAAU;AACV,+BAA+B;AAC/B,oCAAoC;AAEpC,OAAO,EAAC,qBAAqB,EAAC,oBAAiB;AAE/C,eAAe,UAAU,CAAC;;;;;;;;;;EAgBxB,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiDtB,CAAC"}
package/dist/index.cjs CHANGED
@@ -997,7 +997,6 @@ var AggregationLayer = class extends import_core3.CompositeLayer {
997
997
  return true;
998
998
  }
999
999
  initializeState() {
1000
- this.getAttributeManager().remove(["instancePickingColors"]);
1001
1000
  }
1002
1001
  // Extend Layer.updateState to update the Aggregator instance
1003
1002
  // returns true if aggregator is changed
@@ -1120,7 +1119,6 @@ var screen_grid_layer_vertex_glsl_default = (
1120
1119
  in vec2 positions;
1121
1120
  in vec2 instancePositions;
1122
1121
  in float instanceWeights;
1123
- in vec3 instancePickingColors;
1124
1122
  uniform sampler2D colorRange;
1125
1123
  out vec4 vColor;
1126
1124
  vec4 interp(float value, vec2 domain, sampler2D range) {
@@ -1138,7 +1136,7 @@ pos.y = 1.0 - pos.y;
1138
1136
  gl_Position = vec4(pos, 0., 1.);
1139
1137
  vColor = interp(instanceWeights, screenGrid.colorDomain, colorRange);
1140
1138
  vColor.a *= layer.opacity;
1141
- picking_setPickingColor(instancePickingColors);
1139
+ picking_setPickingColorFromInstanceID();
1142
1140
  }
1143
1141
  `
1144
1142
  );
@@ -1709,7 +1707,6 @@ in vec3 normals;
1709
1707
  in vec2 instancePositions;
1710
1708
  in float instanceElevationValues;
1711
1709
  in float instanceColorValues;
1712
- in vec3 instancePickingColors;
1713
1710
  uniform sampler2D colorRange;
1714
1711
  out vec4 vColor;
1715
1712
  ${getHexbinCentroidGLSL}
@@ -1722,7 +1719,7 @@ float r = (value - domain.x) / (domain.y - domain.x);
1722
1719
  return texture(range, vec2(r, 0.5));
1723
1720
  }
1724
1721
  void main(void) {
1725
- geometry.pickingColor = instancePickingColors;
1722
+ geometry.pickingColor = picking_getPickingColorFromInstanceID();
1726
1723
  if (isnan(instanceColorValues) ||
1727
1724
  instanceColorValues < hexagon.colorDomain.z ||
1728
1725
  instanceColorValues > hexagon.colorDomain.w ||
@@ -3035,7 +3032,6 @@ in vec3 normals;
3035
3032
  in vec2 instancePositions;
3036
3033
  in float instanceElevationValues;
3037
3034
  in float instanceColorValues;
3038
- in vec3 instancePickingColors;
3039
3035
  uniform sampler2D colorRange;
3040
3036
  out vec4 vColor;
3041
3037
  float interp(float value, vec2 domain, vec2 range) {
@@ -3047,7 +3043,7 @@ float r = (value - domain.x) / (domain.y - domain.x);
3047
3043
  return texture(range, vec2(r, 0.5));
3048
3044
  }
3049
3045
  void main(void) {
3050
- geometry.pickingColor = instancePickingColors;
3046
+ geometry.pickingColor = picking_getPickingColorFromInstanceID();
3051
3047
  if (isnan(instanceColorValues) ||
3052
3048
  instanceColorValues < grid.colorDomain.z ||
3053
3049
  instanceColorValues > grid.colorDomain.w ||