@antv/l7-layers 2.20.3 → 2.20.5

package/es/core/BaseLayer.js

@@ -126,7 +126,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       }
       var autoRender = _this.layerSource.getSourceCfg().autoRender;
       if (autoRender) {
-        _this.reRender();
+        setTimeout(function () {
+          _this.reRender();
+        }, 10);
       }
     });
     _this.name = config.name || _this.id;

package/es/core/BaseModel.d.ts

@@ -32,6 +32,8 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     protected cameraService: ICameraService;
     protected layerService: ILayerService;
     protected pickingService: IPickingService;
+    protected attributeUnifoms: IBuffer;
+    protected commonUnifoms: IBuffer;
     constructor(layer: ILayer);
     getBlend(): IBlendOptions;
     getStencil(option: Partial<IRenderOptions>): Partial<IStencilOptions>;
@@ -58,4 +60,22 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
     };
     protected registerStyleAttribute(): void;
     updateEncodeAttribute(type: string, flag: boolean): void;
+    initUniformsBuffer(): void;
+    protected getUniformsBufferInfo(uniformsOption: {
+        [key: string]: any;
+    }): {
+        uniformsOption: {
+            [key: string]: any;
+        };
+        uniformsLength: number;
+        uniformsArray: number[];
+    };
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    updateStyleUnifoms(): void;
 }

package/es/core/BaseModel.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _initializerDefineProperty from "@babel/runtime/helpers/esm/initializerDefineProperty";
@@ -13,6 +14,7 @@ import { rgb2arr } from '@antv/l7-utils';
 import { BlendTypes } from "../utils/blend";
 import { getStencil as _getStencil, getStencilMask } from "../utils/stencil";
 import { DefaultUniformStyleType, DefaultUniformStyleValue } from "./constant";
+import { MultipleOfFourNumber } from "./utils";
 import { getCommonStyleAttributeOptions, ShaderLocation } from "./CommonStyleAttribute";
 var shaderLocationMap = {
   opacity: ShaderLocation.OPACITY,
@@ -32,6 +34,9 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
 
   // @lazyInject(TYPES.IShaderModuleService)
 
+  // 支持数据映射的buffer
+  // 不支持数据映射的buffer
+
   // style texture data mapping
 
   function BaseModel(layer) {
@@ -212,6 +217,8 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
         this.layer.setAnimateStartTime();
       }
     }
