@antv/l7-layers 2.19.10 → 2.20.0

package/es/point/models/fill.js

@@ -1,4 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
@@ -11,14 +12,15 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 import { AttributeType, gl } from '@antv/l7-core';
 import { PointFillTriangulation } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { SizeUnitType } from "../../core/interface";
 // animate pointLayer shader - support animate
 /* babel-plugin-inline-import '../shaders/animate/wave_frag.glsl' */
 var waveFillFrag = "\nuniform float u_additive;\n\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nuniform float u_time;\nuniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];\n\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;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  \n  outer_df = sdCircle(v_data.xy, 1.0);\n  inner_df = sdCircle(v_data.xy, r);\n\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n  float PI = 3.14159;\n  float N_RINGS = 3.0;\n  float FREQ = 1.0;\n\n  gl_FragColor = v_color;\n\n  float d = length(v_data.xy);\n  if(d > 0.5) {\n    discard;\n  }\n  float 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);\n  \n  // \u6839\u636E\u53E0\u52A0\u6A21\u5F0F\u9009\u62E9\u6548\u679C\n  if(u_additive > 0.0) {\n    gl_FragColor *= intensity;\n    // \u4F18\u5316\u6C34\u6CE2\u70B9 blend additive \u6A21\u5F0F\u4E0B\u6709\u7684\u62FE\u53D6\u6548\u679C \n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor = vec4(gl_FragColor.xyz, gl_FragColor.a * intensity);\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n"; // static pointLayer shader - not support animate
 /* babel-plugin-inline-import '../shaders/fill_frag.glsl' */
-var pointFillFrag = "uniform float u_additive;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nvarying vec4 v_stroke;\n\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + u_stroke_width);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = u_stroke_width < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(u_stroke_width < 0.01) {\n    gl_FragColor = v_color;\n  } else {\n    gl_FragColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\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}\n";
+var pointFillFrag = "\nlayout(std140) uniform commonUniforms {\n  vec3 u_blur_height_fixed;\n  float u_stroke_width;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_size_unit;\n};\n\nin vec4 v_color;\nin vec4 v_stroke;\nin vec4 v_data;\nin float v_radius;\n\n#pragma include \"scene_uniforms\"\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\nout vec4 outputColor;\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + u_stroke_width);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = u_stroke_width < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(u_stroke_width < 0.01) {\n    outputColor = v_color;\n  } else {\n    outputColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    outputColor *= opacity_t;\n    outputColor = filterColorAlpha(outputColor, outputColor.a);\n  } else {\n    outputColor.a *= opacity_t;\n    outputColor = filterColor(outputColor);\n  }\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}\n";
 /* babel-plugin-inline-import '../shaders/fill_vert.glsl' */
