@antv/l7-layers 2.20.5 → 2.20.8

package/lib/point/models/text.js

@@ -22,15 +22,16 @@ var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _collisionIndex = _interopRequireDefault(require("../../utils/collision-index"));
 var _symbolLayout = require("../../utils/symbol-layout");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-/* babel-plugin-inline-import '../shaders/text_frag.glsl' */
-var textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\nuniform sampler2D u_sdf_map;\nuniform float u_gamma_scale : 0.5;\nuniform float u_stroke_width : 2.0;\nuniform float u_halo_blur : 0.5;\nuniform float u_DevicePixelRatio;\n\nvarying vec4 v_color;\nvarying vec4 v_stroke_color;\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying float v_fontScale;\n\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n\n  // get sdf from atlas\n  float dist = texture2D(u_sdf_map, v_uv).a;\n\n  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n\n  gl_FragColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));\n\n  gl_FragColor.a *= alpha;\n   // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (gl_FragColor.a < 0.01) {\n    discard;\n  }\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
-/* babel-plugin-inline-import '../shaders/text_vert.glsl' */
-var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\nattribute vec3 a_Position;\nattribute vec2 a_tex;\nattribute vec2 a_textOffsets;\nattribute vec4 a_Color;\nattribute float a_Size;\n\nuniform vec2 u_sdf_map_size;\nuniform mat4 u_ModelMatrix;\n\nuniform float u_raisingHeight: 0.0;\n\nvarying vec2 v_uv;\nvarying float v_gamma_scale;\nvarying vec4 v_color;\nvarying vec4 v_stroke_color;\nvarying float v_fontScale;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  \n  v_uv = a_tex / u_sdf_map_size;\n\n\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_stroke_color = vec4(u_stroke_color.xyz, u_stroke_color.w * opacity);\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  vec2 offset = rotate_matrix(a_textOffsets,rotation);\n  \n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\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    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
+/* babel-plugin-inline-import '../shaders/text/text_frag.glsl' */
+var textFrag = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 48.0\n\nuniform sampler2D u_sdf_map;\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nin vec4 v_color;\nin vec4 v_stroke_color;\nin vec2 v_uv;\nin float v_gamma_scale;\nin float v_fontScale;\nout vec4 outputColor;\n\n#pragma include \"picking\"\nvoid main() {\n  // get style data mapping\n\n  // get sdf from atlas\n  float dist = texture(SAMPLER_2D(u_sdf_map), v_uv).a;\n\n  lowp float buff = (6.0 - u_stroke_width / v_fontScale) / SDF_PX;\n  highp float gamma = (u_halo_blur * 1.19 / SDF_PX + EDGE_GAMMA) / (v_fontScale * u_gamma_scale) / 1.0;\n\n  highp float gamma_scaled = gamma * v_gamma_scale;\n\n  highp float alpha = smoothstep(buff - gamma_scaled, buff + gamma_scaled, dist);\n\n  outputColor = mix(v_color, v_stroke_color, smoothstep(0., 0.5, 1.- dist));\n\n  outputColor.a *= alpha;\n   // \u4F5C\u4E3A mask \u6A21\u677F\u65F6\u9700\u8981\u4E22\u5F03\u900F\u660E\u7684\u50CF\u7D20\n  if (outputColor.a < 0.01) {\n    discard;\n  }\n  outputColor = filterColor(outputColor);\n}\n";
+/* babel-plugin-inline-import '../shaders/text/text_vert.glsl' */
+var textVert = "#define SDF_PX 8.0\n#define EDGE_GAMMA 0.105\n#define FONT_SIZE 24.0\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\nlayout(location = 14) in vec4 a_textUvAndOffsets;\n\nlayout(std140) uniform commonUniforms {\n  vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\n  vec2 u_sdf_map_size;\n  float u_raisingHeight: 0.0;\n  float u_stroke_width : 2;\n  float u_gamma_scale : 0.5;\n  float u_halo_blur : 0.5;\n};\n\nout vec2 v_uv;\nout float v_gamma_scale;\nout vec4 v_color;\nout vec4 v_stroke_color;\nout float v_fontScale;\n\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  \n  v_uv = a_textUvAndOffsets.xy / u_sdf_map_size;\n\n\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  v_stroke_color = vec4(u_stroke_color.xyz, u_stroke_color.w * opacity);\n\n  // \u6587\u672C\u7F29\u653E\u6BD4\u4F8B\n  float fontScale = a_Size / FONT_SIZE;\n  v_fontScale = fontScale;\n\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // vec4 projected_position  = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  vec2 offset = rotate_matrix(a_textUvAndOffsets.zw,rotation);\n  \n  // gl_Position = vec4(projected_position.xy / projected_position.w + rotation_matrix * a_textOffsets * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n\n  float raiseHeight = u_raisingHeight;\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    raiseHeight = u_raisingHeight * mapboxZoomScale;\n  }\n\n  vec4 projected_position = project_common_position_to_clipspace_v2(vec4(project_pos.xyz + vec3(0.0, 0.0, raiseHeight), 1.0));\n\n  gl_Position = vec4(\n    projected_position.xy / projected_position.w + offset * fontScale / u_ViewportSize * 2.0 * u_DevicePixelRatio, 0.0, 1.0);\n  v_gamma_scale = gl_Position.w;\n  setPickingColor(a_PickingColor);\n\n}\n";
 var isEqual = _l7Utils.lodashUtil.isEqual;
 function TextTrianglation(feature) {
   // @ts-ignore
@@ -93,6 +94,16 @@ var TextModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _createClass2.default)(TextModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption), {
+        u_sdf_map: this.textures[0]
+      });
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref2 = this.layer.getLayerConfig(),
         _ref2$stroke = _ref2.stroke,
         stroke = _ref2$stroke === void 0 ? '#fff' : _ref2$stroke,
