@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.3

package/es/point/shaders/radar/radar_vert.glsl

@@ -2,12 +2,9 @@ attribute vec4 a_Color;
 attribute vec3 a_Position;
 attribute vec3 a_Extrude;
 attribute float a_Size;
-attribute float a_Shape;
 uniform float u_speed: 1.0;
 uniform float u_time;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 uniform float u_isMeter;
@@ -15,68 +12,21 @@ uniform float u_isMeter;
 varying vec4 v_data;
 varying vec4 v_color;
 varying float v_radius;
-
-uniform float u_opacity : 1;
-uniform vec2 u_offsets;
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+varying vec2 v_exteude;
 
 #pragma include "projection"
 #pragma include "picking"
 
 void main() {
   vec3 extrude = a_Extrude;
-  float shape_type = a_Shape;
   float newSize = setPickingSize(a_Size);
 
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - empty - empty - empty
-    0.0, 0.0, 0.0, 0.0, // empty - empty - empty - empty
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - a_Extrude.x - a_Extrude.y
-    0.0, 0.0, 0.0, 0.0  // 
-  );
-
   float time = u_time * u_speed;
   mat2 rotateMatrix = mat2( 
     cos(time), sin(time), 
     -sin(time), cos(time)
   );
-  styleMappingMat[2].ba = rotateMatrix * a_Extrude.xy;
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> empty -> empty ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-
-
-  vec2 textrueOffsets = vec2(0.0, 0.0);
-  if(hasOffsets()) {
-    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-
-    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-  } else {
-    textrueOffsets = u_offsets;
-  }
-
-  // cal style mapping
+  v_exteude = rotateMatrix * a_Extrude.xy;
 
   // unpack color(vec2)
   v_color = a_Color;
@@ -88,7 +38,7 @@ void main() {
   float blur = 0.0;
   float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);
 
-  vec2 offset = (extrude.xy * (newSize) + textrueOffsets);
+  vec2 offset = (extrude.xy * (newSize));
   vec3 aPosition = a_Position;
   if(u_isMeter < 1.0) {
     // 不以米为实际单位
@@ -106,7 +56,7 @@ void main() {
     }
   }
 
-  v_data = vec4(extrude.x, extrude.y, antialiasblur,shape_type);
+  v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);
 
   vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
 

package/es/point/shaders/tile/fill_tile_frag.glsl

@@ -1,5 +1,9 @@
 uniform float u_additive;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+
+uniform float u_opacity : 1;
+uniform float u_stroke_opacity : 1;
+uniform float u_stroke_width : 2;
+uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
 
 varying vec4 v_data;
 varying vec4 v_color;