-var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\nuniform mat4 u_ModelMatrix;\n\nuniform int u_size_unit;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\nvarying vec4 v_stroke;\nuniform float u_stroke_width: 2;\nuniform vec3 u_blur_height_fixed: [0, 0, 0];\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\n\nvoid main() {\n  // \u900F\u660E\u5EA6\u8BA1\u7B97\n   v_stroke = stroke;  \n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  *  u_meter2coord \u5728\u7B49\u9762\u79EF\u5927\u5C0F\u7684\u65F6\u5019\u8BBE\u7F6E\u5355\u4F4D\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n\n\n  // unpack color(vec2)\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n\n  if(u_size_unit == 1) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n\n   v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur_height_fixed.x);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + u_offsets);\n  vec3 aPosition = a_Position;\n\n  offset = project_pixel(offset);\n  offset = rotate_matrix(offset,rotation);\n  \n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  float raisingHeight = u_blur_height_fixed.y;\n\n  if(u_blur_height_fixed.z < 1.0) { // false\n    raisingHeight = project_pixel(u_blur_height_fixed.y);\n  } else {\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      raisingHeight = u_blur_height_fixed.y * mapboxZoomScale;\n    }\n  }\n  \n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, raisingHeight, 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 = 9) in float a_Size;\nlayout(location = 11) in vec3 a_Extrude;\nlayout(location = 10) in float a_Shape;\n\nlayout(std140) uniform commonUniforms {\n  vec3 u_blur_height_fixed;\n  float u_stroke_width;\n  float u_additive;\n  float u_stroke_opacity;\n  float u_size_unit;\n};\n\nout vec4 v_color;\nout vec4 v_stroke;\nout vec4 v_data;\nout float v_radius;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n#pragma include \"rotation_2d\"\n\nvoid main() {\n  // \u900F\u660E\u5EA6\u8BA1\u7B97\n   v_stroke = stroke;  \n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  *  u_meter2coord \u5728\u7B49\u9762\u79EF\u5927\u5C0F\u7684\u65F6\u5019\u8BBE\u7F6E\u5355\u4F4D\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n\n\n  // unpack color(vec2)\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n\n  if(u_size_unit == 1.0) {\n    newSize = newSize  * u_PixelsPerMeter.z;\n  }\n\n   v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur_height_fixed.x);\n\n  vec2 offset = (extrude.xy * (newSize + u_stroke_width) + u_offsets);\n  vec3 aPosition = a_Position;\n\n  offset = project_pixel(offset);\n  offset = rotate_matrix(offset,rotation);\n  \n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  // vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n  vec4 project_pos = project_position(vec4(aPosition.xy, 0.0, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy + offset, project_pixel(setPickingOrder(0.0)), 1.0));\n\n  float raisingHeight = u_blur_height_fixed.y;\n\n  if(u_blur_height_fixed.z < 1.0) { // false\n    raisingHeight = project_pixel(u_blur_height_fixed.y);\n  } else {\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      raisingHeight = u_blur_height_fixed.y * mapboxZoomScale;\n    }\n  }\n  \n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy + offset, raisingHeight, 1.0));\n\n  setPickingColor(a_PickingColor);\n}\n";
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(FillModel, _BaseModel);
   var _super = _createSuper(FillModel);
@@ -43,13 +45,23 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
         heightfixed = _ref$heightfixed === void 0 ? false : _ref$heightfixed,
         _ref$unit = _ref.unit,
         unit = _ref$unit === void 0 ? 'pixel' : _ref$unit;
-      return _objectSpread({
+      var commonIniform = _objectSpread({
         u_blur_height_fixed: [blur, Number(raisingHeight), Number(heightfixed)],
         u_additive: blend === 'additive' ? 1.0 : 0.0,
         u_stroke_opacity: strokeOpacity,
         u_stroke_width: strokeWidth,
         u_size_unit: SizeUnitType[unit]
       }, this.getStyleAttribute());
+      var attributes = this.getStyleAttribute();
+      this.uniformBuffers[0].subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array([].concat(_toConsumableArray(attributes.u_stroke), _toConsumableArray(attributes.u_offsets), [attributes.u_opacity, attributes.u_rotation])).buffer)
+      });
+      this.uniformBuffers[1].subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array([].concat(_toConsumableArray(commonIniform.u_blur_height_fixed), [commonIniform.u_stroke_width, commonIniform.u_stroke_opacity, commonIniform.u_additive, commonIniform.u_size_unit])).buffer)
+      });
+      return commonIniform;
     }
   }, {
     key: "getAnimateUniforms",
@@ -92,7 +104,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _ref3, _ref3$animateOption, animateOption, _this$getShaders, frag, vert, type, model;
+        var _ref3, _ref3$animateOption, animateOption, _this$getShaders, frag, vert, type, attributeUniformBuffer, commonUniforms, model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -101,7 +113,16 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
               } : _ref3$animateOption;
               _this$getShaders = this.getShaders(animateOption), frag = _this$getShaders.frag, vert = _this$getShaders.vert, type = _this$getShaders.type;
               this.layer.triangulation = PointFillTriangulation;