+
+    // 动态注入参与数据映射的uniform
   }, {
     key: "getInject",
     value: function getInject() {
@@ -286,6 +293,70 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function updateEncodeAttribute(type, flag) {
       this.encodeStyleAttribute[type] = flag;
     }
+  }, {
+    key: "initUniformsBuffer",
+    value: function initUniformsBuffer() {
+      var attrUniforms = this.getUniformsBufferInfo(this.getStyleAttribute());
+      var commonUniforms = this.getCommonUniformsInfo();
+      this.attributeUnifoms = this.rendererService.createBuffer({
+        data: new Float32Array(MultipleOfFourNumber(attrUniforms.uniformsLength)),
+        // 长度需要大于等于 4
+        isUBO: true
+      });
+      this.commonUnifoms = this.rendererService.createBuffer({
+        data: new Float32Array(MultipleOfFourNumber(commonUniforms.uniformsLength)),
+        isUBO: true
+      });
+      this.uniformBuffers = [this.attributeUnifoms, this.commonUnifoms];
+    }
+    // 获取数据映射 uniform 信息
+  }, {
+    key: "getUniformsBufferInfo",
+    value: function getUniformsBufferInfo(uniformsOption) {
+      var uniformsLength = 0;
+      var uniformsArray = [];
+      Object.values(uniformsOption).forEach(function (value) {
+        if (Array.isArray(value)) {
+          uniformsArray.push.apply(uniformsArray, _toConsumableArray(value));
+          uniformsLength += value.length;
+        } else {
+          uniformsArray.push(value);
+          uniformsLength += 1;
+        }
+      });
+      return {
+        uniformsOption: uniformsOption,
+        uniformsLength: uniformsLength,
+        uniformsArray: uniformsArray
+      };
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
+      return {
+        uniformsLength: 0,
+        uniformsArray: [],
+        uniformsOption: {}
+      };
+    }
+
+    // 更新支持数据映射的uniform
+  }, {
+    key: "updateStyleUnifoms",
+    value: function updateStyleUnifoms() {
+      var _this$getUniformsBuff = this.getUniformsBufferInfo(this.getStyleAttribute()),
+        uniformsArray = _this$getUniformsBuff.uniformsArray;
+      var _this$getCommonUnifor = this.getCommonUniformsInfo(),
+        commonUniformsArray = _this$getCommonUnifor.uniformsArray;
+      this.attributeUnifoms.subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(uniformsArray).buffer)
+      });
+      this.commonUnifoms.subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(commonUniformsArray).buffer)
+      });
+    }
   }]);
   return BaseModel;
 }(), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "configService", [_dec], {

package/es/core/CommonStyleAttribute.d.ts

@@ -12,6 +12,7 @@ export declare enum ShaderLocation {
     SIZE = 9,
     SHAPE = 10,
     EXTRUDE = 11,
-    MAX = 12
+    MAX = 12,
+    NORMAL = 13
 }
 export declare function getCommonStyleAttributeOptions(name: string): Partial<IStyleAttribute> | undefined;

package/es/core/CommonStyleAttribute.js

@@ -13,6 +13,7 @@ export var ShaderLocation = /*#__PURE__*/function (ShaderLocation) {
   ShaderLocation[ShaderLocation["SHAPE"] = 10] = "SHAPE";
   ShaderLocation[ShaderLocation["EXTRUDE"] = 11] = "EXTRUDE";
   ShaderLocation[ShaderLocation["MAX"] = 12] = "MAX";
+  ShaderLocation[ShaderLocation["NORMAL"] = 13] = "NORMAL";
   return ShaderLocation;
 }({});
 export function getCommonStyleAttributeOptions(name) {

package/es/core/utils.d.ts

@@ -0,0 +1,4 @@
+export declare function formatUniformsOption2Std140(uniformsOption: {
+    [key: string]: any;
+}): string;
+export declare function MultipleOfFourNumber(num: number): number;

package/es/core/utils.js

@@ -0,0 +1,15 @@
+export function formatUniformsOption2Std140(uniformsOption) {
+  var std140_str = '';
+  Object.keys(uniformsOption).forEach(function (key) {
+    var value = uniformsOption[key];
+    if (Array.isArray(value)) {
+      std140_str += "vec".concat(value.length, " ").concat(key, ";\n");
+    } else {
+      std140_str += "flot ".concat(key, ";\n");
+    }
+  });
+  return std140_str;
+}
+export function MultipleOfFourNumber(num) {
+  return Math.ceil(num / 4) * 4;
+}

package/es/line/models/great_circle.js

@@ -146,25 +146,29 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var model;
+        var _ref3, _ref3$segmentNumber, segmentNumber, model;
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              _ref3 = this.layer.getLayerConfig(), _ref3$segmentNumber = _ref3.segmentNumber, segmentNumber = _ref3$segmentNumber === void 0 ? 30 : _ref3$segmentNumber;
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'lineGreatCircle',
                 vertexShader: line_arc2d_vert,
                 fragmentShader: line_arc_frag,
                 triangulation: LineArcTriangulation,
+                styleOption: {
+                  segmentNumber: segmentNumber
+                },
                 inject: this.getInject(),
                 depth: {
                   enable: false
                 }
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -231,12 +235,12 @@ var GreatCircleModel = /*#__PURE__*/function (_BaseModel) {
             var iconMap = _this2.iconService.getIconMap();
             var texture = feature.texture;
             // console.log('icon feature', feature)
-            var _ref3 = iconMap[texture] || {
+            var _ref4 = iconMap[texture] || {
                 x: 0,
                 y: 0
               },
-              x = _ref3.x,
-              y = _ref3.y;
+              x = _ref4.x,
+              y = _ref4.y;
             return [x, y];
           }
         }

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

@@ -4,16 +4,14 @@ export default class ExtrudeModel extends BaseModel {
     private raiseCount;
     private raiseRepeat;
     getUninforms(): {
-        u_pickLight: number;
-        u_heightfixed: number;
-        u_r: number;
-        u_opacity: number;
-        u_linearColor: number;
-        u_sourceColor: number[];
-        u_targetColor: number[];
-        u_opacitylinear: number;
-        u_opacitylinear_dir: number;
-        u_lightEnable: number;
+        [x: string]: any;
+    };
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
     };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;

package/es/point/models/extrude.js

@@ -1,4 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -14,9 +15,10 @@ import { calculateCentroid, getCullFace, rgb2arr } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { PointExtrudeTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/extrude/extrude_frag.glsl' */
-var pointExtrudeFrag = "varying vec4 v_color;\nvarying float v_lightWeight;\nuniform float u_pickLight: 0.0;\n\n#pragma include \"picking\"\n\n\nvoid main() {\n\n  gl_FragColor = v_color;\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  // picking\n  if(u_pickLight > 0.0) {\n    gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);\n  } else {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
+var pointExtrudeFrag = "in vec4 v_color;\nin float v_lightWeight;\nout vec4 outputColor;\n\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\n\n#pragma include \"picking\"\n\nvoid main() {\n\n  outputColor = v_color;\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  // picking\n  if(u_pickLight > 0.0) {\n    outputColor = filterColorAlpha(outputColor, v_lightWeight);\n  } else {\n    outputColor = filterColor(outputColor);\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/extrude/extrude_vert.glsl' */
-var pointExtrudeVert = "precision highp float;\n\n#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec3 a_Position;\nattribute vec3 a_Pos;\nattribute vec4 a_Color;\nattribute vec3 a_Size;\nattribute vec3 a_Normal;\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_r;\nuniform mat4 u_ModelMatrix;\n\nvarying vec4 v_color;\nvarying float v_lightWeight;\nvarying float v_barLinearZ;\n\nuniform float u_opacity : 1;\nuniform float u_lightEnable: 1;\nuniform float u_opacitylinear: 0.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_opacitylinear_dir: 1.0;\nuniform float  u_linearColor: 0.0;\n\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if(x > 0.0 && z > 0.0) {\n    return atan(x/z);\n  } else if(x > 0.0 && z <= 0.0){\n    return atan(-z/x) + pi/2.0;\n  } else if(x <= 0.0 && z <= 0.0) {\n    return  pi + atan(x/z); //atan(x/z) + \n  } else {\n    return atan(z/-x) + pi*3.0/2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y/r);\n}\n\nvoid main() {\n\n\n  vec3 size = a_Size * a_Position;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n\n  if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n    \n    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n      offset = offset * pow(2.0, (19.0 - u_Zoom));\n    }\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n      // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n    }\n  } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n\n  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n\n  if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n\n  v_lightWeight = lightWeight;\n\n  v_color = a_Color;\n\n    // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    v_color = mix(u_sourceColor, u_targetColor, a_Position.z);\n    v_color.a =  v_color.a * u_opacity;\n  } else {\n    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * u_opacity);\n  }\n\n    if(u_opacitylinear > 0.0) {\n    v_color.a *= u_opacitylinear_dir > 0.0 ? (1.0 - a_Position.z): a_Position.z;\n  }\n\n\n  gl_Position = project_common_position_to_clipspace_v2(pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
+var pointExtrudeVert = "#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in vec3 a_Size;\nlayout(location = 11) in vec3 a_Extrude;\nlayout(location = 13) in vec3 a_Normal;\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\nout vec4 v_color;\nout float v_lightWeight;\nout float v_barLinearZ;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if(x > 0.0 && z > 0.0) {\n    return atan(x/z);\n  } else if(x > 0.0 && z <= 0.0){\n    return atan(-z/x) + pi/2.0;\n  } else if(x <= 0.0 && z <= 0.0) {\n    return  pi + atan(x/z); //atan(x/z) + \n  } else {\n    return atan(z/-x) + pi*3.0/2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y/r);\n}\n\nvoid main() {\n\n\n  vec3 size = a_Size * a_Position;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n\n  if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n    \n    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n      offset = offset * pow(2.0, (19.0 - u_Zoom));\n    }\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n      // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n    }\n  } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n\n  vec4 project_pos = project_position(vec4(a_Extrude.xy, 0., 1.0));\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n\n  if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n\n  v_lightWeight = lightWeight;\n\n  v_color = a_Color;\n\n    // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    v_color = mix(u_sourceColor, u_targetColor, a_Position.z);\n    v_color.a =  v_color.a * opacity;\n  } else {\n    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);\n  }\n\n    if(u_opacitylinear > 0.0) {\n    v_color.a *= u_opacitylinear_dir > 0.0 ? (1.0 - a_Position.z): a_Position.z;\n  }\n\n\n  gl_Position = project_common_position_to_clipspace_v2(pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
 var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(ExtrudeModel, _BaseModel);
   var _super = _createSuper(ExtrudeModel);
@@ -34,6 +36,14 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(ExtrudeModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return _objectSpread(_objectSpread({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         _ref$animateOption = _ref.animateOption,
         animateOption = _ref$animateOption === void 0 ? {
@@ -41,8 +51,6 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           speed: 0.01,
           repeat: false
         } : _ref$animateOption,
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
         sourceColor = _ref.sourceColor,
         targetColor = _ref.targetColor,
         _ref$pickLight = _ref.pickLight,
@@ -81,13 +89,12 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
           }
         }
       }
-      return {
+      var commonOptions = {
         // 圆柱体的拾取高亮是否要计算光照
         u_pickLight: Number(pickLight),
         // 圆柱体是否固定高度
         u_heightfixed: Number(heightfixed),
         u_r: animateOption.enable && this.raiseRepeat > 0 ? this.raiseCount : 1.0,
-        u_opacity: opacity,
         // 渐变色支持参数
         u_linearColor: useLinearColor,
         u_sourceColor: sourceColorArr,
@@ -98,6 +105,8 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         // 光照计算开关
         u_lightEnable: Number(lightEnable)
       };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -129,12 +138,14 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
               // GAODE1.x GAODE2.x MAPBOX
               _ref2 = this.layer.getLayerConfig(), _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? true : _ref2$depth, _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
               this.raiseRepeat = repeat;
-              _context2.next = 4;
+              this.initUniformsBuffer();
+              _context2.next = 5;
               return this.layer.buildLayerModel({
                 moduleName: 'pointExtrude',
                 vertexShader: pointExtrudeVert,
                 fragmentShader: pointExtrudeFrag,
                 triangulation: PointExtrudeTriangulation,
+                inject: this.getInject(),
                 cull: {
                   enable: true,
                   face: getCullFace(this.mapService.version)
@@ -143,10 +154,10 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
                   enable: depth
                 }
               });
-            case 4:
+            case 5:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -166,6 +177,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: ShaderLocation.SIZE,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],
@@ -196,6 +208,7 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: ShaderLocation.NORMAL,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.STATIC_DRAW,
@@ -209,10 +222,11 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
         }
       });
       this.styleAttributeService.registerStyleAttribute({
-        name: 'pos',
+        name: 'extrude',
         type: AttributeType.Attribute,
         descriptor: {
-          name: 'a_Pos',
+          name: 'a_Extrude',
+          shaderLocation: ShaderLocation.EXTRUDE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: gl.DYNAMIC_DRAW,

package/es/point/models/image.js

@@ -60,10 +60,6 @@ var ImageModel = /*#__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,
-        _ref$offsets = _ref.offsets,
-        offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
         _ref$raisingHeight = _ref.raisingHeight,
         raisingHeight = _ref$raisingHeight === void 0 ? 0 : _ref$raisingHeight,
         _ref$heightfixed = _ref.heightfixed,

package/es/point/shaders/extrude/extrude_frag.glsl

@@ -1,18 +1,30 @@
-varying vec4 v_color;
-varying float v_lightWeight;
-uniform float u_pickLight: 0.0;
+in vec4 v_color;
+in float v_lightWeight;
+out vec4 outputColor;
 
-#pragma include "picking"
 
+layout(std140) uniform commonUniforms {
+  float u_pickLight;
+  float u_heightfixed;
+  float u_r;
+  float u_linearColor;
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_opacitylinear;
+  float u_opacitylinear_dir;
+  float u_lightEnable;
+};
+
+#pragma include "picking"
 
 void main() {
 
-  gl_FragColor = v_color;
+  outputColor = v_color;
   // 开启透明度渐变
   // picking
   if(u_pickLight > 0.0) {
-    gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);
+    outputColor = filterColorAlpha(outputColor, v_lightWeight);
   } else {
-    gl_FragColor = filterColor(gl_FragColor);
+    outputColor = filterColor(outputColor);
   }
 }

package/es/point/shaders/extrude/extrude_vert.glsl

@@ -1,32 +1,28 @@
-precision highp float;
-
 #define pi 3.1415926535
 #define ambientRatio 0.5
 #define diffuseRatio 0.3
 #define specularRatio 0.2
 
-attribute vec3 a_Position;
-attribute vec3 a_Pos;
-attribute vec4 a_Color;
-attribute vec3 a_Size;
-attribute vec3 a_Normal;
-
-uniform float u_heightfixed: 0.0; // 默认不固定
-uniform float u_r;
-uniform mat4 u_ModelMatrix;
-
-varying vec4 v_color;
-varying float v_lightWeight;
-varying float v_barLinearZ;
-
-uniform float u_opacity : 1;
-uniform float u_lightEnable: 1;
-uniform float u_opacitylinear: 0.0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_opacitylinear_dir: 1.0;
-uniform float  u_linearColor: 0.0;
-
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in vec3 a_Size;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 13) in vec3 a_Normal;
+
+layout(std140) uniform commonUniforms {
+  float u_pickLight;
+  float u_heightfixed;
+  float u_r;
+  float u_linearColor;
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_opacitylinear;
+  float u_opacitylinear_dir;
+  float u_lightEnable;
+};
+out vec4 v_color;
+out float v_lightWeight;
+out float v_barLinearZ;
 
 #pragma include "projection"
 #pragma include "light"
@@ -72,7 +68,7 @@ void main() {
   }
 
 
-  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));
+  vec4 project_pos = project_position(vec4(a_Extrude.xy, 0., 1.0));
 
   // u_r 控制圆柱的生长
   vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);
@@ -91,9 +87,9 @@ void main() {
     // 设置圆柱的底色
   if(u_linearColor == 1.0) { // 使用渐变颜色
     v_color = mix(u_sourceColor, u_targetColor, a_Position.z);
-    v_color.a =  v_color.a * u_opacity;
+    v_color.a =  v_color.a * opacity;
   } else {
-    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * u_opacity);
+    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
   }
 
     if(u_opacitylinear > 0.0) {

package/lib/core/BaseLayer.js

@@ -132,7 +132,9 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
       }
       var autoRender = _this.layerSource.getSourceCfg().autoRender;
       if (autoRender) {
-        _this.reRender();
+        setTimeout(function () {
+          _this.reRender();
+        }, 10);
       }
     });
     _this.name = config.name || _this.id;

package/lib/core/BaseModel.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
@@ -19,6 +20,7 @@ var _l7Utils = require("@antv/l7-utils");
 var _blend = require("../utils/blend");
 var _stencil = require("../utils/stencil");
 var _constant = require("./constant");
+var _utils = require("./utils");
 var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _dec, _class, _descriptor;
 var shaderLocationMap = {
@@ -39,6 +41,9 @@ var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
 
   // @lazyInject(TYPES.IShaderModuleService)
 
+  // 支持数据映射的buffer
+  // 不支持数据映射的buffer
+
   // style texture data mapping
 
   function BaseModel(layer) {
@@ -219,6 +224,8 @@ var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
         this.layer.setAnimateStartTime();
       }
     }
+
+    // 动态注入参与数据映射的uniform
   }, {
     key: "getInject",
     value: function getInject() {
@@ -293,6 +300,70 @@ var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     value: function updateEncodeAttribute(type, flag) {
       this.encodeStyleAttribute[type] = flag;
     }
+  }, {
+    key: "initUniformsBuffer",
+    value: function initUniformsBuffer() {
+      var attrUniforms = this.getUniformsBufferInfo(this.getStyleAttribute());
+      var commonUniforms = this.getCommonUniformsInfo();
+      this.attributeUnifoms = this.rendererService.createBuffer({
+        data: new Float32Array((0, _utils.MultipleOfFourNumber)(attrUniforms.uniformsLength)),
+        // 长度需要大于等于 4
+        isUBO: true
+      });
+      this.commonUnifoms = this.rendererService.createBuffer({
+        data: new Float32Array((0, _utils.MultipleOfFourNumber)(commonUniforms.uniformsLength)),
+        isUBO: true
+      });
+      this.uniformBuffers = [this.attributeUnifoms, this.commonUnifoms];
+    }
+    // 获取数据映射 uniform 信息
+  }, {
+    key: "getUniformsBufferInfo",
+    value: function getUniformsBufferInfo(uniformsOption) {
+      var uniformsLength = 0;
+      var uniformsArray = [];
+      Object.values(uniformsOption).forEach(function (value) {
+        if (Array.isArray(value)) {
+          uniformsArray.push.apply(uniformsArray, (0, _toConsumableArray2.default)(value));
+          uniformsLength += value.length;
+        } else {
+          uniformsArray.push(value);
+          uniformsLength += 1;
+        }
+      });
+      return {
+        uniformsOption: uniformsOption,
+        uniformsLength: uniformsLength,
+        uniformsArray: uniformsArray
+      };
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
+      return {
+        uniformsLength: 0,
+        uniformsArray: [],
+        uniformsOption: {}
+      };
+    }
+
+    // 更新支持数据映射的uniform
+  }, {
+    key: "updateStyleUnifoms",
+    value: function updateStyleUnifoms() {
+      var _this$getUniformsBuff = this.getUniformsBufferInfo(this.getStyleAttribute()),
+        uniformsArray = _this$getUniformsBuff.uniformsArray;
+      var _this$getCommonUnifor = this.getCommonUniformsInfo(),
+        commonUniformsArray = _this$getCommonUnifor.uniformsArray;
+      this.attributeUnifoms.subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(uniformsArray).buffer)
+      });
+      this.commonUnifoms.subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(commonUniformsArray).buffer)
+      });
+    }
   }]);
   return BaseModel;
 }(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class.prototype, "configService", [_dec], {

package/lib/core/CommonStyleAttribute.js

@@ -20,6 +20,7 @@ var ShaderLocation = exports.ShaderLocation = /*#__PURE__*/function (ShaderLocat
   ShaderLocation[ShaderLocation["SHAPE"] = 10] = "SHAPE";
   ShaderLocation[ShaderLocation["EXTRUDE"] = 11] = "EXTRUDE";
   ShaderLocation[ShaderLocation["MAX"] = 12] = "MAX";
+  ShaderLocation[ShaderLocation["NORMAL"] = 13] = "NORMAL";
   return ShaderLocation;
 }({});
 function getCommonStyleAttributeOptions(name) {

package/lib/core/utils.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.MultipleOfFourNumber = MultipleOfFourNumber;
+exports.formatUniformsOption2Std140 = formatUniformsOption2Std140;
+function formatUniformsOption2Std140(uniformsOption) {
+  var std140_str = '';
+  Object.keys(uniformsOption).forEach(function (key) {
+    var value = uniformsOption[key];
+    if (Array.isArray(value)) {
+      std140_str += "vec".concat(value.length, " ").concat(key, ";\n");
+    } else {
+      std140_str += "flot ".concat(key, ";\n");
+    }
+  });
+  return std140_str;
+}
+function MultipleOfFourNumber(num) {
+  return Math.ceil(num / 4) * 4;
+}

package/lib/line/models/great_circle.js

@@ -153,25 +153,29 @@ var GreatCircleModel = exports.default = /*#__PURE__*/function (_BaseModel) {
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var model;
+        var _ref3, _ref3$segmentNumber, segmentNumber, model;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              _ref3 = this.layer.getLayerConfig(), _ref3$segmentNumber = _ref3.segmentNumber, segmentNumber = _ref3$segmentNumber === void 0 ? 30 : _ref3$segmentNumber;
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'lineGreatCircle',
                 vertexShader: line_arc2d_vert,
                 fragmentShader: line_arc_frag,
                 triangulation: _triangulation.LineArcTriangulation,
+                styleOption: {
+                  segmentNumber: segmentNumber
+                },
                 inject: this.getInject(),
                 depth: {
                   enable: false
                 }
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }
@@ -238,12 +242,12 @@ var GreatCircleModel = exports.default = /*#__PURE__*/function (_BaseModel) {
             var iconMap = _this2.iconService.getIconMap();
             var texture = feature.texture;
             // console.log('icon feature', feature)
-            var _ref3 = iconMap[texture] || {
+            var _ref4 = iconMap[texture] || {
                 x: 0,
                 y: 0
               },
-              x = _ref3.x,
-              y = _ref3.y;
+              x = _ref4.x,
+              y = _ref4.y;
             return [x, y];
           }
         }

package/lib/point/models/extrude.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
@@ -18,12 +19,13 @@ var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(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; } }
 /* babel-plugin-inline-import '../shaders/extrude/extrude_frag.glsl' */
-var pointExtrudeFrag = "varying vec4 v_color;\nvarying float v_lightWeight;\nuniform float u_pickLight: 0.0;\n\n#pragma include \"picking\"\n\n\nvoid main() {\n\n  gl_FragColor = v_color;\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  // picking\n  if(u_pickLight > 0.0) {\n    gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);\n  } else {\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
+var pointExtrudeFrag = "in vec4 v_color;\nin float v_lightWeight;\nout vec4 outputColor;\n\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\n\n#pragma include \"picking\"\n\nvoid main() {\n\n  outputColor = v_color;\n  // \u5F00\u542F\u900F\u660E\u5EA6\u6E10\u53D8\n  // picking\n  if(u_pickLight > 0.0) {\n    outputColor = filterColorAlpha(outputColor, v_lightWeight);\n  } else {\n    outputColor = filterColor(outputColor);\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/extrude/extrude_vert.glsl' */
-var pointExtrudeVert = "precision highp float;\n\n#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec3 a_Position;\nattribute vec3 a_Pos;\nattribute vec4 a_Color;\nattribute vec3 a_Size;\nattribute vec3 a_Normal;\n\nuniform float u_heightfixed: 0.0; // \u9ED8\u8BA4\u4E0D\u56FA\u5B9A\nuniform float u_r;\nuniform mat4 u_ModelMatrix;\n\nvarying vec4 v_color;\nvarying float v_lightWeight;\nvarying float v_barLinearZ;\n\nuniform float u_opacity : 1;\nuniform float u_lightEnable: 1;\nuniform float u_opacitylinear: 0.0;\nuniform vec4 u_sourceColor;\nuniform vec4 u_targetColor;\nuniform float u_opacitylinear_dir: 1.0;\nuniform float  u_linearColor: 0.0;\n\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if(x > 0.0 && z > 0.0) {\n    return atan(x/z);\n  } else if(x > 0.0 && z <= 0.0){\n    return atan(-z/x) + pi/2.0;\n  } else if(x <= 0.0 && z <= 0.0) {\n    return  pi + atan(x/z); //atan(x/z) + \n  } else {\n    return atan(z/-x) + pi*3.0/2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y/r);\n}\n\nvoid main() {\n\n\n  vec3 size = a_Size * a_Position;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n\n  if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n    \n    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n      offset = offset * pow(2.0, (19.0 - u_Zoom));\n    }\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n      // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n    }\n  } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n\n  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n\n  if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n\n  v_lightWeight = lightWeight;\n\n  v_color = a_Color;\n\n    // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    v_color = mix(u_sourceColor, u_targetColor, a_Position.z);\n    v_color.a =  v_color.a * u_opacity;\n  } else {\n    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * u_opacity);\n  }\n\n    if(u_opacitylinear > 0.0) {\n    v_color.a *= u_opacitylinear_dir > 0.0 ? (1.0 - a_Position.z): a_Position.z;\n  }\n\n\n  gl_Position = project_common_position_to_clipspace_v2(pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
+var pointExtrudeVert = "#define pi 3.1415926535\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 1) in vec4 a_Color;\nlayout(location = 9) in vec3 a_Size;\nlayout(location = 11) in vec3 a_Extrude;\nlayout(location = 13) in vec3 a_Normal;\n\nlayout(std140) uniform commonUniforms {\n  float u_pickLight;\n  float u_heightfixed;\n  float u_r;\n  float u_linearColor;\n  vec4 u_sourceColor;\n  vec4 u_targetColor;\n  float u_opacitylinear;\n  float u_opacitylinear_dir;\n  float u_lightEnable;\n};\nout vec4 v_color;\nout float v_lightWeight;\nout float v_barLinearZ;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\nfloat getYRadian(float x, float z) {\n  if(x > 0.0 && z > 0.0) {\n    return atan(x/z);\n  } else if(x > 0.0 && z <= 0.0){\n    return atan(-z/x) + pi/2.0;\n  } else if(x <= 0.0 && z <= 0.0) {\n    return  pi + atan(x/z); //atan(x/z) + \n  } else {\n    return atan(z/-x) + pi*3.0/2.0;\n  }\n}\n\nfloat getXRadian(float y, float r) {\n  return atan(y/r);\n}\n\nvoid main() {\n\n\n  vec3 size = a_Size * a_Position;\n\n  vec3 offset = size; // \u63A7\u5236\u5706\u67F1\u4F53\u7684\u5927\u5C0F - \u4ECE\u6807\u51C6\u5355\u4F4D\u5706\u67F1\u4F53\u8FDB\u884C\u504F\u79FB\n\n  if(u_heightfixed < 1.0) { // \u5706\u67F1\u4F53\u4E0D\u56FA\u5B9A\u9AD8\u5EA6\n    \n    if (u_CoordinateSystem == COORDINATE_SYSTEM_P20 || u_CoordinateSystem == COORDINATE_SYSTEM_P20_OFFSET) {\n      // P20 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF1\n      offset = offset * pow(2.0, (19.0 - u_Zoom));\n    }\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {\n      // P20_2 \u5750\u6807\u7CFB\u4E0B\uFF0C\u4E3A\u4E86\u548C Web \u58A8\u5361\u6258\u5750\u6807\u7CFB\u7EDF\u4E00\uFF0Czoom \u9ED8\u8BA4\u51CF3\n      offset = offset * pow(2.0, (19.0 - 3.0 - u_Zoom));\n    }\n  } else {// \u5706\u67F1\u4F53\u56FA\u5B9A\u9AD8\u5EA6 \uFF08 \u5904\u7406 mapbox \uFF09\n    if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      offset *= 4.0/pow(2.0, 21.0 - u_Zoom);\n    }\n  }\n\n\n  vec4 project_pos = project_position(vec4(a_Extrude.xy, 0., 1.0));\n\n  // u_r \u63A7\u5236\u5706\u67F1\u7684\u751F\u957F\n  vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);\n\n  // // \u5706\u67F1\u5149\u7167\u6548\u679C\n  float lightWeight = 1.0;\n\n  if(u_lightEnable > 0.0) { // \u53D6\u6D88\u4E09\u5143\u8868\u8FBE\u5F0F\uFF0C\u589E\u5F3A\u5065\u58EE\u6027\n    lightWeight = calc_lighting(pos);\n  }\n\n  v_lightWeight = lightWeight;\n\n  v_color = a_Color;\n\n    // \u8BBE\u7F6E\u5706\u67F1\u7684\u5E95\u8272\n  if(u_linearColor == 1.0) { // \u4F7F\u7528\u6E10\u53D8\u989C\u8272\n    v_color = mix(u_sourceColor, u_targetColor, a_Position.z);\n    v_color.a =  v_color.a * opacity;\n  } else {\n    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);\n  }\n\n    if(u_opacitylinear > 0.0) {\n    v_color.a *= u_opacitylinear_dir > 0.0 ? (1.0 - a_Position.z): a_Position.z;\n  }\n\n\n  gl_Position = project_common_position_to_clipspace_v2(pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
 var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ExtrudeModel, _BaseModel);
   var _super = _createSuper(ExtrudeModel);
@@ -41,6 +43,14 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _createClass2.default)(ExtrudeModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+    }
+  }, {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
         _ref$animateOption = _ref.animateOption,
         animateOption = _ref$animateOption === void 0 ? {
@@ -48,8 +58,6 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
           speed: 0.01,
           repeat: false
         } : _ref$animateOption,
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
         sourceColor = _ref.sourceColor,
         targetColor = _ref.targetColor,
         _ref$pickLight = _ref.pickLight,
@@ -88,13 +96,12 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
           }
         }
       }