@@ -11,20 +15,9 @@ varying float v_radius;
 void main() {
   int shape = int(floor(v_data.w + 0.5));
 
-  vec4 textrueStroke = vec4(
-    styleMappingMat[1][0],
-    styleMappingMat[1][1],
-    styleMappingMat[1][2],
-    styleMappingMat[1][3]
-  );
-
-  float opacity = styleMappingMat[0][0];
-  float stroke_opacity = styleMappingMat[0][1];
-  float strokeWidth = styleMappingMat[0][2];
-  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;
 
   lowp float antialiasblur = v_data.z;
-  float r = v_radius / (v_radius + strokeWidth);
+  float r = v_radius / (v_radius + u_stroke_width);
 
   float outer_df;
   float inner_df;
@@ -61,16 +54,16 @@ void main() {
 
   float opacity_t = smoothstep(0.0, antialiasblur, outer_df);
 
-  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(
+  float color_t = u_stroke_width < 0.01 ? 0.0 : smoothstep(
     antialiasblur,
     0.0,
     inner_df
   );
 
-  if(strokeWidth < 0.01) {
-    gl_FragColor = vec4(v_color.rgb, v_color.a * opacity);
+  if(u_stroke_width < 0.01) {
+    gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);
   } else {
-    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * opacity), strokeColor * stroke_opacity, color_t);
+    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), u_stroke_color * u_stroke_opacity, color_t);
   }
 
   if(u_additive > 0.0) {

package/es/point/shaders/tile/fill_tile_vert.glsl

@@ -4,14 +4,11 @@ attribute vec3 a_Extrude;
 attribute float a_Size;
 attribute float a_Shape;
 
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform float u_isMeter;
 
-uniform vec2 u_tileOrigin;
-uniform float u_coord;
+// uniform vec2 u_tileOrigin;
+// uniform float u_coord;
 
 varying vec4 v_data;
 varying vec4 v_color;
@@ -21,14 +18,6 @@ uniform float u_opacity : 1;
 uniform float u_stroke_opacity : 1;
 uniform float u_stroke_width : 2;
 uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
-uniform vec2 u_offsets;
-
-uniform float u_blur : 0.0;
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
-#pragma include "styleMappingCalStrokeOpacity"
-#pragma include "styleMappingCalStrokeWidth"
 
 #pragma include "projection"
 #pragma include "picking"
@@ -38,83 +27,6 @@ void main() {
   float shape_type = a_Shape;
   float newSize = setPickingSize(a_Size);
 
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0
-  );
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-
-  vec2 strokeOpacityAndOffset = calStrokeOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][1] = strokeOpacityAndOffset.r;
-  textureOffset = strokeOpacityAndOffset.g;
-
-  vec2 strokeWidthAndOffset = calStrokeWidthAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][2] = strokeWidthAndOffset.r;
-  textureOffset = strokeWidthAndOffset.g;
-
-  vec4 textrueStroke = vec4(-1.0, -1.0, -1.0, -1.0);
-  if(hasStroke()) {
-    vec2 valueRPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][0] = pos2value(valueRPos, columnWidth, rowHeight); // R
-    textureOffset += 1.0;
-
-    vec2 valueGPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][1] = pos2value(valueGPos, columnWidth, rowHeight); // G
-    textureOffset += 1.0;
-
-    vec2 valueBPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][2] = pos2value(valueBPos, columnWidth, rowHeight); // B
-    textureOffset += 1.0;
-
-    vec2 valueAPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    styleMappingMat[1][3] = pos2value(valueAPos, columnWidth, rowHeight); // A
-    textureOffset += 1.0;
-  } else {
-    if(u_stroke_color == vec4(0.0)) {
-      styleMappingMat[1][0] = v_color.r;
-      styleMappingMat[1][1] = v_color.g;
-      styleMappingMat[1][2] = v_color.b;
-      styleMappingMat[1][3] = v_color.a;
-    } else {
-      styleMappingMat[1][0] = u_stroke_color.r;
-      styleMappingMat[1][1] = u_stroke_color.g;
-      styleMappingMat[1][2] = u_stroke_color.b;
-      styleMappingMat[1][3] = u_stroke_color.a;
-    }
-  }
-
-  vec2 textrueOffsets = vec2(0.0, 0.0);
-  if(hasOffsets()) {
-    vec2 valueXPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.r = pos2value(valueXPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-
-    vec2 valueYPos = nextPos(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset);
-    textrueOffsets.g = pos2value(valueYPos, columnWidth, rowHeight); // x
-    textureOffset += 1.0;
-  } else {
-    textrueOffsets = u_offsets;
-  }
-
   // cal style mapping
 
   v_color = a_Color;
@@ -122,57 +34,42 @@ void main() {
 
   // anti-alias
   //  float antialiased_blur = -max(u_blur, antialiasblur);
-  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, u_blur);
+  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, 0.0);
 
-  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + textrueOffsets);
-  vec3 aPosition = a_Position;
-  if(u_isMeter < 1.0) {
-    // 不以米为实际单位
-    offset = project_pixel(offset);
-  } else {
-    // 以米为实际单位
-    antialiasblur *= pow(19.0 - u_Zoom, 2.0);
-    antialiasblur = max(antialiasblur, -0.01);
-    // offset *= 0.5;
-
-    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-      aPosition.xy += offset;
-      offset.x = 0.0;
-      offset.y = 0.0;
-    }
-  }
+  vec2 offset = (extrude.xy * (newSize + u_stroke_width));
+  offset = project_pixel(offset);
 
   v_data = vec4(extrude.x, extrude.y, antialiasblur,shape_type);
 
-  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));
+  vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
     float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);
   }
 
-if(u_coord > 0.0) {
+// if(u_coord > 0.0) {
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     gl_Position = u_Mvp * vec4(project_pos.xy + offset, 0.0, 1.0);
   } else {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, 0.0, 1.0));
   }
