@antv/l7-layers 2.19.10 → 2.20.0

package/es/tile/tile/Tile.js

@@ -80,7 +80,7 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
       var _this$parent$getLayer = this.parent.getLayerConfig(),
         maskLayers = _this$parent$getLayer.maskLayers;
       var layers = [];
-      maskLayers === null || maskLayers === void 0 ? void 0 : maskLayers.forEach(function (layer) {
+      maskLayers === null || maskLayers === void 0 || maskLayers.forEach(function (layer) {
         if (!layer.tileLayer) {
           // 非瓦片图层返回图层本身，瓦片图层返回对应的行列号图层
           layers.push(layer);
@@ -233,7 +233,7 @@ var Tile = /*#__PURE__*/function (_EventEmitter) {
     key: "destroy",
     value: function destroy() {
       var _this$tileMask;
-      (_this$tileMask = this.tileMask) === null || _this$tileMask === void 0 ? void 0 : _this$tileMask.destroy();
+      (_this$tileMask = this.tileMask) === null || _this$tileMask === void 0 || _this$tileMask.destroy();
       this.layers.forEach(function (layer) {
         return layer.destroy();
       });

package/es/wind/models/wind.js

@@ -65,7 +65,6 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _source$data,
           _source$data2,
-          _source$data2$images,
           _this3 = this;
         var _ref, _ref$uMin, uMin, _ref$uMax, uMax, _ref$vMin, vMin, _ref$vMax, vMax, _ref$fadeOpacity, fadeOpacity, _ref$speedFactor, speedFactor, _ref$dropRate, dropRate, _ref$dropRateBump, dropRateBump, _ref$rampColors, rampColors, _ref$sizeScale, sizeScale, createTexture2D, source, glContext, model;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -81,7 +80,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
               this.cacheZoom = Math.floor(this.mapService.getZoom());
               glContext = this.rendererService.getGLContext();
               this.imageCoords = (_source$data = source.data) === null || _source$data === void 0 ? void 0 : _source$data.dataArray[0].coordinates;
-              (_source$data2 = source.data) === null || _source$data2 === void 0 ? void 0 : (_source$data2$images = _source$data2.images) === null || _source$data2$images === void 0 ? void 0 : _source$data2$images.then(function (imageData) {
+              (_source$data2 = source.data) === null || _source$data2 === void 0 || (_source$data2 = _source$data2.images) === null || _source$data2 === void 0 || _source$data2.then(function (imageData) {
                 var _this3$texture;
                 _this3.sizeScale = sizeScale * _this3.getZoomScale();
                 var _this3$getWindSize = _this3.getWindSize(),
@@ -107,7 +106,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
                   vMax: vMax,
                   image: imageData[0]
                 });
-                (_this3$texture = _this3.texture) === null || _this3$texture === void 0 ? void 0 : _this3$texture.destroy();
+                (_this3$texture = _this3.texture) === null || _this3$texture === void 0 || _this3$texture.destroy();
                 _this3.texture = createTexture2D({
                   width: imageWidth,
                   height: imageHeight
@@ -175,8 +174,8 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture, _this$wind;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
-      (_this$wind = this.wind) === null || _this$wind === void 0 ? void 0 : _this$wind.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+      (_this$wind = this.wind) === null || _this$wind === void 0 || _this$wind.destroy();
     }
   }, {
     key: "registerBuiltinAttributes",
@@ -274,7 +273,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
       this.layerService.beforeRenderData(this.layer);
       this.layer.hooks.beforeRender.call();
       this.layerService.renderMask(this.layer.masks);
-      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 ? void 0 : _this$colorModel.draw({
+      (_this$colorModel = this.colorModel) === null || _this$colorModel === void 0 || _this$colorModel.draw({
         uniforms: {
           u_opacity: opacity || 1.0,
           u_texture: this.texture

package/lib/canvas/index.js

@@ -18,7 +18,7 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _index = _interopRequireDefault(require("./models/index"));
 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; } }
-var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
+var CanvasLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(CanvasLayer, _BaseLayer);
   var _super = _createSuper(CanvasLayer);
   function CanvasLayer() {
@@ -99,5 +99,4 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return CanvasLayer;
-}(_BaseLayer2.default);
-exports.default = CanvasLayer;
+}(_BaseLayer2.default);

package/lib/canvas/models/canvas.js

@@ -19,7 +19,7 @@ var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _interface = require("../../core/interface");
 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; } }
-var CanvaModel = /*#__PURE__*/function (_BaseModel) {
+var CanvaModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(CanvaModel, _BaseModel);
   var _super = _createSuper(CanvaModel);
   function CanvaModel() {
@@ -111,7 +111,7 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     value: function clearModels() {
       if (this.canvas) {
         var _this$mapService$getC;
-        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 ? void 0 : _this$mapService$getC.removeChild(this.canvas);
+        (_this$mapService$getC = this.mapService.getContainer()) === null || _this$mapService$getC === void 0 || _this$mapService$getC.removeChild(this.canvas);
         // @ts-ignore
         this.canvas = null;
       }
@@ -168,7 +168,7 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
       canvas.style.top = '0';
       canvas.style.left = '0';
       canvas.style.zIndex = zIndex + '';
-      (_this$mapService$getC2 = this.mapService.getContainer()) === null || _this$mapService$getC2 === void 0 ? void 0 : _this$mapService$getC2.appendChild(canvas);
+      (_this$mapService$getC2 = this.mapService.getContainer()) === null || _this$mapService$getC2 === void 0 || _this$mapService$getC2.appendChild(canvas);
       var ctx = canvas.getContext('2d');
       this.ctx = ctx;
     }
@@ -198,5 +198,4 @@ var CanvaModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return CanvaModel;
-}(_BaseModel2.default);
-exports.default = CanvaModel;
+}(_BaseModel2.default);

package/lib/canvas/models/index.js

@@ -9,5 +9,4 @@ var _canvas = _interopRequireDefault(require("./canvas"));
 var CanvasModels = {
   canvas: _canvas.default
 };
-var _default = CanvasModels;
-exports.default = _default;
+var _default = exports.default = CanvasModels;

package/lib/citybuliding/building.js

@@ -18,7 +18,7 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _build = _interopRequireDefault(require("./models/build"));
 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; } }
-var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
+var CityBuildingLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(CityBuildingLayer, _BaseLayer);
   var _super = _createSuper(CityBuildingLayer);
   function CityBuildingLayer() {
@@ -66,5 +66,4 @@ var CityBuildingLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return CityBuildingLayer;
-}(_BaseLayer2.default);
-exports.default = CityBuildingLayer;
+}(_BaseLayer2.default);

package/lib/citybuliding/models/build.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var buildFrag = "uniform float u_opacity: 1.0;\nuniform vec4 u_baseColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_brightColor : [ 1.0, 0, 0, 1.0 ];\nuniform vec4 u_windowColor : [ 1.0, 0, 0, 1.0 ];\nuniform float u_near : 0;\nuniform float u_far : 1;\nvarying vec4 v_Color;\nvarying vec2 v_texCoord;\nuniform float u_Zoom : 1;\nuniform float u_time;\n\nuniform float u_circleSweep;\nuniform float u_cityMinSize;\nuniform vec3 u_circleSweepColor;\nuniform float u_circleSweepSpeed;\n\nvarying float v_worldDis;\n\n#pragma include \"picking\"\n\nvec3 getWindowColor(float n, float hot, vec3 brightColor, vec3 darkColor) {\n    float s = step(hot, n);\n    vec3 color = mix(brightColor,vec3(0.9,0.9,1.0),n);\n\n    return mix(darkColor, color, s);\n}\nfloat random (vec2 st) {\n    return fract(sin(dot(st.xy, vec2(12.9898,78.233)))* 43758.5453123);\n}\n\nfloat LinearizeDepth()\n{\n    float z = gl_FragCoord.z * 2.0 - 1.0;\n    return (2.0 * u_near * u_far) / (u_far + u_near - z * (u_far - u_near));\n}\n\nvec3 fog(vec3 color, vec3 fogColor, float depth){\n    float fogFactor=clamp(depth,0.0,1.0);\n    vec3 output_color=mix(fogColor,color,fogFactor);\n    return output_color;\n}\n\nfloat sdRect(vec2 p, vec2 sz) {\n  vec2 d = abs(p) - sz;\n  float outside = length(max(d, 0.));\n  float inside = min(max(d.x, d.y), 0.);\n  return outside + inside;\n}\n\nvoid main() {\n  gl_FragColor = v_Color;\n  vec3 baseColor = u_baseColor.xyz;\n  vec3 brightColor = u_brightColor.xyz;\n  vec3 windowColor = u_windowColor.xyz;\n  float targetColId = 5.;\n  float depth = 1.0 - LinearizeDepth() / u_far * u_Zoom;\n  vec3 fogColor = vec3(23.0/255.0,31.0/255.0,51.0/255.0);\n  if(v_texCoord.x < 0.) { //\u9876\u90E8\u989C\u8272\n       vec3 foggedColor = fog(baseColor.xyz + vec3(0.12*0.9,0.2*0.9,0.3*0.9),fogColor,depth);\n       gl_FragColor = vec4( foggedColor, v_Color.w);\n  }else { // \u4FA7\u9762\u989C\u8272\n        vec2 st = v_texCoord;\n        vec2  UvScale = v_texCoord;\n        float tStep = min(0.08,max(0.05* (18.0-u_Zoom),0.02));\n        float tStart = 0.25 * tStep;\n        float tEnd = 0.75 * tStep;\n        float u = mod(UvScale.x, tStep);\n        float v = mod(UvScale.y, tStep);\n        float ux = floor(UvScale.x/tStep);\n        float uy = floor(UvScale.y/tStep);\n        float n = random(vec2(ux,uy));\n        float lightP = u_time;\n        float head = 1.0- step(0.005,st.y);\n        /*step3*/\n        // \u5C06\u7A97\u6237\u989C\u8272\u548C\u5899\u9762\u989C\u8272\u533A\u522B\u5F00\u6765\n        float sU = step(tStart, u) - step(tEnd, u);\n        float sV = step(tStart, v) - step(tEnd, v);\n        vec2 windowSize = vec2(abs(tEnd-tStart),abs(tEnd-tStart));\n        float dist = sdRect(vec2(u,v), windowSize);\n        float s = sU * sV;\n\n        float curColId = floor(UvScale.x / tStep);\n        float sCol = step(targetColId - 0.2, curColId) - step(targetColId + 0.2, curColId);\n\n        float mLightP = mod(lightP, 2.);\n        float sRow = step(mLightP - 0.2, st.y) - step(mLightP, st.y);\n        if(ux == targetColId){\n            n =0.;\n        }\n        float timeP = min(0.75, abs ( sin(u_time/3.0) ) );\n        float hot = smoothstep(1.0,0.0,timeP);\n        vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), s);\n        //vec3 color = mix(baseColor, getWindowColor(n,hot,brightColor,windowColor), 1.0);\n        float sFinal = s * sCol * sRow;\n        color += mix(baseColor, brightColor, sFinal*n);\n        if (st.y<0.01){\n        color = baseColor;\n         }\n        if(head ==1.0) { // \u9876\u90E8\u4EAE\u7EBF\n            color = brightColor;\n        }\n        color = color * v_Color.rgb;\n\n        vec3 foggedColor = fog(color,fogColor,depth);\n\n        gl_FragColor = vec4(foggedColor,1.0);\n  }\n\n\n  if(u_circleSweep > 0.0 && v_worldDis < u_cityMinSize) {\n    float r = fract(((v_worldDis/u_cityMinSize) - u_time * u_circleSweepSpeed) * 2.0);\n    gl_FragColor.rgb += r * r * u_circleSweepColor;\n  }\n   \n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/build_vert.glsl' */
 var buildVert = "precision highp float;\n\n#define ambientRatio 0.5\n#define diffuseRatio 0.3\n#define specularRatio 0.2\n\nattribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute float a_Size;\nuniform mat4 u_ModelMatrix;\n\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\nvarying vec4 v_Color;\n\nuniform float u_circleSweep;\nuniform vec2 u_cityCenter;\n\nvarying float v_worldDis;\n\n#pragma include \"projection\"\n#pragma include \"light\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);\n  vec4 project_pos = project_position(pos);\n\n   v_texCoord = a_Uv;\n\n  if(u_circleSweep > 0.0) {\n     vec2 lnglatscale = vec2(0.0);\n    if(u_CoordinateSystem != COORDINATE_SYSTEM_P20_2) {\n      lnglatscale = (a_Position.xy - u_cityCenter) * vec2(0.0, 0.135);\n    }\n    v_worldDis = length(a_Position.xy + lnglatscale - u_cityCenter);\n  }\n \n  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n\n  float lightWeight = calc_lighting(pos);\n  // v_Color = a_Color;\n  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);\n\n  setPickingColor(a_PickingColor);\n}\n";
-var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
+var CityBuildModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(CityBuildModel, _BaseModel);
   var _super = _createSuper(CityBuildModel);
   function CityBuildModel() {
@@ -206,5 +206,4 @@ var CityBuildModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return CityBuildModel;
-}(_BaseModel2.default);
-exports.default = CityBuildModel;
+}(_BaseModel2.default);

package/lib/core/BaseLayer.js

@@ -30,7 +30,7 @@ var _multiPassRender = require("../utils/multiPassRender");
 var _LayerPickService = _interopRequireDefault(require("./LayerPickService"));
 var _TextureService = _interopRequireDefault(require("./TextureService"));
 var _excluded = ["passes"],
-  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "segmentNumber"];
+  _excluded2 = ["moduleName", "vertexShader", "fragmentShader", "inject", "triangulation", "styleOption"];
 var _dec, _class, _descriptor; // @ts-ignore
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -47,7 +47,7 @@ var isEqual = _l7Utils.lodashUtil.isEqual,
  * 分配 layer id
  */
 var layerIdCounter = 0;
-var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function (_ref) {
+var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function (_ref) {
   (0, _inherits2.default)(BaseLayer, _ref);
   var _super = _createSuper(BaseLayer);
   // private pickingPassRender: IPass<'pixelPicking'>;
@@ -381,7 +381,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         id: this.id,
         type: this.type
       };
-      (_this$debugService = this.debugService) === null || _this$debugService === void 0 ? void 0 : _this$debugService.log(key, values);
+      (_this$debugService = this.debugService) === null || _this$debugService === void 0 || _this$debugService.log(key, values);
     }
   }, {
     key: "updateModelData",
@@ -957,6 +957,12 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       if (this.isDestroyed) {
         return;
       }
+
+      // destroy all UBOs
+      this.layerModel.uniformBuffers.forEach(function (buffer) {
+        buffer.destroy();
+      });
+
       // remove child layer
       this.layerChildren.map(function (child) {
         return child.destroy(false);
@@ -975,7 +981,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.hooks.beforeDestroy.call();
       // 清除sources事件
       this.layerSource.off('update', this.sourceEvent);
-      (_this$multiPassRender = this.multiPassRenderer) === null || _this$multiPassRender === void 0 ? void 0 : _this$multiPassRender.destroy();
+      (_this$multiPassRender = this.multiPassRenderer) === null || _this$multiPassRender === void 0 || _this$multiPassRender.destroy();
       this.textureService.destroy();
 
       // 清除所有属性以及关联的 vao == 销毁所有 => model this.models.forEach((model) => model.destroy());
@@ -985,11 +991,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
       this.hooks.afterDestroy.call();
       // Tip: 清除各个图层自定义的 models 资源
-      (_this$layerModel = this.layerModel) === null || _this$layerModel === void 0 ? void 0 : _this$layerModel.clearModels(refresh);
-      (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 ? void 0 : _this$tileLayer.destroy();
+      (_this$layerModel = this.layerModel) === null || _this$layerModel === void 0 || _this$layerModel.clearModels(refresh);
+      (_this$tileLayer = this.tileLayer) === null || _this$tileLayer === void 0 || _this$tileLayer.destroy();
       this.models = [];
       // 清除图层日志（如果有的话：非瓦片相关）
-      (_this$debugService2 = this.debugService) === null || _this$debugService2 === void 0 ? void 0 : _this$debugService2.removeLog(this.id);
+      (_this$debugService2 = this.debugService) === null || _this$debugService2 === void 0 || _this$debugService2.removeLog(this.id);
       this.emit('remove', {
         target: this,
         type: 'remove'
@@ -1016,7 +1022,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
       this.models.forEach(function (model) {
         return model.destroy();
       });
-      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 ? void 0 : _this$layerModel2.clearModels();
+      (_this$layerModel2 = this.layerModel) === null || _this$layerModel2 === void 0 || _this$layerModel2.clearModels();
       this.models = [];
     }
   }, {
@@ -1099,10 +1105,10 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function getLegend(name) {
       var _attribute$scale, _scales$0$option, _attribute$scale2;
       var attribute = this.styleAttributeService.getLayerStyleAttribute(name);
-      var scales = (attribute === null || attribute === void 0 ? void 0 : (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
+      var scales = (attribute === null || attribute === void 0 || (_attribute$scale = attribute.scale) === null || _attribute$scale === void 0 ? void 0 : _attribute$scale.scalers) || [];
       return {
         type: (_scales$0$option = scales[0].option) === null || _scales$0$option === void 0 ? void 0 : _scales$0$option.type,
-        field: attribute === null || attribute === void 0 ? void 0 : (_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.field,
+        field: attribute === null || attribute === void 0 || (_attribute$scale2 = attribute.scale) === null || _attribute$scale2 === void 0 ? void 0 : _attribute$scale2.field,
         items: this.getLegendItems(name)
       };
     }
@@ -1163,11 +1169,11 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function () {
       var _buildLayerModel = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(options) {
         var _this10 = this;
-        var moduleName, vertexShader, fragmentShader, inject, triangulation, segmentNumber, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
+        var moduleName, vertexShader, fragmentShader, inject, triangulation, styleOption, rest, _this$shaderModuleSer, vs, fs, uniforms, createModel;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              moduleName = options.moduleName, vertexShader = options.vertexShader, fragmentShader = options.fragmentShader, inject = options.inject, triangulation = options.triangulation, segmentNumber = options.segmentNumber, rest = (0, _objectWithoutProperties2.default)(options, _excluded2);
+              moduleName = options.moduleName, vertexShader = options.vertexShader, fragmentShader = options.fragmentShader, inject = options.inject, triangulation = options.triangulation, styleOption = options.styleOption, rest = (0, _objectWithoutProperties2.default)(options, _excluded2);
               this.shaderModuleService.registerModule(moduleName, {
                 vs: vertexShader,
                 fs: fragmentShader,
@@ -1176,8 +1182,7 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
               _this$shaderModuleSer = this.shaderModuleService.getModule(moduleName), vs = _this$shaderModuleSer.vs, fs = _this$shaderModuleSer.fs, uniforms = _this$shaderModuleSer.uniforms;
               createModel = this.rendererService.createModel;
               return _context3.abrupt("return", new Promise(function (resolve) {
-                // console.log(this.encodedData)
-                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, segmentNumber),
+                var _this10$styleAttribut = _this10.styleAttributeService.createAttributesAndIndices(_this10.encodedData, triangulation, styleOption),
                   attributes = _this10$styleAttribut.attributes,
                   elements = _this10$styleAttribut.elements,
                   count = _this10$styleAttribut.count;
@@ -1187,7 +1192,9 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
                   fs: fs,
                   vs: vs,
                   elements: elements,
-                  blend: _blend.BlendTypes[_l7Core.BlendType.normal]
+                  blend: _blend.BlendTypes[_l7Core.BlendType.normal],
+                  uniformBuffers: [].concat((0, _toConsumableArray2.default)(_this10.layerModel.uniformBuffers), (0, _toConsumableArray2.default)(_this10.rendererService.uniformBuffers)),
+                  textures: _this10.layerModel.textures
                 }, rest);
                 if (count) {
                   modelOptions.count = count;
@@ -1476,5 +1483,4 @@ var BaseLayer = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   enumerable: true,
   writable: true,
   initializer: null
-})), _class));
-exports.default = BaseLayer;
+})), _class));

package/lib/core/BaseModel.js

@@ -18,11 +18,19 @@ var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _blend = require("../utils/blend");
 var _stencil = require("../utils/stencil");
-var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _constant = require("./constant");
+var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _dec, _class, _descriptor;
+var shaderLocationMap = {
+  opacity: _CommonStyleAttribute.ShaderLocation.OPACITY,
+  stroke: _CommonStyleAttribute.ShaderLocation.STROKE,
+  offsets: _CommonStyleAttribute.ShaderLocation.OFFSETS,
+  rotation: _CommonStyleAttribute.ShaderLocation.ROTATION,
+  extrusionBase: _CommonStyleAttribute.ShaderLocation.EXTRUSION_BASE
+};
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
+var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigService), (_class = /*#__PURE__*/function () {
   // @lazyInject(TYPES.IIconService)
   // protected readonly iconService: IIconService;
 
@@ -35,7 +43,8 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
 
   function BaseModel(layer) {
     (0, _classCallCheck2.default)(this, BaseModel);
-    // style texture data mapping
+    (0, _defineProperty2.default)(this, "uniformBuffers", []);
+    (0, _defineProperty2.default)(this, "textures", []);
     (0, _defineProperty2.default)(this, "preStyleAttribute", {});
     (0, _defineProperty2.default)(this, "encodeStyleAttribute", {});
     (0, _initializerDefineProperty2.default)(this, "configService", _descriptor, this);
@@ -215,18 +224,30 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
     value: function getInject() {
       var encodeStyleAttribute = this.layer.encodeStyleAttribute;
       var str = '';
+      // a_Position = 0
+      // a_Color = 1
+      // a_PickingColor = 2
+
+      var uniforms = [];
+      // 支持数据映射的类型
       this.layer.enableShaderEncodeStyles.forEach(function (key) {
         if (encodeStyleAttribute[key]) {
+          // 配置了数据映射的类型
           str += "#define USE_ATTRIBUTE_".concat(key.toUpperCase(), " 0.0; \n\n");
+        } else {
+          uniforms.push("  ".concat(_constant.DefaultUniformStyleType[key], " u_").concat(key, ";"));
         }
-        str += "\n          #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n      attribute ").concat(_constant.DefaultUniformStyleType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n    #else\n      uniform ").concat(_constant.DefaultUniformStyleType[key], " u_").concat(key, ";\n    #endif\n\n    ");
+        str += "\n          #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n          layout(location = ").concat(shaderLocationMap[key], ") in ").concat(_constant.DefaultUniformStyleType[key], " a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n        #endif\n\n        ");
       });
+      var attributeUniforms = uniforms.length ? "\nlayout(std140) uniform AttributeUniforms {\n".concat(uniforms.join('\n'), "\n};\n    ") : '';
+      str += attributeUniforms;
       var innerStr = '';
       this.layer.enableShaderEncodeStyles.forEach(function (key) {
-        innerStr += "\n\n#ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n  ").concat(_constant.DefaultUniformStyleType[key], " ").concat(key, "  = a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n#else\n  ").concat(_constant.DefaultUniformStyleType[key], " ").concat(key, " = u_").concat(key, ";\n#endif\n\n");
+        innerStr += "\n\n    #ifdef USE_ATTRIBUTE_".concat(key.toUpperCase(), "\n      ").concat(_constant.DefaultUniformStyleType[key], " ").concat(key, "  = a_").concat(key.charAt(0).toUpperCase() + key.slice(1), ";\n    #else\n      ").concat(_constant.DefaultUniformStyleType[key], " ").concat(key, " = u_").concat(key, ";\n    #endif\n\n    ");
       });
       return {
         'vs:#decl': str,
+        'fs:#decl': attributeUniforms,
         'vs:#main-start': innerStr
       };
     }
@@ -261,6 +282,9 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
         var options = (0, _CommonStyleAttribute.getCommonStyleAttributeOptions)(key);
         if (options) {
           _this2.styleAttributeService.registerStyleAttribute(options);
+          if (options.descriptor) {
+            options.descriptor.shaderLocation = shaderLocationMap[key];
+          }
         }
       });
     }
@@ -276,5 +300,4 @@ var BaseModel = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.IGlobalConfigServi
   enumerable: true,
   writable: true,
   initializer: null
-})), _class));
-exports.default = BaseModel;
+})), _class));

