@antv/l7-layers 2.20.5 → 2.20.6

package/es/point/models/radar.js

@@ -12,9 +12,10 @@ import BaseModel from "../../core/BaseModel";
 import { SizeUnitType } from "../../core/interface";
 import { PointFillTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/radar/radar_frag.glsl' */
-var pointFillFrag = "\nuniform float u_additive;\nuniform float u_opacity: 1.0;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nvarying vec2 v_exteude;\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nvoid main() {\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius);\n\n  float outer_df = sdCircle(v_data.xy, 1.0);\n  float inner_df = sdCircle(v_data.xy, r);\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n  } else {\n    gl_FragColor.a *= opacity_t;\n  }\n\n  if(gl_FragColor.a > 0.0) {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n\n  vec2 extrude =  v_exteude;\n  vec2 dir = normalize(extrude);\n  vec2 baseDir = vec2(1.0, 0.0);\n  float pi = 3.14159265359;\n  float flag = sign(dir.y);\n  float rades = dot(dir, baseDir);\n  float radar_v = (flag - 1.0) * -0.5 * acos(rades)/pi;\n  // simple AA\n  if(radar_v > 0.99) {\n    radar_v = 1.0 - (radar_v - 0.99)/0.01;\n  }\n\n  gl_FragColor.a *= radar_v;\n}\n";
+var pointFillFrag = "\nlayout(std140) uniform commonUniorm{\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\nin vec4 v_data;\nin vec4 v_color;\nin float v_radius;\nin vec2 v_extrude;\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nout vec4 outputColor;\n\nvoid main() {\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius);\n\n  float outer_df = sdCircle(v_data.xy, 1.0);\n  float inner_df = sdCircle(v_data.xy, r);\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  outputColor = vec4(v_color.rgb, v_color.a);\n\n  if(u_additive > 0.0) {\n    outputColor *= opacity_t;\n  } else {\n    outputColor.a *= opacity_t;\n  }\n\n  if(outputColor.a > 0.0) {\n    outputColor = filterColor(outputColor);\n  }\n\n  vec2 extrude =  v_extrude;\n  vec2 dir = normalize(extrude);\n  vec2 baseDir = vec2(1.0, 0.0);\n  float pi = 3.14159265359;\n  float flag = sign(dir.y);\n  float rades = dot(dir, baseDir);\n  float radar_v = (flag - 1.0) * -0.5 * acos(rades)/pi;\n  // simple AA\n  if(radar_v > 0.99) {\n    radar_v = 1.0 - (radar_v - 0.99)/0.01;\n  }\n\n  outputColor.a *= radar_v;\n}\n";
 /* babel-plugin-inline-import '../shaders/radar/radar_vert.glsl' */
-var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nuniform float u_speed: 1.0;\nuniform float u_time;\n\nuniform mat4 u_ModelMatrix;\n\nuniform int u_size_unit;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nvarying vec2 v_exteude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float newSize = setPickingSize(a_Size);\n\n  float time = u_time * u_speed;\n  mat2 rotateMatrix = mat2( \n    cos(time), sin(time), \n    -sin(time), cos(time)\n  );\n  v_exteude = rotateMatrix * a_Extrude.xy;\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // anti-alias\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_Size, blur);\n\n  if(u_size_unit == 1) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n  // radius(16-bit)\n  v_radius = newSize;\n\n  vec2 offset = (extrude.xy * (newSize));\n  vec3 aPosition = a_Position;\n  \n    // \u4E0D\u4EE5\u7C73\u4E3A\u5B9E\u9645\u5355\u4F4D\n  offset = project_pixel(offset);\n  \n  v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+var pointFillVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 11) in vec4 a_ExtrudeAndSize;\n\nlayout(std140) uniform commonUniorm {\n  float u_additive;\n  float u_size_unit;\n  float u_speed: 1.0;\n  float u_time;\n};\n\nout vec4 v_data;\nout vec4 v_color;\nout float v_radius;\nout vec2 v_extrude;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  vec3 extrude = a_ExtrudeAndSize.xyz;\n  float newSize = setPickingSize(a_ExtrudeAndSize.w);\n\n  float time = u_time * u_speed;\n  mat2 rotateMatrix = mat2( \n    cos(time), sin(time), \n    -sin(time), cos(time)\n  );\n  v_extrude = rotateMatrix * a_ExtrudeAndSize.xy;\n\n  v_color = a_Color;\n  v_color.a *= opacity;\n\n  float blur = 0.0;\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / a_ExtrudeAndSize.w, blur);\n\n  if(u_size_unit == 1.) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n  v_radius = newSize;\n\n  vec2 offset = (extrude.xy * (newSize));\n  vec3 aPosition = a_Position;\n  \n  offset = project_pixel(offset);\n  \n  v_data = vec4(extrude.x, extrude.y, antialiasblur, -1.0);\n\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var RadarModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(RadarModel, _BaseModel);
   var _super = _createSuper(RadarModel);
@@ -23,35 +24,27 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
     return _super.apply(this, arguments);
   }
   _createClass(RadarModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
         blend = _ref.blend,
         _ref$speed = _ref.speed,
         speed = _ref$speed === void 0 ? 1 : _ref$speed,
         _ref$unit = _ref.unit,
         unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
-      return {
+      var commonOptions = {
+        u_additive: blend === 'additive' ? 1.0 : 0.0,
         u_size_unit: SizeUnitType[unit],
         u_speed: speed,
-        u_additive: blend === 'additive' ? 1.0 : 0.0,
-        u_opacity: opacity
-      };
+        u_time: this.layer.getLayerAnimateTime()
+      }; //1+1+1+1
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "getAnimateUniforms",
     value: function getAnimateUniforms() {
-      var _ref2 = this.layer.getLayerConfig(),
-        _ref2$animateOption = _ref2.animateOption,
-        animateOption = _ref2$animateOption === void 0 ? {
-          enable: false
-        } : _ref2$animateOption;
-      return {
-        u_animate: this.animateOption2Array(animateOption),
-        u_time: this.layer.getLayerAnimateTime()
-      };
+      return {};
     }
   }, {
     key: "getAttribute",
@@ -85,20 +78,22 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              this.initUniformsBuffer();
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'pointRadar',
                 vertexShader: pointFillVert,
                 fragmentShader: pointFillFrag,
                 triangulation: PointFillTriangulation,
+                inject: this.getInject(),
                 depth: {
                   enable: false
                 }
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -118,42 +113,25 @@ var RadarModel = /*#__PURE__*/function (_BaseModel) {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
       this.styleAttributeService.registerStyleAttribute({
-        name: 'extrude',
+        name: 'extrudeAndSize',
         type: AttributeType.Attribute,
         descriptor: {
-          name: 'a_Extrude',
+          name: 'a_ExtrudeAndSize',
+          shaderLocation: ShaderLocation.EXTRUDE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
             data: [],
             type: gl.FLOAT
           },
-          size: 3,
+          size: 4,
           update: function update(feature, featureIdx, vertex, attributeIdx) {
             var extrude = [1, 1, 0, -1, 1, 0, -1, -1, 0, 1, -1, 0];
             var extrudeIndex = attributeIdx % 4 * 3;
-            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2]];
-          }
-        }
-      });
-
-      // point layer size;
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'size',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Size',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
             var _feature$size = feature.size,
               size = _feature$size === void 0 ? 5 : _feature$size;