-} else {
-  gl_PointSize = 24.0;
-  vec2 pointPos = a_Position.xy;
-  vec4 world = vec4(project_mvt_offset_position(vec4(u_tileOrigin, 0.0, 1.0)).xyz, 1.0); // 瓦片起始点的世界坐标
+// } else {
+
+  // vec2 pointPos = a_Position.xy;
+  // vec4 world = vec4(project_mvt_offset_position(vec4(u_tileOrigin, 0.0, 1.0)).xyz, 1.0); // 瓦片起始点的世界坐标
 
-  vec2 pointOffset =  pointPos *  pow(2.0, u_Zoom); // 瓦片内的点的偏移坐标
+  // vec2 pointOffset =  pointPos *  pow(2.0, u_Zoom); // 瓦片内的点的偏移坐标
   
-  world.xy += offset;
-  world.xy += pointOffset;
+  // world.xy += offset;
+  // world.xy += pointOffset;
 
-  if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
-    // Needs to be divided with project_uCommonUnitsPerMeter
-    world.w *= u_PixelsPerMeter.z;
-  }
+  // if (u_CoordinateSystem == COORDINATE_SYSTEM_METER_OFFSET || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {
+  //   // Needs to be divided with project_uCommonUnitsPerMeter
+  //   world.w *= u_PixelsPerMeter.z;
+  // }
 
-  gl_Position = u_ViewProjectionMatrix * world + u_ViewportCenterProjection;
-}
+  // gl_Position = u_ViewProjectionMatrix * world + u_ViewportCenterProjection;
+// }
 
  
   setPickingColor(a_PickingColor);

package/es/point/shaders/tile/text_frag.glsl

@@ -0,0 +1,33 @@
+#define SDF_PX 8.0
+#define EDGE_GAMMA 0.105
+#define FONT_SIZE 48.0
+uniform sampler2D u_sdf_map;
+uniform float u_gamma_scale : 0.5;
+// uniform float u_font_size : 24.0;
+uniform float u_opacity : 1.0;
+uniform vec4 u_stroke_color : [0, 0, 0, 1];
+uniform float u_stroke_width : 2.0;
+uniform float u_halo_blur : 0.5;
+uniform float u_DevicePixelRatio;
+
+varying vec4 v_color;
+varying vec2 v_uv;
+varying float v_gamma_scale;
+varying float v_fontScale;
+
+#pragma include "picking"
+void main() {
+  // get sdf from atlas
+  float dist = texture2D(u_sdf_map, v_uv).a;
+
+  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;
+  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;
+
+  highp float gamma_scaled = gamma * v_gamma_scale;
+
+  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
+  
+  gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));
+  gl_FragColor.a= gl_FragColor.a * alpha;
+  gl_FragColor = filterColor(gl_FragColor);
+}

package/es/point/shaders/tile/text_map_frag.glsl

@@ -0,0 +1,31 @@
+#define SDF_PX 8.0
+#define EDGE_GAMMA 0.105
+#define FONT_SIZE 48.0
+uniform sampler2D u_sdf_map;
+uniform float u_gamma_scale : 0.5;
+
+uniform float u_opacity : 1.0;
+uniform vec4 u_stroke_color : [0, 0, 0, 1];
+uniform float u_stroke_width : 2.0;
+uniform float u_halo_blur : 0.5;
+uniform float u_DevicePixelRatio;
+
+varying vec2 v_uv;
+varying float v_gamma_scale;
+varying float v_fontScale;
+uniform vec4 u_color;
+
+void main() {
+  // get sdf from atlas
+  float dist = texture2D(u_sdf_map, v_uv).a;
+
+  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;
+  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;
+
+  highp float gamma_scaled = gamma * v_gamma_scale;
+
+  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);
+  
+  gl_FragColor = mix(vec4(u_color.rgb, u_color.a * u_opacity), vec4(u_stroke_color.rgb, u_stroke_color.a * u_opacity), smoothstep(0., 0.5, 1. - dist));
+  gl_FragColor.a= gl_FragColor.a * alpha;
+}

package/es/point/shaders/tile/text_map_vert.glsl

@@ -0,0 +1,38 @@
+#define FONT_SIZE 24.0
+attribute vec3 a_Position;
+attribute vec2 a_tex;
+attribute vec2 a_textOffsets;
+
+uniform vec2 u_sdf_map_size;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+
+uniform float u_size;
+
+varying vec2 v_uv;
+varying float v_gamma_scale;
+varying float v_fontScale;
+
+#pragma include "projection"
+
+void main() {
+  v_uv = a_tex / u_sdf_map_size;
+
+  // 文本缩放比例
+  float fontScale = u_size / FONT_SIZE;
+  v_fontScale = fontScale;
+
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+
+  vec4 projected_position;
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+   projected_position  = u_Mvp * (vec4(a_Position.xyz, 1.0));
+  } else { // else
+   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+  }
+
+  gl_Position = vec4(
+    projected_position.xy / projected_position.w + a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);
+  v_gamma_scale = gl_Position.w;
+
+}

package/es/point/shaders/tile/text_vert.glsl