-      return {
+      var commonOptions = {
         // 圆柱体的拾取高亮是否要计算光照
         u_pickLight: Number(pickLight),
         // 圆柱体是否固定高度
         u_heightfixed: Number(heightfixed),
         u_r: animateOption.enable && this.raiseRepeat > 0 ? this.raiseCount : 1.0,
-        u_opacity: opacity,
         // 渐变色支持参数
         u_linearColor: useLinearColor,
         u_sourceColor: sourceColorArr,
@@ -105,6 +112,8 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         // 光照计算开关
         u_lightEnable: Number(lightEnable)
       };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -136,12 +145,14 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
               // GAODE1.x GAODE2.x MAPBOX
               _ref2 = this.layer.getLayerConfig(), _ref2$depth = _ref2.depth, depth = _ref2$depth === void 0 ? true : _ref2$depth, _ref2$animateOption$r = _ref2.animateOption.repeat, repeat = _ref2$animateOption$r === void 0 ? 1 : _ref2$animateOption$r;
               this.raiseRepeat = repeat;
-              _context2.next = 4;
+              this.initUniformsBuffer();
+              _context2.next = 5;
               return this.layer.buildLayerModel({
                 moduleName: 'pointExtrude',
                 vertexShader: pointExtrudeVert,
                 fragmentShader: pointExtrudeFrag,
                 triangulation: _triangulation.PointExtrudeTriangulation,
+                inject: this.getInject(),
                 cull: {
                   enable: true,
                   face: (0, _l7Utils.getCullFace)(this.mapService.version)
@@ -150,10 +161,10 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
                   enable: depth
                 }
               });
-            case 4:
+            case 5:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 6:
+            case 7:
             case "end":
               return _context2.stop();
           }