package/lib/core/CommonStyleAttribute.js

@@ -3,8 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ShaderLocation = void 0;
 exports.getCommonStyleAttributeOptions = getCommonStyleAttributeOptions;
 var _l7Core = require("@antv/l7-core");
+var ShaderLocation = exports.ShaderLocation = /*#__PURE__*/function (ShaderLocation) {
+  ShaderLocation[ShaderLocation["POSITION"] = 0] = "POSITION";
+  ShaderLocation[ShaderLocation["COLOR"] = 1] = "COLOR";
+  ShaderLocation[ShaderLocation["VERTEX_ID"] = 2] = "VERTEX_ID";
+  ShaderLocation[ShaderLocation["PICKING_COLOR"] = 3] = "PICKING_COLOR";
+  ShaderLocation[ShaderLocation["STROKE"] = 4] = "STROKE";
+  ShaderLocation[ShaderLocation["OPACITY"] = 5] = "OPACITY";
+  ShaderLocation[ShaderLocation["OFFSETS"] = 6] = "OFFSETS";
+  ShaderLocation[ShaderLocation["ROTATION"] = 7] = "ROTATION";
+  ShaderLocation[ShaderLocation["EXTRUSION_BASE"] = 8] = "EXTRUSION_BASE";
+  ShaderLocation[ShaderLocation["SIZE"] = 9] = "SIZE";
+  ShaderLocation[ShaderLocation["SHAPE"] = 10] = "SHAPE";
+  ShaderLocation[ShaderLocation["EXTRUDE"] = 11] = "EXTRUDE";
+  ShaderLocation[ShaderLocation["MAX"] = 12] = "MAX";
+  return ShaderLocation;
+}({});
 function getCommonStyleAttributeOptions(name) {
   switch (name) {
     // // roate
@@ -14,6 +31,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Rotation',
+          shaderLocation: ShaderLocation.ROTATION,
           buffer: {
             usage: _l7Core.gl.DYNAMIC_DRAW,
             data: [],
@@ -33,6 +51,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Stroke',
+          shaderLocation: ShaderLocation.STROKE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -53,6 +72,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Opacity',
+          shaderLocation: ShaderLocation.OPACITY,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
@@ -73,6 +93,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_ExtrusionBase',
+          shaderLocation: ShaderLocation.EXTRUSION_BASE,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,
@@ -93,6 +114,7 @@ function getCommonStyleAttributeOptions(name) {
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Offsets',
+          shaderLocation: ShaderLocation.OFFSETS,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.STATIC_DRAW,

package/lib/core/LayerPickService.js

@@ -11,7 +11,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var BaseLayerPickService = /*#__PURE__*/function () {
+var BaseLayerPickService = exports.default = /*#__PURE__*/function () {
   function BaseLayerPickService(layer) {
     (0, _classCallCheck2.default)(this, BaseLayerPickService);
     this.layer = layer;
@@ -133,5 +133,4 @@ var BaseLayerPickService = /*#__PURE__*/function () {
     }
   }]);
   return BaseLayerPickService;
-}();
-exports.default = BaseLayerPickService;
+}();

package/lib/core/TextureService.js

@@ -9,7 +9,7 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var TextureService = /*#__PURE__*/function () {
+var TextureService = exports.default = /*#__PURE__*/function () {
   function TextureService(layer) {
     (0, _classCallCheck2.default)(this, TextureService);
     this.layer = layer;
@@ -53,7 +53,7 @@ var TextureService = /*#__PURE__*/function () {
     key: "destroy",
     value: function destroy() {
       var _this$colorTexture;
-      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
+      (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 || _this$colorTexture.destroy();
     }
   }, {
     key: "getColorRampBar",
@@ -75,9 +75,8 @@ var TextureService = /*#__PURE__*/function () {
     key: "getTextureKey",
     value: function getTextureKey(colorRamp, domain) {
       var _colorRamp$positions;
-      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 ? void 0 : (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
+      return "".concat(colorRamp.colors.join('_'), "_").concat(colorRamp === null || colorRamp === void 0 || (_colorRamp$positions = colorRamp.positions) === null || _colorRamp$positions === void 0 ? void 0 : _colorRamp$positions.join('_'), "_").concat(colorRamp.type, "_").concat(domain === null || domain === void 0 ? void 0 : domain.join('_'));
     }
   }]);
   return TextureService;
-}();
-exports.default = TextureService;
+}();

package/lib/core/constant.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DefaultUniformStyleValue = exports.DefaultUniformStyleType = void 0;
-var DefaultUniformStyleValue = {
+var DefaultUniformStyleValue = exports.DefaultUniformStyleValue = {
   opacity: 1,
   stroke: [1, 0, 0, 1],
   offsets: [0, 0],
@@ -13,8 +13,7 @@ var DefaultUniformStyleValue = {
   strokeOpacity: 1,
   thetaOffset: 0.314
 };
-exports.DefaultUniformStyleValue = DefaultUniformStyleValue;
-var DefaultUniformStyleType = {
+var DefaultUniformStyleType = exports.DefaultUniformStyleType = {
   opacity: 'float',
   stroke: 'vec4',
   offsets: 'vec2',
@@ -23,5 +22,4 @@ var DefaultUniformStyleType = {
   extrusionBase: 'float',
   strokeOpacity: 'float',
   thetaOffset: 'float'
-};
-exports.DefaultUniformStyleType = DefaultUniformStyleType;
+};

package/lib/core/interface.js

@@ -4,19 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.lineStyleType = exports.TextureBlend = exports.SizeUnitType = exports.LinearDir = exports.CanvasUpdateType = void 0;
-var lineStyleType = /*#__PURE__*/function (lineStyleType) {
+var lineStyleType = exports.lineStyleType = /*#__PURE__*/function (lineStyleType) {
   lineStyleType[lineStyleType["solid"] = 0] = "solid";
   lineStyleType[lineStyleType["dash"] = 1] = "dash";
   return lineStyleType;
 }({});
-exports.lineStyleType = lineStyleType;
-var LinearDir = /*#__PURE__*/function (LinearDir) {
+var LinearDir = exports.LinearDir = /*#__PURE__*/function (LinearDir) {
   LinearDir["VERTICAL"] = "vertical";
   LinearDir["HORIZONTAL"] = "horizontal";
   return LinearDir;
 }({});
-exports.LinearDir = LinearDir;
-var TextureBlend = /*#__PURE__*/function (TextureBlend) {
+var TextureBlend = exports.TextureBlend = /*#__PURE__*/function (TextureBlend) {
   TextureBlend["NORMAL"] = "normal";
   TextureBlend["REPLACE"] = "replace";
   return TextureBlend;
@@ -24,16 +22,13 @@ var TextureBlend = /*#__PURE__*/function (TextureBlend) {
 /**
  * 基础图层类型定义
  */
-exports.TextureBlend = TextureBlend;
-var SizeUnitType = /*#__PURE__*/function (SizeUnitType) {
+var SizeUnitType = exports.SizeUnitType = /*#__PURE__*/function (SizeUnitType) {
   SizeUnitType[SizeUnitType["pixel"] = 0] = "pixel";
   SizeUnitType[SizeUnitType["meter"] = 1] = "meter";
   return SizeUnitType;
 }({}); // 栅格瓦片图层
-exports.SizeUnitType = SizeUnitType;
-var CanvasUpdateType = /*#__PURE__*/function (CanvasUpdateType) {
+var CanvasUpdateType = exports.CanvasUpdateType = /*#__PURE__*/function (CanvasUpdateType) {
   CanvasUpdateType["ALWAYS"] = "always";
   CanvasUpdateType["DRAGEND"] = "dragend";
   return CanvasUpdateType;
-}({});
-exports.CanvasUpdateType = CanvasUpdateType;
+}({});