@antv/l7-layers 2.19.11 → 2.20.1

package/lib/core/BaseLayer.js

@@ -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)
       };
     }
@@ -1176,7 +1182,6 @@ 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, styleOption),
                   attributes = _this10$styleAttribut.attributes,
                   elements = _this10$styleAttribut.elements,
@@ -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;
+}({});

package/lib/core/schema.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 /**
  * BaseLayer Schema
  */
-var _default = {
+var _default = exports.default = {
   properties: {
     enablePicking: {
       type: 'boolean'
@@ -28,5 +28,4 @@ var _default = {
       }]
     }
   }
-};
-exports.default = _default;
+};

package/lib/core/shape/Path.js

@@ -14,7 +14,7 @@ exports.square = square;
 exports.triangle = triangle;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _geometryShape;
-var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
+var ShapeType3D = exports.ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["CYLINDER"] = "cylinder";
   ShapeType3D["SQUARECOLUMN"] = "squareColumn";
   ShapeType3D["TRIANGLECOLUMN"] = "triangleColumn";
@@ -22,8 +22,7 @@ var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
   ShapeType3D["PENTAGONCOLUMN"] = "pentagonColumn";
   return ShapeType3D;
 }({});
-exports.ShapeType3D = ShapeType3D;
-var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
+var ShapeType2D = exports.ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
   ShapeType2D["CIRCLE"] = "circle";
   ShapeType2D["SQUARE"] = "square";
   ShapeType2D["TRIANGLE"] = "triangle";
@@ -36,7 +35,6 @@ var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
  * @param pointCount  顶点个数 3 => 三角形
  * @param start 顶点起始角度 调整图形的方向
  */
-exports.ShapeType2D = ShapeType2D;
 function polygonPath(pointCount) {
   var start = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var step = Math.PI * 2 / pointCount;
@@ -67,5 +65,4 @@ function hexagon() {
 function pentagon() {
   return polygonPath(5);
 }
-var geometryShape = (_geometryShape = {}, (0, _defineProperty2.default)(_geometryShape, ShapeType2D.CIRCLE, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.HEXAGON, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.TRIANGLE, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.SQUARE, square), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.PENTAGON, pentagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.CYLINDER, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.HEXAGONCOLUMN, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.TRIANGLECOLUMN, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.SQUARECOLUMN, square), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.PENTAGONCOLUMN, pentagon), _geometryShape);
-exports.geometryShape = geometryShape;
+var geometryShape = exports.geometryShape = (_geometryShape = {}, (0, _defineProperty2.default)(_geometryShape, ShapeType2D.CIRCLE, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.HEXAGON, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.TRIANGLE, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.SQUARE, square), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.PENTAGON, pentagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.CYLINDER, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.HEXAGONCOLUMN, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.TRIANGLECOLUMN, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.SQUARECOLUMN, square), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.PENTAGONCOLUMN, pentagon), _geometryShape);

package/lib/core/triangulation.js

@@ -33,8 +33,8 @@ var _utils = require("../earth/utils");
 var _extrude_polyline = _interopRequireDefault(require("../utils/extrude_polyline"));
 var _extrude = _interopRequireWildcard(require("./shape/extrude"));
 var _Path = require("./shape/Path");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // @ts-ignore
 
 var GeometryCache = {};

package/lib/earth/index.js

@@ -26,7 +26,7 @@ var EarthModels = {
   bloomSphere: _bloomsphere.default
 };
 var earthLayerTypes = ['base', 'atomSphere', 'bloomSphere'];
-var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
+var EarthLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(EarthLayer, _BaseLayer);
   var _super = _createSuper(EarthLayer);
   function EarthLayer() {
@@ -88,7 +88,7 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = (shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
+      var shape = (shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field) || 'base';
       if (earthLayerTypes.indexOf(shape) < 0) {
         shape = 'base';
       }
@@ -96,5 +96,4 @@ var EarthLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return EarthLayer;
-}(_BaseLayer2.default);
-exports.default = EarthLayer;
+}(_BaseLayer2.default);

package/lib/earth/models/atmosphere.js