-              _context2.next = 5;
+              attributeUniformBuffer = this.rendererService.createBuffer({
+                data: new Float32Array(4 + 2 + 1 + 1),
+                isUBO: true
+              });
+              commonUniforms = this.rendererService.createBuffer({
+                data: new Float32Array(8),
+                isUBO: true
+              });
+              this.uniformBuffers.push(attributeUniformBuffer, commonUniforms);
+              _context2.next = 8;
               return this.layer.buildLayerModel({
                 moduleName: type,
                 vertexShader: vert,
@@ -112,10 +133,10 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 5:
+            case 8:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 7:
+            case 10:
             case "end":
               return _context2.stop();
           }
@@ -173,6 +194,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Extrude',
+          shaderLocation: ShaderLocation.EXTRUDE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
@@ -194,6 +216,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
         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,
@@ -215,6 +238,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Shape',
+          shaderLocation: ShaderLocation.SHAPE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,

package/es/point/models/fillmage.js

@@ -157,7 +157,7 @@ var FillImageModel = /*#__PURE__*/function (_BaseModel) {
     value: function clearModels() {
       var _this$texture;
       this.iconService.off('imageUpdate', this.updateTexture);
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
 
     // overwrite baseModel func

package/es/point/models/image.js

@@ -105,7 +105,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       this.iconService.off('imageUpdate', this.updateTexture);
     }
   }, {

package/es/point/models/normal.js

@@ -10,13 +10,12 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
 import { AttributeType, gl } from '@antv/l7-core';
-import { lodashUtil } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 /* babel-plugin-inline-import '../shaders/normal_frag.glsl' */
-var normalFrag = "varying vec4 v_color;\nvoid main() {\n  gl_FragColor = v_color;\n}\n";
+var normalFrag = "in vec4 v_color;\nout vec4 outputColor;\nvoid main() {\n  outputColor = v_color;\n}";
 /* babel-plugin-inline-import '../shaders/normal_vert.glsl' */
-var normalVert = "\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\n\nattribute float a_Size;\nattribute vec4 a_Color;\n\nvarying vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n\nvoid main() {\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n\n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(a_Position.xy, a_Position.z, 1.0);\n  } else {\n    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);\n    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy),project_pos.z,project_pos.w));\n  }\n\n  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;\n}\n";
-var isNumber = lodashUtil.isNumber;
+var normalVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in float a_Size;\n\nlayout(std140) uniform u_Common {\n  float u_size_scale;\n};\n\nout vec4 v_color;\n\n#pragma include \"projection\"\n#pragma include \"project\"\n\nvoid main() {\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n\n  if (u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * vec4(a_Position, 1.0);\n  } else {\n    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2., -a_Size /2., 0., 0.);\n    gl_Position = project_common_position_to_clipspace(project_pos);\n  }\n\n  gl_PointSize = a_Size * u_size_scale *  2.0  * u_DevicePixelRatio;\n}\n";
 export function PointTriangulation(feature) {
   var coordinates = feature.coordinates;
   return {
@@ -42,10 +41,19 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "getUninforms",
     value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity;
-      return _objectSpread({}, this.getStyleAttribute());
+      var attributes = this.getStyleAttribute();
+      // FIXME: No need to update each frame
+      this.uniformBuffers[0].subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array([].concat(_toConsumableArray(attributes.u_stroke), _toConsumableArray(attributes.u_offsets), [attributes.u_opacity, attributes.u_rotation])).buffer)
+      });
+      this.uniformBuffers[1].subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array([0.5]).buffer)
+      });
+      return _objectSpread({
+        u_size_scale: 0.5
+      }, attributes);
     }
   }, {
     key: "initModels",
@@ -70,12 +78,21 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var model;
+        var uniformBuffer, commonBuffer, model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               this.layer.triangulation = PointTriangulation;
-              _context2.next = 3;
+              uniformBuffer = this.rendererService.createBuffer({
+                data: new Float32Array(4 + 2 + 1 + 1),
+                isUBO: true
+              });
+              commonBuffer = this.rendererService.createBuffer({
+                data: new Float32Array(4),
+                isUBO: true
+              });
+              this.uniformBuffers.push(uniformBuffer, commonBuffer);
+              _context2.next = 6;
               return this.layer.buildLayerModel({
                 moduleName: 'pointNormal',
                 vertexShader: normalVert,
@@ -88,10 +105,10 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
                 primitive: gl.POINTS,
                 pick: false
               });
-            case 3:
+            case 6:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 5:
+            case 8:
             case "end":
               return _context2.stop();
           }
@@ -115,6 +132,7 @@ var NormalModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: ShaderLocation.SIZE,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],

package/es/point/models/text.js

@@ -234,7 +234,7 @@ var TextModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
       // TODO this.mapping
       this.layer.off('remapping', this.mapping);
     }

package/es/point/shaders/fill_frag.glsl