@@ -111,15 +122,16 @@ var TextModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         this.textCount = Object.keys(mapping).length;
       }
       this.preTextStyle = this.getTextStyle();
-      return (0, _objectSpread2.default)({
+      var commonOptions = {
+        u_stroke_color: (0, _l7Utils.rgb2arr)(stroke),
+        u_sdf_map_size: [(canvas === null || canvas === void 0 ? void 0 : canvas.width) || 1, (canvas === null || canvas === void 0 ? void 0 : canvas.height) || 1],
         u_raisingHeight: Number(raisingHeight),
         u_stroke_width: strokeWidth,
-        u_stroke_color: (0, _l7Utils.rgb2arr)(stroke),
-        u_sdf_map: this.texture,
-        u_halo_blur: halo,
         u_gamma_scale: gamma,
-        u_sdf_map_size: [(canvas === null || canvas === void 0 ? void 0 : canvas.width) || 1, (canvas === null || canvas === void 0 ? void 0 : canvas.height) || 1]
-      }, this.getStyleAttribute());
+        u_halo_blur: halo
+      };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -133,8 +145,9 @@ var TextModel = exports.default = /*#__PURE__*/function (_BaseModel) {
               this.extent = this.textExtent();
               this.rawEncodeData = this.layer.getEncodedData();
               this.preTextStyle = this.getTextStyle();
+              this.initUniformsBuffer();
               return _context2.abrupt("return", this.buildModels());
-            case 5:
+            case 6:
             case "end":
               return _context2.stop();
           }
@@ -250,30 +263,31 @@ var TextModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
       this.styleAttributeService.registerStyleAttribute({
-        name: 'textOffsets',
+        name: 'textUvAndOffsets',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
-          name: 'a_textOffsets',
+          name: 'a_textUvAndOffsets',
           // 文字偏移量
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
             data: [],
             type: _l7Core.gl.FLOAT
           },
-          size: 2,
+          size: 4,
           update: function update(feature, featureIdx, vertex) {
-            return [vertex[5], vertex[6]];
+            return [vertex[3], vertex[4], vertex[5], vertex[6]];
           }
         }
       });
