@antv/l7-layers 2.19.10 → 2.20.0

package/es/line/shaders/dash/arc_dash_vert.glsl

@@ -13,9 +13,6 @@ uniform vec4 u_dash_array: [10.0, 5., 0, 0];
 uniform float u_lineDir: 1.0;
 varying vec4 v_dash_array;
 varying float v_distance_ratio;
-
-uniform float u_thetaOffset: 0.314;
-
 #pragma include "projection"
 #pragma include "project"
 #pragma include "picking"
@@ -92,8 +89,8 @@ void main() {
 
   v_distance_ratio = segmentIndex / segmentNumber;
 
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, u_thetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, u_thetaOffset), 0.0, 1.0));
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
  
   
   vec2 offset = project_pixel(getExtrusionOffset((next.xy - curr.xy) * indexDir, a_Position.y));

package/es/line/shaders/flow/flow_line_vert.glsl

@@ -8,29 +8,59 @@ uniform mat4 u_ModelMatrix;
 
 
 #pragma include "projection"
+#pragma include "project"
 #pragma include "picking"
 varying vec4 v_color;
 uniform float u_gap_width: 1.0;
 uniform float u_stroke_width: 1.0;
 uniform float u_stroke_opacity: 1.0;
 
+vec2 project_pixel_offset(vec2 offsets) {
+
+   vec2 data = project_pixel(offsets);
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+    return data;
+  }
+
+  return vec2(data.x, -data.y);;
+}
+
+vec2 line_dir(vec2 target, vec2 source) {
+
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return normalize(target - source);
+  }
+  return normalize(ProjectFlat(target) - ProjectFlat(source));
+}
+
+float flag_gap() {
+   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
+    // P20_2 坐标系下，为了和 Web 墨卡托坐标系统一，zoom 默认减3
+     return 1.;
+  }
+  return -1.;
+
+}
+
 
 void main() {
 
 // 透明度计算
   vec2 source = a_Instance.rg;  // 起始点
   vec2 target =  a_Instance.ba; // 终点
-  vec2 flowlineDir = normalize(target - source);
-  vec2 perpendicularDir = vec2(-flowlineDir.y, flowlineDir.x);
+  vec2 flowlineDir = line_dir(target,source);
+  vec2 perpendicularDir = vec2(flowlineDir.y, flowlineDir.x); // mapbox || 高德
 
 
   vec2 position = mix(source, target, a_Position.x);
   
   float lengthCommon = length(project_position(vec4(target,0,1)) - project_position(vec4(source,0,1)));  //    
-  vec2 offsetDistances = a_Size.x * project_pixel(a_Position.yz);
+  vec2 offsetDistances = a_Size.x * project_pixel_offset(vec2(a_Position.y, a_Position.z)); // Mapbox || 高德
   vec2 limitedOffsetDistances = clamp(   
    offsetDistances,
-   project_pixel(-lengthCommon*.8), project_pixel(lengthCommon*.8)
+   project_pixel(-lengthCommon*.2), project_pixel(lengthCommon*.2)
   );
 
 
@@ -42,9 +72,9 @@ void main() {
     a_Position.x
   );
 
-  vec2 normalsCommon =  u_stroke_width * project_pixel(a_Normal.xy);
+  vec2 normalsCommon =  u_stroke_width * project_pixel_offset(vec2(a_Normal.x, a_Normal.y)); // mapbox || 高德
 
-  float gapCommon =  project_pixel(u_gap_width);
+  float gapCommon = flag_gap() * project_pixel(u_gap_width);
   vec3 offsetCommon = vec3(
     flowlineDir * (limitedOffsetDistances[1] + normalsCommon.y + endpointOffset * 1.05) -
     perpendicularDir * (limitedOffsetDistances[0] + gapCommon + normalsCommon.x),

package/es/line/shaders/linear/arc_linear_vert.glsl

@@ -11,7 +11,6 @@ varying float v_segmentIndex;
 
 uniform float u_lineDir: 1.0;
 
-uniform float u_thetaOffset: 0.314;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
 
@@ -80,8 +79,8 @@ void main() {
   float indexDir = mix(-1.0, 1.0, step(segmentIndex, 0.0));
   float nextSegmentRatio = getSegmentRatio(segmentIndex + indexDir);
   float d_distance_ratio;
-  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, u_thetaOffset), 0.0, 1.0));
-  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, u_thetaOffset), 0.0, 1.0));
+  vec4 curr = project_position(vec4(interpolate(source, target, segmentRatio, thetaOffset), 0.0, 1.0));
+  vec4 next = project_position(vec4(interpolate(source, target, nextSegmentRatio, thetaOffset), 0.0, 1.0));
   // v_normal = getNormal((next.xy - curr.xy) * indexDir, a_Position.y);
   //unProjCustomCoord
   

package/es/plugins/DataMappingPlugin.js

@@ -140,11 +140,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
     key: "mapping",
     value: function mapping(layer, attributes, data, predata) {
       var _this3 = this;
-      var _ref5 = layer.getLayerConfig(),
-        _ref5$arrow = _ref5.arrow,
-        arrow = _ref5$arrow === void 0 ? {
-          enable: false
-        } : _ref5$arrow;
       var usedAttributes = attributes.filter(function (attribute) {
         return attribute.scale !== undefined;
       }).filter(function (attribute) {
@@ -172,18 +167,6 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
             encodeRecord.shape = _this3.fontService.getIconFontKey(encodeRecord[attribute.name]);
           }
         });
-        if (arrow.enable && encodeRecord.shape === 'line') {
-          // 只有在线图层且支持配置箭头的时候进行插入顶点的处理
-          var coords = encodeRecord.coordinates;
-          // @ts-ignore
-          if (layer.arrowInsertCount < layer.encodeDataLength) {
-            // Tip: arrowInsert 的判断用于确保每一条线数据 arrow 的属性点只会被植入一次
-            var arrowPoint = _this3.getArrowPoints(coords[0], coords[1]);
-            encodeRecord.coordinates.splice(1, 0, arrowPoint, arrowPoint);
-            // @ts-ignore
-            layer.arrowInsertCount++;
-          }
-        }
         return encodeRecord;
       });
       attributes.forEach(function (attribute) {
@@ -271,11 +254,11 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       if (!attribute.scale) {
         return [];
       }
-      var scalers = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
+      var scalers = (attribute === null || attribute === void 0 || (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       var params = [];
-      scalers.forEach(function (_ref6) {
+      scalers.forEach(function (_ref5) {
         var _attribute$scale2;
-        var field = _ref6.field;
+        var field = _ref5.field;
         if (record.hasOwnProperty(field) || ((_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.type) === 'variable') {
           // TODO:多字段，常量
           params.push(record[field]);

package/es/plugins/PixelPickingPlugin.d.ts

@@ -1,7 +1,10 @@
 import { ILayer, ILayerPlugin, IRendererService, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 export default class PixelPickingPlugin implements ILayerPlugin {
-    apply(layer: ILayer, { styleAttributeService, }: {
+    private PickOption;
+    private pickOption2Array;
+    private updatePickOption;
+    apply(layer: ILayer, { rendererService, styleAttributeService, }: {
         rendererService: IRendererService;
         styleAttributeService: IStyleAttributeService;
     }): void;

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: [],