@@ -173,6 +184,7 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Size',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.SIZE,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
@@ -203,6 +215,7 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Normal',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.NORMAL,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
@@ -216,10 +229,11 @@ var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         }
       });
       this.styleAttributeService.registerStyleAttribute({
-        name: 'pos',
+        name: 'extrude',
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
-          name: 'a_Pos',
+          name: 'a_Extrude',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.EXTRUDE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,

package/lib/point/models/image.js

@@ -67,10 +67,6 @@ var ImageModel = exports.default = /*#__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,
-        _ref$offsets = _ref.offsets,
-        offsets = _ref$offsets === void 0 ? [0, 0] : _ref$offsets,
         _ref$raisingHeight = _ref.raisingHeight,
         raisingHeight = _ref$raisingHeight === void 0 ? 0 : _ref$raisingHeight,
         _ref$heightfixed = _ref.heightfixed,

package/lib/point/shaders/extrude/extrude_frag.glsl

@@ -1,18 +1,30 @@
-varying vec4 v_color;
-varying float v_lightWeight;
-uniform float u_pickLight: 0.0;
+in vec4 v_color;
+in float v_lightWeight;
+out vec4 outputColor;
 
-#pragma include "picking"
 
+layout(std140) uniform commonUniforms {
+  float u_pickLight;
+  float u_heightfixed;
+  float u_r;
+  float u_linearColor;
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_opacitylinear;
+  float u_opacitylinear_dir;
+  float u_lightEnable;
+};
+
+#pragma include "picking"
 
 void main() {
 
-  gl_FragColor = v_color;
+  outputColor = v_color;
   // 开启透明度渐变
   // picking
   if(u_pickLight > 0.0) {
-    gl_FragColor = filterColorAlpha(gl_FragColor, v_lightWeight);
+    outputColor = filterColorAlpha(outputColor, v_lightWeight);
   } else {
-    gl_FragColor = filterColor(gl_FragColor);
+    outputColor = filterColor(outputColor);
   }
 }

package/lib/point/shaders/extrude/extrude_vert.glsl

@@ -1,32 +1,28 @@
-precision highp float;
-
 #define pi 3.1415926535
 #define ambientRatio 0.5
 #define diffuseRatio 0.3
 #define specularRatio 0.2
 
-attribute vec3 a_Position;
-attribute vec3 a_Pos;
-attribute vec4 a_Color;
-attribute vec3 a_Size;
-attribute vec3 a_Normal;
-
-uniform float u_heightfixed: 0.0; // 默认不固定
-uniform float u_r;
-uniform mat4 u_ModelMatrix;
-
-varying vec4 v_color;
-varying float v_lightWeight;
-varying float v_barLinearZ;
-
-uniform float u_opacity : 1;
-uniform float u_lightEnable: 1;
-uniform float u_opacitylinear: 0.0;
-uniform vec4 u_sourceColor;
-uniform vec4 u_targetColor;
-uniform float u_opacitylinear_dir: 1.0;
-uniform float  u_linearColor: 0.0;
-
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 9) in vec3 a_Size;
+layout(location = 11) in vec3 a_Extrude;
+layout(location = 13) in vec3 a_Normal;
+
+layout(std140) uniform commonUniforms {
+  float u_pickLight;
+  float u_heightfixed;
+  float u_r;
+  float u_linearColor;
+  vec4 u_sourceColor;
+  vec4 u_targetColor;
+  float u_opacitylinear;
+  float u_opacitylinear_dir;
+  float u_lightEnable;
+};
+out vec4 v_color;
+out float v_lightWeight;
+out float v_barLinearZ;
 
 #pragma include "projection"
 #pragma include "light"
@@ -72,7 +68,7 @@ void main() {
   }
 
 
-  vec4 project_pos = project_position(vec4(a_Pos.xy, 0., 1.0));
+  vec4 project_pos = project_position(vec4(a_Extrude.xy, 0., 1.0));
 
   // u_r 控制圆柱的生长
   vec4 pos = vec4(project_pos.xy + offset.xy, offset.z * u_r, 1.0);
@@ -91,9 +87,9 @@ void main() {
     // 设置圆柱的底色
   if(u_linearColor == 1.0) { // 使用渐变颜色
     v_color = mix(u_sourceColor, u_targetColor, a_Position.z);
-    v_color.a =  v_color.a * u_opacity;
+    v_color.a =  v_color.a * opacity;
   } else {
-    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * u_opacity);
+    v_color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
   }
 
     if(u_opacitylinear > 0.0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.3",
+  "version": "2.20.5",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.20.3",
-    "@antv/l7-maps": "2.20.3",
-    "@antv/l7-source": "2.20.3",
-    "@antv/l7-utils": "2.20.3",
+    "@antv/l7-core": "2.20.5",
+    "@antv/l7-maps": "2.20.5",
+    "@antv/l7-source": "2.20.5",
+    "@antv/l7-utils": "2.20.5",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.20.3",
+    "@antv/l7-test-utils": "2.20.5",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "c9f82837e7f8a6f661bce8dee94e794d3cec89c7",
+  "gitHead": "9c6df5f2ef050d18102f4aa4ccbb598bc1b5ee4d",
   "publishConfig": {
     "access": "public"
   }