-
       // point layer size;
       this.styleAttributeService.registerStyleAttribute({
         name: 'size',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -288,22 +302,6 @@ var TextModel = exports.default = /*#__PURE__*/function (_BaseModel) {
           }
         }
       });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'textUv',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_tex',
-          buffer: {
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[3], vertex[4]];
-          }
-        }
-      });
     }
   }, {
     key: "bindEvent",
@@ -577,6 +575,7 @@ var TextModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         width: canvas.width,
         height: canvas.height
       });
+      this.textures = [this.texture];
     }
   }, {
     key: "reBuildModel",

package/{es/point/shaders → lib/point/shaders/billboard}/billboard_point_frag.glsl

@@ -1,12 +1,16 @@
 
-uniform float u_additive;
-uniform float u_stroke_opacity : 1;
+layout(std140) uniform commonUniorm {
+  vec4 u_stroke_color;
+  float u_additive;
+  float u_stroke_opacity;
+  float u_stroke_width;
+};
 
-uniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];
+in vec4 v_color;
+in float v_blur;
+in float v_innerRadius;
 
-varying vec4 v_color;
-varying float v_blur;
-varying float v_innerRadius;
+out vec4 outputColor;
 
 #pragma include "picking"
 void main() {
@@ -23,24 +27,24 @@ void main() {
     float blurWidth = (1.0 - v_blur)/2.0;
     vec4 stroke = vec4(u_stroke_color.rgb, u_stroke_opacity);
     if(fragmengTocenter > v_innerRadius + blurWidth) {
-      gl_FragColor = stroke;
+      outputColor = stroke;
     } else if(fragmengTocenter > v_innerRadius - blurWidth){
       float mixR = (fragmengTocenter - (v_innerRadius - blurWidth)) / (blurWidth * 2.0);
-      gl_FragColor = mix(v_color, stroke, mixR);
+      outputColor = mix(v_color, stroke, mixR);
     } else {
-      gl_FragColor = v_color;
+      outputColor = v_color;
     }
   } else {
     // 当不存在 stroke 或 stroke <= 0.01
-    gl_FragColor = v_color;
+    outputColor = v_color;
   }
 
-  gl_FragColor = filterColor(gl_FragColor);
+  outputColor = filterColor(outputColor);
   
   if(u_additive > 0.0) {
-    gl_FragColor *= circleClipOpacity;
+    outputColor *= circleClipOpacity;
   } else {
-    gl_FragColor.a *= circleClipOpacity;
+    outputColor.a *= circleClipOpacity;
   }
 
 }

package/{es/point/shaders → lib/point/shaders/billboard}/billboard_point_vert.glsl

@@ -1,25 +1,24 @@
 
-attribute vec3 a_Position;
-uniform mat4 u_ModelMatrix;
-
-attribute float a_Size;
-attribute vec4 a_Color;
-varying vec4 v_color;
-
-uniform float u_opacity : 1;
-uniform vec2 u_offsets;
-uniform float u_stroke_width;
-
-varying float v_blur;
-varying float v_innerRadius;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
 
+layout(std140) uniform commonUniorm {
+  vec4 u_stroke_color;
+  float u_additive;
+  float u_stroke_opacity;
+  float u_stroke_width;
+};
 
