@antv/l7-layers 2.19.11 → 2.20.0

package/es/plugins/PixelPickingPlugin.js

@@ -1,10 +1,12 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _dec, _class;
 import { AttributeType, gl } from '@antv/l7-core';
 import { decodePickingColor, encodePickingColor, rgb2arr } from '@antv/l7-utils';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
+import { ShaderLocation } from "../core/CommonStyleAttribute";
 var PickingStage = {
   NONE: 0.0,
   ENCODE: 1.0,
@@ -13,11 +15,66 @@ var PickingStage = {
 var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/function () {
   function PixelPickingPlugin() {
     _classCallCheck(this, PixelPickingPlugin);
+    _defineProperty(this, "PickOption", {
+      u_HighlightColor: [1, 0, 0, 1],
+      u_SelectColor: [1, 0, 0, 1],
+      u_PickingColor: [0, 0, 0],
+      u_PickingStage: 0,
+      u_CurrentSelectedId: [0, 0, 0],
+      u_PickingThreshold: 10,
+      u_PickingBuffer: 0,
+      // TODO: 更新机制
+      u_shaderPick: 0,
+      u_EnableSelect: 0,
+      u_activeMix: 0
+    });
   }
   _createClass(PixelPickingPlugin, [{
+    key: "pickOption2Array",
+    value: function pickOption2Array() {
+      return Object.values(this.PickOption).flat();
+    }
+  }, {
+    key: "updatePickOption",
+    value: function updatePickOption(option, rendererService) {
+      var _this = this;
+      Object.keys(option).forEach(function (key) {
+        _this.PickOption[key] = option[key];
+      });
+      rendererService.uniformBuffers[1].subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(this.pickOption2Array()))
+      });
+    }
+  }, {
     key: "apply",
     value: function apply(layer, _ref) {
-      var styleAttributeService = _ref.styleAttributeService;
+      var _this2 = this;
+      var rendererService = _ref.rendererService,
+        styleAttributeService = _ref.styleAttributeService;
+      if (!rendererService.uniformBuffers[1]) {
+        // Create a Uniform Buffer Object(UBO).
+        var uniformBuffer = rendererService.createBuffer({
+          // vec4 u_HighlightColor;
+          // vec4 u_SelectColor;
+          // vec3 u_PickingColor;
+          // float u_PickingStage;
+          // vec3 u_CurrentSelectedId;
+          // float u_PickingThreshold;
+          // float u_PickingBuffer;
+          // float u_shaderPick;
+          // float u_EnableSelect;
+          // float u_activeMix;
+          data: new Float32Array(this.pickOption2Array().length),
+          isUBO: true
+        });
+        rendererService.uniformBuffers[1] = uniformBuffer;
+        this.updatePickOption({}, rendererService);
+      }
+      // u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
+      // // Tip: 当前地图是否在拖动
+      // u_shaderPick: Number(layer.getShaderPickStat()),
+
       // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor
       layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
@@ -27,6 +84,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           type: AttributeType.Attribute,
           descriptor: {
             name: 'a_PickingColor',
+            shaderLocation: ShaderLocation.PICKING_COLOR,
             buffer: {
               data: [],
               type: gl.FLOAT
@@ -46,6 +104,9 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
         var _layer$getLayerConfig2 = layer.getLayerConfig(),
           enablePicking = _layer$getLayerConfig2.enablePicking;
         if (enablePicking && layer.isVisible()) {
+          _this2.updatePickOption({
+            u_PickingStage: PickingStage.ENCODE
+          }, rendererService);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.ENCODE
@@ -58,6 +119,9 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           enablePicking = _layer$getLayerConfig3.enablePicking;
         // 区分选中高亮 和滑过高亮
         if (enablePicking && layer.isVisible()) {
+          _this2.updatePickOption({
+            u_PickingStage: PickingStage.HIGHLIGHT
+          }, rendererService);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.HIGHLIGHT
@@ -74,15 +138,17 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
         layer.updateLayerConfig({
           pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor))
         });
+        var option = {
+          u_PickingStage: PickingStage.HIGHLIGHT,
+          u_PickingColor: pickedColor,
+          u_HighlightColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_activeMix: activeMix
+        };
+        _this2.updatePickOption(option, rendererService);
         layer.models.forEach(function (model) {
-          return model.addUniforms({
-            u_PickingStage: PickingStage.HIGHLIGHT,
-            u_PickingColor: pickedColor,
-            u_HighlightColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_activeMix: activeMix
-          });
+          return model.addUniforms(option);
         });
       });
       layer.hooks.beforeSelect.tap('PixelPickingPlugin', function (pickedColor) {
@@ -94,20 +160,23 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
         layer.updateLayerConfig({
           pickedFeatureID: decodePickingColor(new Uint8Array(pickedColor))
         });
+        var option = {
+          u_PickingStage: PickingStage.HIGHLIGHT,
+          u_PickingColor: pickedColor,
+          u_HighlightColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_activeMix: selectMix,
+          u_CurrentSelectedId: pickedColor,
+          u_SelectColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_EnableSelect: 1
+        };
+        console.log(option);
+        _this2.updatePickOption(option, rendererService);
         layer.models.forEach(function (model) {
-          return model.addUniforms({
-            u_PickingStage: PickingStage.HIGHLIGHT,
-            u_PickingColor: pickedColor,
-            u_HighlightColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_activeMix: selectMix,
-            u_CurrentSelectedId: pickedColor,
-            u_SelectColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_EnableSelect: 1
-          });
+          return model.addUniforms(option);
         });
       });
     }

package/es/plugins/RegisterStyleAttributePlugin.d.ts

@@ -9,7 +9,6 @@ export default class RegisterStyleAttributePlugin implements ILayerPlugin {
     }): void;
     private registerBuiltinAttributes;
     private registerPositionAttribute;
-    private registerFilterAttribute;
     private registerColorAttribute;
     private registerVertexIdAttribute;
 }

package/es/plugins/RegisterStyleAttributePlugin.js

@@ -4,6 +4,7 @@ var _dec, _class;
 import { AttributeType, gl } from '@antv/l7-core';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
+import { ShaderLocation } from "../core/CommonStyleAttribute";
 import { isTileGroup } from "../tile/utils/utils";
 
 /**
@@ -48,6 +49,7 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Position',
+          shaderLocation: ShaderLocation.POSITION,
           buffer: {
             data: [],
             type: gl.FLOAT
@@ -59,28 +61,6 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
         }
       });
     }
-  }, {
-    key: "registerFilterAttribute",
-    value: function registerFilterAttribute(styleAttributeService) {
-      styleAttributeService.registerStyleAttribute({
-        name: 'filter',
-        type: AttributeType.Attribute,
-        descriptor: {
-          name: 'filter',
-          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 filter = feature.filter;
-            return filter ? [1] : [0];
-          }
-        }
-      });
-    }
   }, {
     key: "registerColorAttribute",
     value: function registerColorAttribute(styleAttributeService) {
@@ -89,6 +69,7 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Color',
+          shaderLocation: ShaderLocation.COLOR,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,
@@ -112,6 +93,7 @@ var RegisterStyleAttributePlugin = (_dec = injectable(), _dec(_class = /*#__PURE
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_vertexId',
+          shaderLocation: ShaderLocation.VERTEX_ID,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,

package/es/plugins/ShaderUniformPlugin.d.ts

@@ -12,10 +12,12 @@ export default class ShaderUniformPlugin implements ILayerPlugin {
     private readonly coordinateSystemService;
     private readonly rendererService;
     private readonly mapService;
+    private readonly layerService;
     apply(layer: ILayer): void;
     /**
      * 对于每个 layer 都有不同的几何中心点，因此在绘制每个 layer 的时候都需要重新设置
      * @param layer
      */
     private setLayerCenter;
+    private generateUBO;
 }