@@ -1,16 +1,22 @@
-uniform float u_additive;
-uniform float u_stroke_opacity : 1;
-uniform float u_stroke_width : 2;
 
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
-varying vec4 v_stroke;
+layout(std140) uniform commonUniforms {
+  vec3 u_blur_height_fixed;
+  float u_stroke_width;
+  float u_additive;
+  float u_stroke_opacity;
+  float u_size_unit;
+};
 
+in vec4 v_color;
+in vec4 v_stroke;
+in vec4 v_data;
+in float v_radius;
 
+#pragma include "scene_uniforms"
 #pragma include "sdf_2d"
 #pragma include "picking"
 
+out vec4 outputColor;
 
 void main() {
   int shape = int(floor(v_data.w + 0.5));
@@ -58,20 +64,20 @@ void main() {
   );
 
   if(u_stroke_width < 0.01) {
-    gl_FragColor = v_color;
+    outputColor = v_color;
   } else {
-    gl_FragColor = mix(v_color, v_stroke * u_stroke_opacity, color_t);
+    outputColor = mix(v_color, v_stroke * 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);
   }
    // 作为 mask 模板时需要丢弃透明的像素
-  if(gl_FragColor.a < 0.01) {
+  if(outputColor.a < 0.01) {
     discard;
   } 
 }

package/es/point/shaders/fill_vert.glsl

@@ -1,25 +1,26 @@
-attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Extrude;
-attribute float a_Size;
-attribute float a_Shape;
-uniform mat4 u_ModelMatrix;
-
-uniform int u_size_unit;
-
-varying vec4 v_data;
-varying vec4 v_color;
-varying float v_radius;
-varying vec4 v_stroke;
-uniform float u_stroke_width: 2;
-uniform vec3 u_blur_height_fixed: [0, 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 = 11) in vec3 a_Extrude;
+layout(location = 10) in float a_Shape;
+
+layout(std140) uniform commonUniforms {
+  vec3 u_blur_height_fixed;
+  float u_stroke_width;
+  float u_additive;
+  float u_stroke_opacity;
+  float u_size_unit;
+};
+
+out vec4 v_color;
+out vec4 v_stroke;
+out vec4 v_data;
+out float v_radius;
 
 #pragma include "projection"
 #pragma include "picking"
 #pragma include "rotation_2d"
 
-
 void main() {
   // 透明度计算
    v_stroke = stroke;  
@@ -37,7 +38,7 @@ void main() {
   // unpack color(vec2)
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
 
-  if(u_size_unit == 1) {
+  if(u_size_unit == 1.0) {
     newSize = newSize  * u_PixelsPerMeter.z;
   }
 

package/es/point/shaders/normal_frag.glsl

@@ -1,4 +1,5 @@
-varying vec4 v_color;
+in vec4 v_color;
+out vec4 outputColor;
 void main() {
-  gl_FragColor = v_color;
-}
+  outputColor = v_color;
+}

package/es/point/shaders/normal_vert.glsl

@@ -1,11 +1,12 @@
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in float a_Size;
 
-attribute vec3 a_Position;
-uniform mat4 u_ModelMatrix;
+layout(std140) uniform u_Common {
+  float u_size_scale;
+};
 
-attribute float a_Size;
-attribute vec4 a_Color;
-
-varying vec4 v_color;
+out vec4 v_color;
 
 #pragma include "projection"
 #pragma include "project"
@@ -13,12 +14,12 @@ varying vec4 v_color;
 void main() {
   v_color = vec4(a_Color.xyz, a_Color.w * opacity);
 
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * vec4(a_Position.xy, a_Position.z, 1.0);
+  if (u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * vec4(a_Position, 1.0);
   } else {
-    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2.,-a_Size /2.,0.,0.);
-    gl_Position = project_common_position_to_clipspace(vec4(vec2(project_pos.xy),project_pos.z,project_pos.w));
+    vec4 project_pos = project_position(vec4(a_Position, 1.0)) + vec4(a_Size / 2., -a_Size /2., 0., 0.);
+    gl_Position = project_common_position_to_clipspace(project_pos);
   }
 
-  gl_PointSize = a_Size * 2.0 * u_DevicePixelRatio;
+  gl_PointSize = a_Size * u_size_scale *  2.0  * u_DevicePixelRatio;
 }

package/es/polygon/index.js

@@ -55,7 +55,7 @@ var PolygonLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+      var shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       if (shape === 'fill' || !shape) {
         return 'fill';
       } else if (shape === 'extrude') {

package/es/polygon/models/extrude.js

@@ -153,7 +153,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/polygon/models/extrusion.js

@@ -90,7 +90,7 @@ var ExtrusionModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/polygon/models/ocean.js

@@ -107,9 +107,9 @@ var OceanModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture, _this$texture2, _this$texture3;
-      (_this$texture = this.texture1) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
-      (_this$texture2 = this.texture2) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
-      (_this$texture3 = this.texture3) === null || _this$texture3 === void 0 ? void 0 : _this$texture3.destroy();
+      (_this$texture = this.texture1) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$texture2 = this.texture2) === null || _this$texture2 === void 0 || _this$texture2.destroy();
+      (_this$texture3 = this.texture3) === null || _this$texture3 === void 0 || _this$texture3.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/polygon/models/water.js

@@ -102,7 +102,7 @@ var WaterModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/raster/models/raster.js

@@ -163,8 +163,8 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture, _this$colorTexture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
-      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/raster/models/rasterRgb.js

@@ -175,7 +175,7 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",

package/es/raster/models/rasterTerrainRgb.js

@@ -112,7 +112,7 @@ var RasterTerrainRGB = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "buildModels",

package/es/tile/core/BaseLayer.js

@@ -49,7 +49,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
         zoom: zoom,
         latLonBounds: latLonBounds
       };
-      (_this$tilesetManager = _this.tilesetManager) === null || _this$tilesetManager === void 0 ? void 0 : _this$tilesetManager.throttleUpdate(zoom, latLonBounds);
+      (_this$tilesetManager = _this.tilesetManager) === null || _this$tilesetManager === void 0 || _this$tilesetManager.throttleUpdate(zoom, latLonBounds);
     });
     //  防抖操作
     _defineProperty(this, "viewchange", debounce(this.mapchange, 24));