+out vec4 v_color;
+out float v_blur;
+out float v_innerRadius;
 
 #pragma include "projection"
 #pragma include "picking"
 #pragma include "project"
 void main() {
-  v_color = vec4(a_Color.xyz, a_Color.w * u_opacity);
+  v_color = vec4(a_Color.xyz, a_Color.w * opacity);
   v_blur = 1.0 - max(2.0/a_Size, 0.05);
   v_innerRadius = max((a_Size - u_stroke_width) / a_Size, 0.0);
   

package/lib/point/shaders/earthExtrude/earthExtrude_frag.glsl

@@ -0,0 +1,36 @@
+precision highp float;
+in vec4 v_color;
+
+#pragma include "picking"
+
+layout(std140) uniform commonUniform {
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_linearColor: 0;
+  float u_heightfixed: 0.0; // 默认不固定
+  float u_globel;
+  float u_r;
+  float u_pickLight: 0.0;
+  float u_opacitylinear: 0.0;
+  float u_opacitylinear_dir: 1.0;
+  float u_lightEnable: 1.0;
+};
+in float v_lightWeight;
+in float v_barLinearZ;
+out vec4 outputColor;
+void main() {
+
+   outputColor = v_color;
+
+  // 开启透明度渐变
+  if(u_opacitylinear > 0.0) {
+    outputColor.a *= u_opacitylinear_dir > 0.0 ? (1.0 - v_barLinearZ): v_barLinearZ;
+  }
+
+  // picking
+  if(u_pickLight > 0.0) {
+    outputColor = filterColorAlpha(outputColor, v_lightWeight);
+  } else {
+    outputColor = filterColor(outputColor);
+  }
+}

package/{es/point/shaders/earth/extrude_vert.glsl → lib/point/shaders/earthExtrude/earthExtrude_vert.glsl}

@@ -5,23 +5,30 @@ precision highp float;
 #define diffuseRatio 0.3
 #define specularRatio 0.2
 
-attribute vec3 a_Position;
-attribute vec3 a_Pos;
-attribute vec4 a_Color;
-attribute vec3 a_Size;
-attribute vec3 a_Normal;
-
-uniform float u_heightfixed: 0.0; // 默认不固定
-uniform float u_globel;
-uniform float u_r;
-uniform mat4 u_ModelMatrix;
-
-varying vec4 v_color;
-
-uniform float u_opacity : 1;
-uniform float u_lightEnable: 1;
-varying float v_lightWeight;
-varying float v_barLinearZ;
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in vec3 a_Size;
+layout(location = 11) in vec3 a_Pos;
+layout(location = 13) in vec3 a_Normal;
+
+
+layout(std140) uniform commonUniform {
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_linearColor: 0;
+  float u_heightfixed: 0.0; // 默认不固定
+  float u_globel;
+  float u_r;
+  float u_pickLight: 0.0;
+  float u_opacitylinear: 0.0;
+  float u_opacitylinear_dir: 1.0;
+  float u_lightEnable: 1.0;
+};
+
+out vec4 v_color;
+out float v_lightWeight;
+out float v_barLinearZ;
 // 用于将在顶点着色器中计算好的样式值传递给片元
 
 
@@ -47,10 +54,6 @@ float getXRadian(float y, float r) {
 
 void main() {
 
-  
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  textureOffset = opacityAndOffset.g;
   // cal style mapping - 数据纹理映射部分的计算
   vec3 size = a_Size * a_Position;
 
@@ -88,7 +91,7 @@ void main() {
   v_lightWeight = lightWeight;
   // 设置圆柱的底色
   if(u_linearColor == 1.0) { // 使用渐变颜色
-    v_color = mix(u_sourceColor, u_targetColor, barLinearZ);
+    v_color = mix(u_sourceColor, u_targetColor, v_barLinearZ);
     v_color.rgb *= lightWeight;
   } else { // 使用 color 方法传入的颜色
      v_color = a_Color;

package/{es/point/shaders/earth/fill_frag.glsl → lib/point/shaders/earthFill/earthFill_frag.glsl}

@@ -1,23 +1,25 @@
-uniform float u_additive;
-uniform float u_opacity : 1;
-uniform float u_stroke_opacity : 1;
-uniform float u_stroke_width : 2;
-
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
+in vec4 v_data;
+in vec4 v_color;
+in float v_radius;
 
+layout(std140) uniform commonUniform {
+  float u_additive;
+  float u_stroke_opacity : 1;
+  float u_stroke_width : 2;
+  float u_blur : 0.0;
+};
 #pragma include "sdf_2d"
 #pragma include "picking"
 
+out vec4 outputColor;
 
 void main() {
   int shape = int(floor(v_data.w + 0.5));
 
-  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;
+  vec4 strokeColor = u_stroke == vec4(0.0) ? v_color : u_stroke;
 
   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;
@@ -55,23 +57,23 @@ 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 * u_opacity);
+  if(u_stroke_width < 0.01) {
+    outputColor = vec4(v_color.rgb, v_color.a * u_opacity);
   } else {
-    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), u_stroke_color * u_stroke_opacity, color_t);
+    outputColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), strokeColor * u_stroke_opacity, color_t);
   }
 
   if(u_additive > 0.0) {
-    gl_FragColor *= opacity_t;
-    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);
+    outputColor *= opacity_t;
+    outputColor = filterColorAlpha(outputColor, outputColor.a);
   } else {
-    gl_FragColor.a *= opacity_t;
-    gl_FragColor = filterColor(gl_FragColor);
+    outputColor.a *= opacity_t;
+    outputColor = filterColor(outputColor);
   }
 }