-            return Array.isArray(size) ? [size[0]] : [size];
+            var a_Size = Array.isArray(size) ? size[0] : size;
+            return [extrude[extrudeIndex], extrude[extrudeIndex + 1], extrude[extrudeIndex + 2], a_Size];
           }
         }
       });

package/es/point/models/text.d.ts

@@ -1,6 +1,6 @@
-import { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
+import type { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
-import { IGlyphQuad } from '../../utils/symbol-layout';
+import type { IGlyphQuad } from '../../utils/symbol-layout';
 export declare function TextTrianglation(feature: IEncodeFeature): {
     vertices: number[];
     indices: number[];
@@ -23,6 +23,13 @@ export default class TextModel extends BaseModel {
     private textCount;
     private preTextStyle;
     getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
     needUpdate(): Promise<boolean>;

package/es/point/models/text.js

@@ -19,10 +19,11 @@ import { boundsContains, calculateCentroid, lodashUtil, padBounds, rgb2arr } fro
 import BaseModel from "../../core/BaseModel";
 import CollisionIndex from "../../utils/collision-index";
 import { getGlyphQuads, shapeText } from "../../utils/symbol-layout";
-/* 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";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var isEqual = lodashUtil.isEqual;
 export function TextTrianglation(feature) {
   // @ts-ignore
@@ -85,6 +86,16 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(TextModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return _objectSpread(_objectSpread(_objectSpread({}, 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,
@@ -103,15 +114,16 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         this.textCount = Object.keys(mapping).length;
       }
       this.preTextStyle = this.getTextStyle();
-      return _objectSpread({
+      var commonOptions = {
+        u_stroke_color: 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: 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",
@@ -125,8 +137,9 @@ var TextModel = /*#__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();
           }
@@ -242,30 +255,31 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {
       this.styleAttributeService.registerStyleAttribute({
-        name: 'textOffsets',
+        name: 'textUvAndOffsets',
         type: AttributeType.Attribute,
         descriptor: {
-          name: 'a_textOffsets',
+          name: 'a_textUvAndOffsets',
           // 文字偏移量
+          shaderLocation: ShaderLocation.UV,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
             data: [],
             type: 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: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: ShaderLocation.SIZE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
@@ -280,22 +294,6 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
           }
         }
       });
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'textUv',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'a_tex',
-          buffer: {
-            usage: gl.DYNAMIC_DRAW,
-            data: [],
-            type: gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[3], vertex[4]];
-          }
-        }
-      });
     }
   }, {
     key: "bindEvent",
@@ -569,6 +567,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
         width: canvas.width,
         height: canvas.height
       });
+      this.textures = [this.texture];
     }
   }, {
     key: "reBuildModel",

package/{lib/point/shaders → es/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/{lib/point/shaders → es/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/es/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/{lib/point/shaders/earth/extrude_vert.glsl → es/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/{lib/point/shaders/earth/fill_frag.glsl → es/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/{lib/point/shaders/earth/fill_vert.glsl → es/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/es/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;