@@ -23,7 +23,7 @@ var atmoSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition;
 /* babel-plugin-inline-import '../shaders/atmosphere_vert.glsl' */
 var atmoSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nvarying float v_CamreaDistance;\n\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\nvarying float v_offset;\n\nvoid main() {\n    float EARTH_RADIUS = 100.0;\n    \n    v_Color = a_Color;\n\n    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 var isNumber = _l7Utils.lodashUtil.isNumber;
-var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
+var EarthAtomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(EarthAtomSphereModel, _BaseModel);
   var _super = _createSuper(EarthAtomSphereModel);
   function EarthAtomSphereModel() {
@@ -156,5 +156,4 @@ var EarthAtomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return EarthAtomSphereModel;
-}(_BaseModel2.default);
-exports.default = EarthAtomSphereModel;
+}(_BaseModel2.default);

package/lib/earth/models/base.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var baseFrag = "\nuniform sampler2D u_texture;\n\nvarying vec2 v_texCoord;\nvarying float v_lightWeight;\n\n\nvoid main() {\n\n    vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n    color.xyz = color.xyz * v_lightWeight;\n    gl_FragColor = color;\n}\n";
 /* babel-plugin-inline-import '../shaders/base_vert.glsl' */
 var baseVert = "// attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n\n// attribute vec2 a_Extrude;\n// attribute float a_Size;\n// attribute float a_Shape;\n\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform float u_ambientRatio : 0.5;\nuniform float u_diffuseRatio : 0.3;\nuniform float u_specularRatio : 0.2;\nuniform vec3 u_sunLight: [1.0, -10.5, 12.0];\n\n\n\nfloat calc_lighting(vec4 pos) {\n\n    vec3 worldPos = vec3(pos * u_ModelMatrix);\n\n    vec3 worldNormal = a_Normal;\n\n    // cal light weight\n    vec3 viewDir = normalize(u_CameraPosition - worldPos);\n\n    vec3 lightDir = normalize(u_sunLight);\n\n    vec3 halfDir = normalize(viewDir+lightDir);\n    // lambert\n    float lambert = dot(worldNormal, lightDir);\n    // specular\n    float specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);\n    //sum to light weight\n    float lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;\n\n    return lightWeight;\n}\n\nvarying float v_lightWeight;\nvoid main() {\n\n    v_texCoord = a_Uv;\n\n    float lightWeight = calc_lighting(vec4(a_Position, 1.0));\n    v_lightWeight = lightWeight;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
-var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
+var BaseEarthModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(BaseEarthModel, _BaseModel);
   var _super = _createSuper(BaseEarthModel);
   function BaseEarthModel() {
@@ -214,5 +214,4 @@ var BaseEarthModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return BaseEarthModel;
-}(_BaseModel2.default);
-exports.default = BaseEarthModel;
+}(_BaseModel2.default);

package/lib/earth/models/bloomsphere.js

@@ -23,7 +23,7 @@ var bloomSphereFrag = "\nuniform float u_opacity;\nuniform vec3 u_CameraPosition
 /* babel-plugin-inline-import '../shaders/bloomsphere_vert.glsl' */
 var bloomSphereVert = "\nattribute vec3 a_Position;\nattribute vec3 a_Normal;\nattribute vec2 a_Uv;\nattribute vec4 a_Color;\nuniform vec3 u_CameraPosition;\nuniform mat4 u_ViewProjectionMatrix;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_ViewMatrix;\n\nvarying vec3 vVertexNormal;\nvarying vec4 v_Color;\n\nvoid main() {\n    v_Color = a_Color;\n\n    vVertexNormal = a_Normal;\n\n    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);\n}\n";
 var isNumber = _l7Utils.lodashUtil.isNumber;
-var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
+var EarthBloomSphereModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(EarthBloomSphereModel, _BaseModel);
   var _super = _createSuper(EarthBloomSphereModel);
   function EarthBloomSphereModel() {
@@ -155,5 +155,4 @@ var EarthBloomSphereModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return EarthBloomSphereModel;
-}(_BaseModel2.default);
-exports.default = EarthBloomSphereModel;
+}(_BaseModel2.default);

package/lib/earth/utils.js

@@ -12,18 +12,15 @@ var _glMatrix = require("gl-matrix");
 // 该文件专门记录地球模式的数值
 
 // 地球网格半径
-var EARTH_RADIUS = 100;
-exports.EARTH_RADIUS = EARTH_RADIUS;
-var EARTH_SEGMENTS = 36;
-exports.EARTH_SEGMENTS = EARTH_SEGMENTS;
-var EARTH_RADIUS_OUTER = 40;
+var EARTH_RADIUS = exports.EARTH_RADIUS = 100;
+var EARTH_SEGMENTS = exports.EARTH_SEGMENTS = 36;
+var EARTH_RADIUS_OUTER = exports.EARTH_RADIUS_OUTER = 40;
 
 /**
  * 角度转弧度
  * @param deg
  * @returns
  */