package/{es/point/shaders/earth/fill_vert.glsl → lib/point/shaders/earthFill/earthFill_vert.glsl}

@@ -1,22 +1,18 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Extrude;
-attribute float a_Size;
-attribute float a_Shape;
-uniform mat4 u_ModelMatrix;
-
-
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
-
-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;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 10) in float a_Shape;
+layout(location = 11) in vec3 a_Extrude;
+
+layout(std140) uniform commonUniform {
+  float u_additive;
+  float u_stroke_opacity : 1;
+  float u_stroke_width : 2;
+  float u_blur : 0.0;
+};
+out vec4 v_data;
+out vec4 v_color;
+out float v_radius;
 
 #pragma include "projection"
 #pragma include "picking"
@@ -44,8 +40,7 @@ void main() {
   // TODP: /abs(extrude.x) 是为了兼容地球模式
   v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);
 
-
-  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + u_offsets, 1.0);
+  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + vec3(u_offsets,0.0), 1.0);
 
   setPickingColor(a_PickingColor);
-}
+}

package/lib/point/shaders/extrude/extrude_vert.glsl

@@ -1,7 +1,4 @@
 #define pi 3.1415926535
-#define ambientRatio 0.5
-#define diffuseRatio 0.3
-#define specularRatio 0.2
 
 layout(location = 0) in vec3 a_Position;
 layout(location = 1) in vec4 a_Color;

package/{es/point/shaders → lib/point/shaders/fill}/fill_frag.glsl

@@ -1,12 +1,14 @@
-
 layout(std140) uniform commonUniforms {
   vec3 u_blur_height_fixed;
   float u_stroke_width;
   float u_additive;
   float u_stroke_opacity;
   float u_size_unit;
+  float u_time;
+  vec4 u_animate;
 };
 
+
 in vec4 v_color;
 in vec4 v_stroke;
 in vec4 v_data;
@@ -63,17 +65,32 @@ void main() {
     inner_df
   );
 
+  float PI = 3.14159;
+  float N_RINGS = 3.0;
+  float FREQ = 1.0;
+
   if(u_stroke_width < 0.01) {
     outputColor = v_color;
   } else {
     outputColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);
   }