@@ -96,7 +96,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       var _this$getCurrentView2 = this.getCurrentView(),
         latLonBounds = _this$getCurrentView2.latLonBounds,
         zoom = _this$getCurrentView2.zoom;
-      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 ? void 0 : _this$tilesetManager2.update(zoom, latLonBounds);
+      (_this$tilesetManager2 = this.tilesetManager) === null || _this$tilesetManager2 === void 0 || _this$tilesetManager2.update(zoom, latLonBounds);
     }
   }, {
     key: "getCurrentView",
@@ -179,7 +179,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       var _this$tilesetManager3;
       this.mapService.off('zoomend', this.mapchange);
       this.mapService.off('moveend', this.viewchange);
-      (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 ? void 0 : _this$tilesetManager3.destroy();
+      (_this$tilesetManager3 = this.tilesetManager) === null || _this$tilesetManager3 === void 0 || _this$tilesetManager3.destroy();
       this.tileLayerService.destroy();
     }
     // 重新加载
@@ -192,7 +192,7 @@ var BaseTileLayer = /*#__PURE__*/function () {
       var _this$getCurrentView3 = this.getCurrentView(),
         latLonBounds = _this$getCurrentView3.latLonBounds,
         zoom = _this$getCurrentView3.zoom;
-      (_this$tilesetManager4 = this.tilesetManager) === null || _this$tilesetManager4 === void 0 ? void 0 : _this$tilesetManager4.update(zoom, latLonBounds);
+      (_this$tilesetManager4 = this.tilesetManager) === null || _this$tilesetManager4 === void 0 || _this$tilesetManager4.update(zoom, latLonBounds);
     }
   }, {
     key: "tileUnLoad",

package/es/tile/interaction/getRasterData.js

@@ -2,7 +2,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { DOM } from '@antv/l7-utils';
 export function readRasterValue(tile, mapService, x, y) {
   var _tile$bboxPolygon, _tile$data, _tile$data2, _tile$data3;
-  var bbox = (tile === null || tile === void 0 ? void 0 : (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
+  var bbox = (tile === null || tile === void 0 || (_tile$bboxPolygon = tile.bboxPolygon) === null || _tile$bboxPolygon === void 0 ? void 0 : _tile$bboxPolygon.bbox) || [0, 0, 10, -10];
   var _bbox = _slicedToArray(bbox, 4),
     _bbox$ = _bbox[0],
     minLng = _bbox$ === void 0 ? 0 : _bbox$,
@@ -21,12 +21,12 @@ export function readRasterValue(tile, mapService, x, y) {
   (y - tileMaxXY.y) / tilePixelHeight // y
   ];
 
-  var tileWidth = (tile === null || tile === void 0 ? void 0 : (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
-  var tileHeight = (tile === null || tile === void 0 ? void 0 : (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
+  var tileWidth = (tile === null || tile === void 0 || (_tile$data = tile.data) === null || _tile$data === void 0 ? void 0 : _tile$data.width) || 1;
+  var tileHeight = (tile === null || tile === void 0 || (_tile$data2 = tile.data) === null || _tile$data2 === void 0 ? void 0 : _tile$data2.height) || 1;
   var indexX = Math.floor(pos[0] * tileWidth);
   var indexY = Math.floor(pos[1] * tileHeight);
   var index = Math.max(0, indexY - 1) * tileWidth + indexX;
-  var data = tile === null || tile === void 0 ? void 0 : (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
+  var data = tile === null || tile === void 0 || (_tile$data3 = tile.data) === null || _tile$data3 === void 0 ? void 0 : _tile$data3.data[index];
   return data;
 }
 export function readPixel(x, y, rendererService) {

package/es/tile/service/TileLayerService.js

@@ -71,17 +71,17 @@ export var TileLayerService = /*#__PURE__*/function () {
         // 不可见 => 可见 兄弟节点加载完成
         if (sourceTile.parent) {
           var flag = this.isChildrenLoaded(sourceTile.parent);
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(flag);
+          tile === null || tile === void 0 || tile.updateVisible(flag);
         } else {
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(true);
+          tile === null || tile === void 0 || tile.updateVisible(true);
         }
       } else {
         // 可见 => 不可见 兄弟节点加载完成
         if (sourceTile.parent) {
           var _flag = this.isChildrenLoaded(sourceTile.parent);
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(!_flag);
+          tile === null || tile === void 0 || tile.updateVisible(!_flag);
         } else {
-          tile === null || tile === void 0 ? void 0 : tile.updateVisible(false);
+          tile === null || tile === void 0 || tile.updateVisible(false);
         }
       }
     }

package/es/tile/service/TilePickService.js

@@ -28,7 +28,7 @@ export var TilePickService = /*#__PURE__*/function () {
       if (tile) {
         // TODO 多图层拾取
         var pickLayer = tile.getMainLayer();
-        pickLayer === null || pickLayer === void 0 ? void 0 : pickLayer.layerPickService.pickRender(target);
+        pickLayer === null || pickLayer === void 0 || pickLayer.layerPickService.pickRender(target);
       }
     }
   }, {
@@ -78,10 +78,10 @@ export var TilePickService = /*#__PURE__*/function () {
         var layer = tile.getMainLayer();
         switch (type) {
           case SELECT:
-            layer === null || layer === void 0 ? void 0 : layer.hooks.beforeSelect.call([r, g, b]);
+            layer === null || layer === void 0 || layer.hooks.beforeSelect.call([r, g, b]);
             break;
           case ACTIVE:
-            layer === null || layer === void 0 ? void 0 : layer.hooks.beforeHighlight.call([r, g, b]);
+            layer === null || layer === void 0 || layer.hooks.beforeHighlight.call([r, g, b]);
             break;
         }
       });

package/es/tile/tile/Tile.d.ts

@@ -58,7 +58,6 @@ export default abstract class Tile extends EventEmitter implements ITile {
         cursorEnabled?: boolean | undefined;
         cursor?: string | undefined;
         forward?: boolean | undefined;
-        usage?: string | undefined;
         enableMask?: boolean | undefined;
         enablePicking?: boolean | undefined;
         enableHighlight?: boolean | undefined;
@@ -89,8 +88,11 @@ export default abstract class Tile extends EventEmitter implements ITile {
         pickBufferScale?: number | undefined;
         stencil?: boolean | undefined;
         debug?: boolean | undefined;
+        renderer?: "regl" | "device" | undefined;
         antialias?: boolean | undefined;
         preserveDrawingBuffer?: boolean | undefined;
+        enableWebGPU?: boolean | undefined;
+        shaderCompilerPath?: string | undefined;
     };
     protected getMaskLayer(): ILayer[];
     protected addTileMask(): Promise<ILayer>;