-exports.EARTH_RADIUS_OUTER = EARTH_RADIUS_OUTER;
 function torad(deg) {
   return deg / 180 * Math.acos(-1);
 }

package/lib/geometry/index.js

@@ -18,7 +18,7 @@ var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
 var _models = _interopRequireDefault(require("./models"));
 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 GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
+var GeometryLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(GeometryLayer, _BaseLayer);
   var _super = _createSuper(GeometryLayer);
   function GeometryLayer() {
@@ -83,7 +83,7 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       var _shapeAttribute$scale;
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
+      var shape = shapeAttribute === null || shapeAttribute === void 0 || (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
       if (shape === 'plane') {
         return 'plane';
       } else if (shape === 'sprite') {
@@ -96,5 +96,4 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return GeometryLayer;
-}(_BaseLayer2.default);
-exports.default = GeometryLayer;
+}(_BaseLayer2.default);

package/lib/geometry/models/billboard.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"picking\"\nvoid main() {\n  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
 var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform float u_raisingHeight: 0.0;\nuniform float u_opacity;\nuniform vec2 u_size: [1.0, 1.0];\nuniform mat2 u_RotateMatrix;\n\nattribute vec3 a_Extrude;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   float raiseHeight = u_raisingHeight;\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raiseHeight = u_raisingHeight * mapboxZoomScale;\n   }\n\n   // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n   // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));\n   // \u7ED5 z \u8F74\u65CB\u8F6C\n   float x = project_pos.x + offsetXY.x;\n   float y = project_pos.y + offsetXY.y;\n   // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n   float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\n   gl_Position = project_common_position_to_clipspace_v2(vec4(x , y, z , 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
-var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
+var BillBoardModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(BillBoardModel, _BaseModel);
   var _super = _createSuper(BillBoardModel);
   function BillBoardModel() {
@@ -86,7 +86,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
     }
   }, {
     key: "initModels",
@@ -214,5 +214,4 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return BillBoardModel;
-}(_BaseModel2.default);
-exports.default = BillBoardModel;
+}(_BaseModel2.default);

package/lib/geometry/models/index.js

@@ -13,5 +13,4 @@ var GeometryModels = {
   sprite: _sprite.default,
   billboard: _billboard.default
 };
-var _default = GeometryModels;
-exports.default = _default;
+var _default = exports.default = GeometryModels;

package/lib/geometry/models/plane.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_mapFlag;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\nvarying float v_clip;\n\n#pragma include \"picking\"\nvoid main() {\n  // gl_FragColor = vec4(v_Color, u_opacity);\n  if(u_mapFlag > 0.0) {\n    gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n    gl_FragColor.a *= u_opacity;\n  } else {\n    // gl_FragColor = vec4(v_uv, 0.0, u_opacity);\n    gl_FragColor = vec4(v_Color, u_opacity);\n  }\n  gl_FragColor.a *= v_clip;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/plane_vert.glsl' */
 var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\nuniform float u_opacity;\nuniform float u_terrainClipHeight;\n\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\nvarying float v_clip;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   v_Color = a_Color;\n   v_uv = a_Uv;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_clip = 1.0;\n   if(a_Position.z < u_terrainClipHeight) {\n      v_clip = 0.0;\n   }\n  \n  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy, a_Position.z, 1.0));\n\n   setPickingColor(a_PickingColor);\n}\n";
-var PlaneModel = /*#__PURE__*/function (_BaseModel) {
+var PlaneModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(PlaneModel, _BaseModel);
   var _super = _createSuper(PlaneModel);
   function PlaneModel() {
@@ -129,7 +129,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       if (this.mapTexture !== mapTexture) {
         var _this$texture;
         this.mapTexture = mapTexture;
-        (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
+        (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
         this.updateTexture(mapTexture);
       }
       return {
@@ -145,7 +145,7 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
       var _this$texture2;
       // @ts-ignore
       this.terrainImage = null;
-      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
+      (_this$texture2 = this.texture) === null || _this$texture2 === void 0 || _this$texture2.destroy();
     }
   }, {
     key: "initModels",
@@ -378,5 +378,4 @@ var PlaneModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return PlaneModel;
-}(_BaseModel2.default);
-exports.default = PlaneModel;
+}(_BaseModel2.default);