@@ -0,0 +1,48 @@
+#define SDF_PX 8.0
+#define EDGE_GAMMA 0.105
+#define FONT_SIZE 24.0
+attribute vec3 a_Position;
+attribute vec2 a_tex;
+attribute vec2 a_textOffsets;
+attribute vec4 a_Color;
+attribute float a_Size;
+
+uniform vec2 u_sdf_map_size;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+
+varying vec2 v_uv;
+varying float v_gamma_scale;
+varying vec4 v_color;
+varying float v_fontScale;
+
+uniform float u_opacity : 1;
+uniform float u_stroke_width : 2;
+uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
+
+#pragma include "projection"
+#pragma include "picking"
+
+void main() {
+  v_color = a_Color;
+  v_uv = a_tex / u_sdf_map_size;
+
+  // 文本缩放比例
+  float fontScale = a_Size / FONT_SIZE;
+  v_fontScale = fontScale;
+
+  vec4 project_pos = project_position(vec4(a_Position, 1.0));
+
+  vec4 projected_position;
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+   projected_position  = u_Mvp * (vec4(a_Position.xyz, 1.0));
+  } else { // else
+   projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+  }
+
+  gl_Position = vec4(
+    projected_position.xy / projected_position.w + a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);
+  v_gamma_scale = gl_Position.w;
+  setPickingColor(a_PickingColor);
+
+}

package/es/polygon/index.js

@@ -45,7 +45,9 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -54,7 +56,9 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/es/polygon/models/extrude.js

@@ -292,9 +292,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
             mag: gl.LINEAR
           });
 
-          _this.layerService.updateLayerRenderList();
-
-          _this.layerService.renderLayers();
+          _this.layerService.reRender();
         };
       }
     }

package/es/polygon/models/fill.js

@@ -15,7 +15,7 @@ import BaseModel from "../../core/BaseModel";
 import { polygonTriangulationWithCenter } from "../../core/triangulation";
 
 /* babel-plugin-inline-import '../shaders/polygon_frag.glsl' */
-var polygon_frag = "uniform float u_opacity: 1.0;\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  gl_FragColor = v_Color;\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+var polygon_frag = "uniform float u_opacity: 1.0;\nvarying vec4 v_color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  gl_FragColor = v_color;\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 
 /* babel-plugin-inline-import '../shaders/polygon_linear_frag.glsl' */
 var polygon_linear_frag = "uniform float u_opacity: 1.0;\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\nuniform float u_opacitylinear: 0.0;\nuniform float u_dir: 1.0;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  gl_FragColor = v_Color;\n  \n  if(u_opacitylinear > 0.0) {\n    gl_FragColor.a *= u_dir == 1.0 ? 1.0 - length(v_pos - v_linear.xy)/v_linear.z : length(v_pos - v_linear.xy)/v_linear.z;\n  }\n\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
@@ -24,7 +24,7 @@ var polygon_linear_frag = "uniform float u_opacity: 1.0;\nvarying vec4 v_Color;\
 var polygon_linear_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_opacity: 1.0;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nuniform float u_opacitylinear: 0.0;\n\nattribute vec3 a_linear;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\nvoid main() {\n  if(u_opacitylinear > 0.0) {\n    v_linear = a_linear;\n    v_pos = a_Position.xy;\n  }\n  \n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\nstyleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_Color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  project_pos.z += u_raisingHeight;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}";
 
 /* babel-plugin-inline-import '../shaders/polygon_vert.glsl' */
-var polygon_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_opacity: 1.0;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\nstyleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_Color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  project_pos.z += u_raisingHeight;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}\n\n";
+var polygon_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_opacity: 1.0;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_color;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\nstyleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  project_pos.z += u_raisingHeight;\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n    float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\n  }\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  setPickingColor(a_PickingColor);\n}\n\n";
 
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(FillModel, _BaseModel);
@@ -170,8 +170,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
               type: gl.FLOAT
             },
             size: 3,
-            update: function update(feature, featureIdx, vertex, attributeIdx, normal) {
-              // center[0] center[1] radius
+            update: function update(feature, featureIdx, vertex) {
               return [vertex[3], vertex[4], vertex[5]];
             }
           }

package/es/polygon/models/ocean.d.ts

@@ -10,8 +10,6 @@ export default class OceanModel extends BaseModel {
         u_texture3: ITexture2D;
         u_watercolor: number[];
         u_watercolor2: number[];
-        u_dataTexture: ITexture2D;
-        u_cellTypeLayout: number[];
         u_opacity: number;
     };
     getAnimateUniforms(): IModelUniform;