package/es/plugins/ShaderUniformPlugin.js

@@ -1,10 +1,12 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _applyDecoratedDescriptor from "@babel/runtime/helpers/esm/applyDecoratedDescriptor";
 import _initializerWarningHelper from "@babel/runtime/helpers/esm/initializerWarningHelper";
-var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
 import { CameraUniform, CoordinateUniform, TYPES } from '@antv/l7-core';
 import { inject, injectable } from 'inversify';
 import 'reflect-metadata';
@@ -16,13 +18,14 @@ import 'reflect-metadata';
  *    @see https://yuque.antfin-inc.com/yuqi.pyq/fgetpa/doml91
  * 3. 当前 Layer 本身的样式属性
  */
-var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraService), _dec3 = inject(TYPES.ICoordinateSystemService), _dec4 = inject(TYPES.IRendererService), _dec5 = inject(TYPES.IMapService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraService), _dec3 = inject(TYPES.ICoordinateSystemService), _dec4 = inject(TYPES.IRendererService), _dec5 = inject(TYPES.IMapService), _dec6 = inject(TYPES.ILayerService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function ShaderUniformPlugin() {
     _classCallCheck(this, ShaderUniformPlugin);
     _initializerDefineProperty(this, "cameraService", _descriptor, this);
     _initializerDefineProperty(this, "coordinateSystemService", _descriptor2, this);
     _initializerDefineProperty(this, "rendererService", _descriptor3, this);
     _initializerDefineProperty(this, "mapService", _descriptor4, this);
+    _initializerDefineProperty(this, "layerService", _descriptor5, this);
   }
   _createClass(ShaderUniformPlugin, [{
     key: "apply",
@@ -31,6 +34,15 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
       var version = this.mapService.version;
       var mvp = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; // default matrix (for gaode2.x)
       var sceneCenterMercator = [0, 0];
+      var uniformBuffer;
+      if (!this.rendererService.uniformBuffers[0]) {
+        // Create a Uniform Buffer Object(UBO).
+        uniformBuffer = this.rendererService.createBuffer({
+          data: new Float32Array(16 * 5 + 4 * 6 + 4),
+          isUBO: true
+        });
+        this.rendererService.uniformBuffers[0] = uniformBuffer;
+      }
       layer.hooks.beforeRender.tap('ShaderUniformPlugin', function () {
         // @ts-ignore
         var offset = layer.getLayerConfig().tileOrigin;
@@ -47,12 +59,25 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
         var _this$rendererService = _this.rendererService.getViewportSize(),
           width = _this$rendererService.width,
           height = _this$rendererService.height;
+        var _this$generateUBO = _this.generateUBO(mvp, sceneCenterMercator, width, height),
+          data = _this$generateUBO.data,
+          uniforms = _this$generateUBO.uniforms;
+        if (_this.layerService.alreadyInRendering && uniformBuffer) {
+          // Update only once since all models can share one UBO.
+          uniformBuffer.subData({
+            offset: 0,
+            data: data
+          });
+        }
+        // For WebGL1. regl
         layer.models.forEach(function (model) {
-          var _model$addUniforms;
-          model.addUniforms((_model$addUniforms = {}, _defineProperty(_model$addUniforms, CameraUniform.ProjectionMatrix, _this.cameraService.getProjectionMatrix()), _defineProperty(_model$addUniforms, CameraUniform.ViewMatrix, _this.cameraService.getViewMatrix()), _defineProperty(_model$addUniforms, CameraUniform.ViewProjectionMatrix, _this.cameraService.getViewProjectionMatrix()), _defineProperty(_model$addUniforms, CameraUniform.Zoom, _this.cameraService.getZoom()), _defineProperty(_model$addUniforms, CameraUniform.ZoomScale, _this.cameraService.getZoomScale()), _defineProperty(_model$addUniforms, CameraUniform.FocalDistance, _this.cameraService.getFocalDistance()), _defineProperty(_model$addUniforms, CameraUniform.CameraPosition, _this.cameraService.getCameraPosition()), _defineProperty(_model$addUniforms, CoordinateUniform.CoordinateSystem, _this.coordinateSystemService.getCoordinateSystem()), _defineProperty(_model$addUniforms, CoordinateUniform.ViewportCenter, _this.coordinateSystemService.getViewportCenter()), _defineProperty(_model$addUniforms, CoordinateUniform.ViewportCenterProjection, _this.coordinateSystemService.getViewportCenterProjection()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerDegree, _this.coordinateSystemService.getPixelsPerDegree()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerDegree2, _this.coordinateSystemService.getPixelsPerDegree2()), _defineProperty(_model$addUniforms, CoordinateUniform.PixelsPerMeter, _this.coordinateSystemService.getPixelsPerMeter()), _defineProperty(_model$addUniforms, CoordinateUniform.Mvp, mvp), _defineProperty(_model$addUniforms, "u_sceneCenterMercator", sceneCenterMercator), _defineProperty(_model$addUniforms, "u_ViewportSize", [width, height]), _defineProperty(_model$addUniforms, "u_ModelMatrix", _this.cameraService.getModelMatrix()), _defineProperty(_model$addUniforms, "u_DevicePixelRatio", window.devicePixelRatio), _defineProperty(_model$addUniforms, "u_PickingBuffer", layer.getLayerConfig().pickingBuffer || 0), _defineProperty(_model$addUniforms, "u_shaderPick", Number(layer.getShaderPickStat())), _model$addUniforms));
+          model.addUniforms(_objectSpread(_objectSpread({}, uniforms), {}, {
+            // TODO: move these 2 uniforms to PixelPickingPlugin
+            u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
+            // Tip: 当前地图是否在拖动
+            u_shaderPick: Number(layer.getShaderPickStat())
+          }));
         });
-
-        // TODO：脏检查，决定是否需要渲染
       });
     }
 
@@ -70,6 +95,44 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
         this.mapService.setCoordCenter(layer.coordCenter);
       }
     }
+  }, {
+    key: "generateUBO",
+    value: function generateUBO(u_Mvp, sceneCenterMercator, width, height) {
+      var _uniforms;
+      var u_ProjectionMatrix = this.cameraService.getProjectionMatrix();
+      var u_ViewMatrix = this.cameraService.getViewMatrix();
+      var u_ViewProjectionMatrix = this.cameraService.getViewProjectionMatrix();
+      var u_ModelMatrix = this.cameraService.getModelMatrix();
+      var u_ViewportCenterProjection = this.coordinateSystemService.getViewportCenterProjection();
+      var u_PixelsPerDegree = this.coordinateSystemService.getPixelsPerDegree();
+      var u_Zoom = this.cameraService.getZoom();
+      var u_PixelsPerDegree2 = this.coordinateSystemService.getPixelsPerDegree2();
+      var u_ZoomScale = this.cameraService.getZoomScale();
+      var u_PixelsPerMeter = this.coordinateSystemService.getPixelsPerMeter();
+      var u_CoordinateSystem = this.coordinateSystemService.getCoordinateSystem();
+      var u_CameraPosition = this.cameraService.getCameraPosition();
+      var u_DevicePixelRatio = window.devicePixelRatio;
+      var u_ViewportCenter = this.coordinateSystemService.getViewportCenter();
+      var u_ViewportSize = [width, height];
+      var u_FocalDistance = this.cameraService.getFocalDistance();
+      var data = [].concat(_toConsumableArray(u_ViewMatrix), _toConsumableArray(u_ProjectionMatrix), _toConsumableArray(u_ViewProjectionMatrix), _toConsumableArray(u_ModelMatrix), _toConsumableArray(u_Mvp), _toConsumableArray(u_ViewportCenterProjection), _toConsumableArray(u_PixelsPerDegree), [
+      // 4
+      u_Zoom], _toConsumableArray(u_PixelsPerDegree2), [
+      // 4
+      u_ZoomScale], _toConsumableArray(u_PixelsPerMeter), [
+      // 4
+      u_CoordinateSystem], _toConsumableArray(u_CameraPosition), [
+      // 4
+      u_DevicePixelRatio], _toConsumableArray(u_ViewportCenter), u_ViewportSize, _toConsumableArray(sceneCenterMercator), [
+      // 2
+      u_FocalDistance,
+      // 1
+      0]);
+      return {
+        data: data,
+        uniforms: (_uniforms = {}, _defineProperty(_uniforms, CameraUniform.ProjectionMatrix, u_ProjectionMatrix), _defineProperty(_uniforms, CameraUniform.ViewMatrix, u_ViewMatrix), _defineProperty(_uniforms, CameraUniform.ViewProjectionMatrix, u_ViewProjectionMatrix), _defineProperty(_uniforms, CameraUniform.Zoom, u_Zoom), _defineProperty(_uniforms, CameraUniform.ZoomScale, u_ZoomScale), _defineProperty(_uniforms, CameraUniform.FocalDistance, u_FocalDistance), _defineProperty(_uniforms, CameraUniform.CameraPosition, u_CameraPosition), _defineProperty(_uniforms, CoordinateUniform.CoordinateSystem, u_CoordinateSystem), _defineProperty(_uniforms, CoordinateUniform.ViewportCenter, u_ViewportCenter), _defineProperty(_uniforms, CoordinateUniform.ViewportCenterProjection, u_ViewportCenterProjection), _defineProperty(_uniforms, CoordinateUniform.PixelsPerDegree, u_PixelsPerDegree), _defineProperty(_uniforms, CoordinateUniform.PixelsPerDegree2, u_PixelsPerDegree2), _defineProperty(_uniforms, CoordinateUniform.PixelsPerMeter, u_PixelsPerMeter), _defineProperty(_uniforms, CoordinateUniform.Mvp, u_Mvp), _defineProperty(_uniforms, "u_sceneCenterMercator", sceneCenterMercator), _defineProperty(_uniforms, "u_ViewportSize", u_ViewportSize), _defineProperty(_uniforms, "u_ModelMatrix", u_ModelMatrix), _defineProperty(_uniforms, "u_DevicePixelRatio", u_DevicePixelRatio), _uniforms)
+      };
+    }
   }]);
   return ShaderUniformPlugin;
 }(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, "cameraService", [_dec2], {
@@ -92,5 +155,10 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
   enumerable: true,
   writable: true,
   initializer: null
+}), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, "layerService", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
 })), _class2)) || _class);
 export { ShaderUniformPlugin as default };

package/es/point/index.js

@@ -25,7 +25,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "type", 'PointLayer');
-    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity', 'offsets', 'stroke', 'rotation']);
+    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['stroke', 'offsets', 'opacity', 'rotation']);
     _defineProperty(_assertThisInitialized(_this), "enableDataEncodeStyles", ['textOffset', 'textAnchor']);
     _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
       data: [],

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);
     }