@antv/l7-layers 2.20.5 → 2.20.6

package/es/line/shaders/wall/wall_frag.glsl

@@ -2,23 +2,28 @@
 #define LineTexture 1.0
 
 // line texture
-uniform float u_line_texture;
-uniform sampler2D u_texture;
-uniform vec2 u_textSize;
-uniform float u_linearColor: 0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_textureBlend;
-uniform float u_iconStepCount;
-uniform float u_time;
-uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ]; // 控制运动
 
-varying vec2 v_iconMapUV;
-varying float v_blur;
-varying float v_radio;
-varying vec4 v_color;
-varying vec4 v_dataset;
+uniform sampler2D u_texture;
+layout(std140) uniform commonUniorm {
+  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  vec2 u_textSize;
+  float u_icon_step: 100;
+  float u_heightfixed;
+  float u_linearColor: 0;
+  float u_line_texture;
+  float u_textureBlend;
+  float u_iconStepCount;
+  float u_time;
+};
+in vec2 v_iconMapUV;
+in float v_blur;
+in float v_radio;
+in vec4 v_color;
+in vec4 v_dataset;
 
+out vec4 outputColor;
 #pragma include "picking"
 
 void main() {
@@ -27,18 +32,18 @@ void main() {
   float v = v_dataset.a;
 
   if(u_linearColor == 1.0) { // 使用渐变颜色
-    gl_FragColor = mix(u_sourceColor, u_targetColor, v);
+    outputColor = mix(u_sourceColor, u_targetColor, v);
   } else { // 使用 color 方法传入的颜色
-     gl_FragColor = v_color;
+     outputColor = v_color;
   }
 
-  gl_FragColor.a *= v_color.a; // 全局透明度
+  outputColor.a *= v_color.a; // 全局透明度
   if(u_animate.x == Animate) {
       animateSpeed = u_time / u_animate.y;
        float alpha =1.0 - fract( mod(1.0- d_distance_ratio, u_animate.z)* (1.0/ u_animate.z) + animateSpeed);
       alpha = (alpha + u_animate.w -1.0) / u_animate.w;
       alpha = smoothstep(0., 1., alpha);
-      gl_FragColor.a *= alpha;
+      outputColor.a *= alpha;
   }
 
   if(u_line_texture == LineTexture) { // while load texture
@@ -56,7 +61,7 @@ void main() {
     // 计算纹理间隔 end
 
     vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
-    vec4 pattern = texture2D(u_texture, uv);
+    vec4 pattern = texture(SAMPLER_2D(u_texture), uv);
 
     // Tip: 判断纹理间隔
     if(flag > 0.0) {
@@ -65,23 +70,23 @@ void main() {
 
     if(u_textureBlend == 0.0) { // normal
       pattern.a = 0.0;
-      gl_FragColor = filterColor(gl_FragColor + pattern);
+      outputColor = filterColor(outputColor + pattern);
     } else { // replace
         pattern.a *= v_color.a;
-        if(gl_FragColor.a <= 0.0) {
+        if(outputColor.a <= 0.0) {
           pattern.a = 0.0;
         }
-        gl_FragColor = filterColor(pattern);
+        outputColor = filterColor(pattern);
     }
   }
   
 
   // blur - AA
   if(v < v_blur) {
-    gl_FragColor.a = mix(0.0, gl_FragColor.a, v/v_blur);
+    outputColor.a = mix(0.0, outputColor.a, v/v_blur);
   } else if(v > 1.0 - v_blur) {
-    gl_FragColor.a = mix(gl_FragColor.a, 0.0, (v - (1.0 - v_blur))/v_blur);
+    outputColor.a = mix(outputColor.a, 0.0, (v - (1.0 - v_blur))/v_blur);
   }
 
-  gl_FragColor = filterColor(gl_FragColor);
+  outputColor = filterColor(outputColor);
 }

package/es/line/shaders/wall/wall_vert.glsl

@@ -1,31 +1,38 @@
 #define Animate 0.0
-
-attribute float a_Miter;
-attribute vec4 a_Color;
-attribute vec2 a_Size;
-attribute vec3 a_Normal;
-attribute vec3 a_Position;
-attribute vec2 a_iconMapUV;
-attribute float a_Total_Distance;
-attribute float a_Distance;
-
-uniform mat4 u_ModelMatrix;
-
-uniform vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
-uniform float u_icon_step: 100;
-uniform float u_heightfixed;
-uniform float u_linearColor: 0;
-
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in vec2 a_Size;
+layout(location = 10) in float a_Miter;
+layout(location = 11) in float a_Total_Distance;
+layout(location = 12) in vec4 a_Instance;
+layout(location = 13) in vec3 a_Normal;
+layout(location = 14) in vec2 a_iconMapUV;
+layout(location = 15) in float a_Distance;
+
+
+layout(std140) uniform commonUniorm {
+  vec4 u_animate: [ 1., 2., 1.0, 0.2 ];
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  vec2 u_textSize;
+  float u_icon_step: 100;
+  float u_heightfixed;
+  float u_linearColor: 0;
+  float u_line_texture;
+  float u_textureBlend;
+  float u_iconStepCount;
+  float u_time;
+};
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
 
 // texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
-varying vec2 v_iconMapUV;
-varying vec4 v_color;
-varying float v_blur;
-varying float v_radio;
-varying vec4 v_dataset;
+out vec2 v_iconMapUV;
+out vec4 v_color;
+out float v_blur;
+out float v_radio;
+out vec4 v_dataset;
 
 void main() {
 

package/es/mask/index.d.ts

@@ -1,6 +1,6 @@
 import BaseLayer from '../core/BaseLayer';
-import { IMaskLayerStyleOptions } from '../core/interface';
-import { MaskModelType } from './models';
+import type { IMaskLayerStyleOptions } from '../core/interface';
+import type { MaskModelType } from './models';
 export default class MaskLayer extends BaseLayer<IMaskLayerStyleOptions> {
     type: string;
     defaultSourceConfig: {

package/es/mask/models/fill.d.ts

@@ -1,4 +1,4 @@
-import { IModel } from '@antv/l7-core';
+import type { IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class MaskModel extends BaseModel {
     getUninforms(): {

package/es/plugins/DataMappingPlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 export default class DataMappingPlugin implements ILayerPlugin {
     private readonly mapService;

package/es/plugins/DataMappingPlugin.js

@@ -129,9 +129,7 @@ var DataMappingPlugin = (_dec = injectable(), _dec2 = inject(TYPES.IMapService),
       filterData = layer.processData(filterData); // 目前只有简单线需要处理
       var encodeData = this.mapping(layer, attributes, filterData, undefined);
       layer.setEncodedData(encodeData);
-      if (dataArray.length === 0 && layer.encodeDataLength === 0) {
-        return false;
-      }
+
       // 对外暴露事件
       layer.emit('dataUpdate', null);
       return true;

package/es/plugins/DataSourcePlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin, IMapService } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin, IMapService } from '@antv/l7-core';
 import 'reflect-metadata';
 export default class DataSourcePlugin implements ILayerPlugin {
     protected mapService: IMapService;

package/es/plugins/FeatureScalePlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * 根据 Source 原始数据为指定字段创建 Scale，保存在 StyleAttribute 上，供下游插件使用

package/es/plugins/FeatureScalePlugin.js

@@ -277,9 +277,20 @@ var FeatureScalePlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       var cfg = {
         type: type
       };
-      var values = (data === null || data === void 0 ? void 0 : data.map(function (item) {
-        return item[field];
-      })) || [];
+      // quantile domain 需要根据ID 进行去重
+      var values = [];
+      if (type === ScaleTypes.QUANTILE) {
+        // 根据 obejct 属性 _id 进行去重 
+        var idMap = new Map();
+        data === null || data === void 0 || data.forEach(function (obj) {
+          idMap.set(obj._id, obj[field]);
+        });
+        values = Array.from(idMap.values());
+      } else {
+        values = (data === null || data === void 0 ? void 0 : data.map(function (item) {
+          return item[field];
+        })) || [];
+      }
       if (scaleOption !== null && scaleOption !== void 0 && scaleOption.domain) {
         cfg.domain = scaleOption === null || scaleOption === void 0 ? void 0 : scaleOption.domain;
       } else if (type === ScaleTypes.CAT || type === ScaleTypes.IDENTITY) {

package/es/plugins/LayerAnimateStylePlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin } from '@antv/l7-core';
 import 'reflect-metadata';
 export default class LayerAnimateStylePlugin implements ILayerPlugin {
     apply(layer: ILayer): void;

package/es/plugins/LayerMaskPlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置

package/es/plugins/LayerModelPlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * Layer Model 初始化，更新，销毁

package/es/plugins/LayerStylePlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * 更新图层样式，初始图层相关配置

package/es/plugins/LightingPlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin } from '@antv/l7-core';
 import 'reflect-metadata';
 interface IDirectionalLight {
     type: 'directional';

package/es/plugins/MultiPassRendererPlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin, IPass, IPostProcessingPass, IRendererService } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin, IPass, IPostProcessingPass, IRendererService } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * 自定义渲染管线：

package/es/plugins/PixelPickingPlugin.d.ts

@@ -1,7 +1,11 @@
-import { ILayer, ILayerPlugin, IRendererService, IStyleAttributeService } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin, IRendererService, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 export default class PixelPickingPlugin implements ILayerPlugin {
-    private PickOption;
+    /**
+     * Use map to keep order of insertion.
+     * @see https://stackoverflow.com/questions/5525795/does-javascript-guarantee-object-property-order
+     */
+    private pickingUniformMap;
     private pickOption2Array;
     private updatePickOption;
     apply(layer: ILayer, { rendererService, styleAttributeService, }: {

package/es/plugins/PixelPickingPlugin.js

@@ -1,12 +1,13 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 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 { decodePickingColor, encodePickingColor, lodashUtil, rgb2arr } from '@antv/l7-utils';
 import { injectable } from 'inversify';
 import 'reflect-metadata';
 import { ShaderLocation } from "../core/CommonStyleAttribute";
+var isNumber = lodashUtil.isNumber;
 var PickingStage = {
   NONE: 0.0,
   ENCODE: 1.0,
@@ -15,35 +16,42 @@ 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();
+    value:
+    /**
+     * Use map to keep order of insertion.
+     * @see https://stackoverflow.com/questions/5525795/does-javascript-guarantee-object-property-order
+     */
+
+    function pickOption2Array() {
+      var array = [];
+      this.pickingUniformMap.forEach(function (value, key) {
+        if (isNumber(value)) {
+          array.push(value);
+        } else {
+          array.push.apply(array, _toConsumableArray(value));
+        }
+      });
+      return array;
     }
   }, {
     key: "updatePickOption",
-    value: function updatePickOption(option, rendererService) {
+    value: function updatePickOption(options, layer) {
       var _this = this;
-      Object.keys(option).forEach(function (key) {
-        _this.PickOption[key] = option[key];
+      Object.keys(options).forEach(function (key) {
+        _this.pickingUniformMap.set(key, options[key]);
       });
-      rendererService.uniformBuffers[1].subData({
+      var u_PickingBuffer = layer.getLayerConfig().pickingBuffer || 0;
+      // Tip: 当前地图是否在拖动
+      var u_shaderPick = Number(layer.getShaderPickStat());
+      this.pickingUniformMap.set('u_PickingBuffer', u_PickingBuffer);
+      this.pickingUniformMap.set('u_shaderPick', u_shaderPick);
+      var uniformBuffer = layer.getPickingUniformBuffer();
+      uniformBuffer.subData({
         offset: 0,
-        data: new Uint8Array(new Float32Array(this.pickOption2Array()))
+        data: this.pickOption2Array()
       });
     }
   }, {
@@ -52,28 +60,8 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
       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()),
+      var uniformBuffer;
+      this.pickingUniformMap = new Map([['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], ['u_shaderPick', 0], ['u_EnableSelect', 0], ['u_activeMix', 0]]);
 
       // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor
       layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
@@ -106,7 +94,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
         if (enablePicking && layer.isVisible()) {
           _this2.updatePickOption({
             u_PickingStage: PickingStage.ENCODE
-          }, rendererService);
+          }, layer);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.ENCODE
@@ -121,7 +109,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
         if (enablePicking && layer.isVisible()) {
           _this2.updatePickOption({
             u_PickingStage: PickingStage.HIGHLIGHT
-          }, rendererService);
+          }, layer);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.HIGHLIGHT
@@ -146,7 +134,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           }),
           u_activeMix: activeMix
         };
-        _this2.updatePickOption(option, rendererService);
+        _this2.updatePickOption(option, layer);
         layer.models.forEach(function (model) {
           return model.addUniforms(option);
         });
@@ -173,8 +161,7 @@ var PixelPickingPlugin = (_dec = injectable(), _dec(_class = /*#__PURE__*/functi
           }),
           u_EnableSelect: 1
         };
-        console.log(option);
-        _this2.updatePickOption(option, rendererService);
+        _this2.updatePickOption(option, layer);
         layer.models.forEach(function (model) {
           return model.addUniforms(option);
         });

package/es/plugins/RegisterStyleAttributePlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建

package/es/plugins/ShaderUniformPlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * 在渲染之前需要获取当前 Shader 所需 Uniform，例如：

package/es/plugins/ShaderUniformPlugin.js

@@ -1,5 +1,5 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
@@ -38,7 +38,7 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
       if (!this.rendererService.uniformBuffers[0]) {
         // Create a Uniform Buffer Object(UBO).
         uniformBuffer = this.rendererService.createBuffer({
-          data: new Float32Array(16 * 5 + 4 * 6 + 4),
+          data: new Float32Array(16 * 4 + 4 * 7),
           isUBO: true
         });
         this.rendererService.uniformBuffers[0] = uniformBuffer;
@@ -55,6 +55,11 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
           // mvp = amapCustomCoords.getMVPMatrix()
           // @ts-ignore
           sceneCenterMercator = _this.mapService.getCustomCoordCenter();
+          var _uniformBuffer = layer.getLayerUniformBuffer();
+          _uniformBuffer.subData({
+            offset: 0,
+            data: new Uint8Array(new Float32Array([].concat(_toConsumableArray(mvp), _toConsumableArray(sceneCenterMercator))).buffer)
+          });
         }
         var _this$rendererService = _this.rendererService.getViewportSize(),
           width = _this$rendererService.width,
@@ -115,7 +120,7 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
       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), [
+      var data = [].concat(_toConsumableArray(u_ViewMatrix), _toConsumableArray(u_ProjectionMatrix), _toConsumableArray(u_ViewProjectionMatrix), _toConsumableArray(u_ModelMatrix), _toConsumableArray(u_ViewportCenterProjection), _toConsumableArray(u_PixelsPerDegree), [
       // 4
       u_Zoom], _toConsumableArray(u_PixelsPerDegree2), [
       // 4
@@ -123,11 +128,11 @@ var ShaderUniformPlugin = (_dec = injectable(), _dec2 = inject(TYPES.ICameraServ
       // 4
       u_CoordinateSystem], _toConsumableArray(u_CameraPosition), [
       // 4
-      u_DevicePixelRatio], _toConsumableArray(u_ViewportCenter), u_ViewportSize, _toConsumableArray(sceneCenterMercator), [
-      // 2
+      u_DevicePixelRatio], _toConsumableArray(u_ViewportCenter), u_ViewportSize, [
+      // 4
       u_FocalDistance,
       // 1
-      0]);
+      0, 0, 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)

package/es/plugins/UpdateModelPlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * Model 更新

package/es/plugins/UpdateStyleAttributePlugin.d.ts

@@ -1,4 +1,4 @@
-import { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
+import type { ILayer, ILayerPlugin, IStyleAttributeService } from '@antv/l7-core';
 import 'reflect-metadata';
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建

package/es/point/index.d.ts

@@ -1,6 +1,6 @@
 import BaseLayer from '../core/BaseLayer';
-import { IPointLayerStyleOptions } from '../core/interface';
-import { PointType } from './models/index';
+import type { IPointLayerStyleOptions } from '../core/interface';
+import type { PointType } from './models/index';
 export default class PointLayer extends BaseLayer<IPointLayerStyleOptions> {
     type: string;
     enableShaderEncodeStyles: string[];

package/es/point/index.js

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

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

@@ -1,6 +1,6 @@
-import { IEncodeFeature, IModel, IModelUniform } from '@antv/l7-core';
+import type { IEncodeFeature, IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
-import { IPointLayerStyleOptions } from '../../core/interface';
+import type { IPointLayerStyleOptions } from '../../core/interface';
 export declare function PointTriangulation(feature: IEncodeFeature): {
     vertices: number[];
     indices: number[];
@@ -8,7 +8,13 @@ export declare function PointTriangulation(feature: IEncodeFeature): {
 };
 export default class SimplePointModel extends BaseModel {
     getDefaultStyle(): Partial<IPointLayerStyleOptions>;
-    getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;
     protected registerBuiltinAttributes(): void;