+  float intensity = 1.0;
+  if(u_time!=-1.0){
+    //wave相关逻辑
+    float d = length(v_data.xy);
+    if(d > 0.5) {
+      discard;
+    }
+    intensity = clamp(cos(d * PI), 0.0, 1.0) * clamp(cos(2.0 * PI * (d * 2.0 * u_animate.z - u_animate.y * u_time)), 0.0, 1.0);
+  }
 
   if(u_additive > 0.0) {
     outputColor *= opacity_t;
+    outputColor *= intensity;//wave
     outputColor = filterColorAlpha(outputColor, outputColor.a);
   } else {
     outputColor.a *= opacity_t;
+    outputColor.a *= intensity;//wave 
     outputColor = filterColor(outputColor);
   }
    // 作为 mask 模板时需要丢弃透明的像素

package/lib/point/shaders/{fill_vert.glsl → fill/fill_vert.glsl}

@@ -1,8 +1,7 @@
 layout(location = 0) in vec3 a_Position;
 layout(location = 1) in vec4 a_Color;
-layout(location = 9) in float a_Size;
+layout(location = 9) in vec2 a_SizeAndShape;
 layout(location = 11) in vec3 a_Extrude;
-layout(location = 10) in float a_Shape;
 
 layout(std140) uniform commonUniforms {
   vec3 u_blur_height_fixed;
@@ -10,6 +9,8 @@ layout(std140) uniform commonUniforms {
   float u_additive;
   float u_stroke_opacity;
   float u_size_unit;
+  float u_time;
+  vec4 u_animate;   
 };
 
 out vec4 v_color;
@@ -25,12 +26,12 @@ void main() {
   // 透明度计算
    v_stroke = stroke;  
   vec3 extrude = a_Extrude;
-  float shape_type = a_Shape;
+  float shape_type = a_SizeAndShape.y;
   /*
   *  setPickingSize 设置拾取大小
   *  u_meter2coord 在等面积大小的时候设置单位
   */
-  float newSize = setPickingSize(a_Size);
+  float newSize = setPickingSize(a_SizeAndShape.x);
   // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;
 
 

package/lib/point/shaders/fillImage/fillImage_frag.glsl

@@ -0,0 +1,24 @@
+in vec4 v_color;
+in vec2 v_uv;// 本身的 uv 坐标
+in vec2 v_Iconuv;
+in float v_opacity;
+out vec4 outputColor;
+
+uniform sampler2D u_texture;
+layout(std140) uniform commonUniform {
+  vec2 u_textSize;
+  float u_heightfixed: 0.0;
+  float u_raisingHeight: 0.0;
+  float u_size_unit;
+};
+
+#pragma include "sdf_2d"
+#pragma include "picking"
+
+
+void main() {
+  vec2 pos = v_Iconuv / u_textSize + v_uv / u_textSize * 64.;
+  outputColor = texture(SAMPLER_2D(u_texture), pos);
+  outputColor.a *= v_opacity;
+  outputColor = filterColor(outputColor);
+}

package/{es/point/shaders/image → lib/point/shaders/fillImage}/fillImage_vert.glsl

@@ -1,21 +1,19 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Extrude;
-attribute float a_Size;
-attribute vec2 a_Uv;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 14) in vec2 a_Uv;
 
-uniform mat4 u_ModelMatrix;
+layout(std140) uniform commonUniform {
+  vec2 u_textSize;
+  float u_heightfixed: 0.0;
+  float u_raisingHeight: 0.0;
+  float u_size_unit;
+};
 
-uniform mat2 u_RotateMatrix;
-uniform int u_size_unit;
-
-varying vec2 v_uv; // 本身的 uv 坐标
-varying vec2 v_Iconuv; // icon 贴图的 uv 坐标
-
-uniform float u_raisingHeight: 0.0;
-uniform float u_heightfixed: 0.0;
-varying float v_opacity;
-// uniform vec2 u_offsets; // shader 注入
+out vec2 v_uv;
+out vec2 v_Iconuv;
+out float v_opacity;
 
 
 #pragma include "projection"
@@ -29,7 +27,7 @@ void main() {
   v_Iconuv = a_Uv;
   v_opacity = opacity;
   float newSize = a_Size;
-  if(u_size_unit == 1) {
+  if(u_size_unit == 1.0) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }