@antv/l7-layers 2.19.11 → 2.20.1

package/lib/plugins/LayerAnimateStylePlugin.js

@@ -11,7 +11,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _inversify = require("inversify");
 require("reflect-metadata");
 var _dec, _class;
-var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerAnimateStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerAnimateStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerAnimateStylePlugin);
   }
@@ -30,5 +30,4 @@ var LayerAnimateStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class
     }
   }]);
   return LayerAnimateStylePlugin;
-}()) || _class);
-exports.default = LayerAnimateStylePlugin;
+}()) || _class);

package/lib/plugins/LayerMaskPlugin.js

@@ -14,7 +14,7 @@ var _dec, _class;
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerStylePlugin);
   }
@@ -37,5 +37,4 @@ var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
-exports.default = LayerStylePlugin;
+}()) || _class);

package/lib/plugins/LayerModelPlugin.js

@@ -17,7 +17,7 @@ var _dec, _class;
 /**
  * Layer Model 初始化，更新，销毁
  */
-var LayerModelPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerModelPlugin() {
     (0, _classCallCheck2.default)(this, LayerModelPlugin);
   }
@@ -152,5 +152,4 @@ var LayerModelPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
     }
   }]);
   return LayerModelPlugin;
-}()) || _class);
-exports.default = LayerModelPlugin;
+}()) || _class);

package/lib/plugins/LayerStylePlugin.js

@@ -13,7 +13,7 @@ var _dec, _class;
 /**
  * 更新图层样式，初始图层相关配置
  */
-var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LayerStylePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LayerStylePlugin() {
     (0, _classCallCheck2.default)(this, LayerStylePlugin);
   }
@@ -33,5 +33,4 @@ var LayerStylePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__
     }
   }]);
   return LayerStylePlugin;
-}()) || _class);
-exports.default = LayerStylePlugin;
+}()) || _class);

package/lib/plugins/LightingPlugin.js

@@ -80,7 +80,7 @@ function generateLightingUniforms(lights) {
 /**
  * 光照 & Shadow
  */
-var LightingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var LightingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function LightingPlugin() {
     (0, _classCallCheck2.default)(this, LightingPlugin);
   }
@@ -102,5 +102,4 @@ var LightingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PU
     }
   }]);
   return LightingPlugin;
-}()) || _class);
-exports.default = LightingPlugin;
+}()) || _class);

package/lib/plugins/MultiPassRendererPlugin.js

@@ -24,7 +24,7 @@ var _dec, _class;
  *   ],
  * })
  */
-var MultiPassRendererPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var MultiPassRendererPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function MultiPassRendererPlugin() {
     (0, _classCallCheck2.default)(this, MultiPassRendererPlugin);
   }
@@ -62,5 +62,4 @@ var MultiPassRendererPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class
     }
   }]);
   return MultiPassRendererPlugin;
-}()) || _class);
-exports.default = MultiPassRendererPlugin;
+}()) || _class);

package/lib/plugins/PixelPickingPlugin.js

@@ -7,24 +7,81 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _inversify = require("inversify");
 require("reflect-metadata");
+var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
 var _dec, _class;
 var PickingStage = {
   NONE: 0.0,
   ENCODE: 1.0,
   HIGHLIGHT: 2.0
 };
-var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var PixelPickingPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function PixelPickingPlugin() {
     (0, _classCallCheck2.default)(this, PixelPickingPlugin);
+    (0, _defineProperty2.default)(this, "PickOption", {
+      u_HighlightColor: [1, 0, 0, 1],
+      u_SelectColor: [1, 0, 0, 1],
+      u_PickingColor: [0, 0, 0],
+      u_PickingStage: 0,
+      u_CurrentSelectedId: [0, 0, 0],
+      u_PickingThreshold: 10,
+      u_PickingBuffer: 0,
+      // TODO: 更新机制
+      u_shaderPick: 0,
+      u_EnableSelect: 0,
+      u_activeMix: 0
+    });
   }
   (0, _createClass2.default)(PixelPickingPlugin, [{
+    key: "pickOption2Array",
+    value: function pickOption2Array() {
+      return Object.values(this.PickOption).flat();
+    }
+  }, {
+    key: "updatePickOption",
+    value: function updatePickOption(option, rendererService) {
+      var _this = this;
+      Object.keys(option).forEach(function (key) {
+        _this.PickOption[key] = option[key];
+      });
+      rendererService.uniformBuffers[1].subData({
+        offset: 0,
+        data: new Uint8Array(new Float32Array(this.pickOption2Array()))
+      });
+    }
+  }, {
     key: "apply",
     value: function apply(layer, _ref) {
-      var styleAttributeService = _ref.styleAttributeService;
+      var _this2 = this;
+      var rendererService = _ref.rendererService,
+        styleAttributeService = _ref.styleAttributeService;
+      if (!rendererService.uniformBuffers[1]) {
+        // Create a Uniform Buffer Object(UBO).
+        var uniformBuffer = rendererService.createBuffer({
+          // vec4 u_HighlightColor;
+          // vec4 u_SelectColor;
+          // vec3 u_PickingColor;
+          // float u_PickingStage;
+          // vec3 u_CurrentSelectedId;
+          // float u_PickingThreshold;
+          // float u_PickingBuffer;
+          // float u_shaderPick;
+          // float u_EnableSelect;
+          // float u_activeMix;
+          data: new Float32Array(this.pickOption2Array().length),
+          isUBO: true
+        });
+        rendererService.uniformBuffers[1] = uniformBuffer;
+        this.updatePickOption({}, rendererService);
+      }
+      // u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
+      // // Tip: 当前地图是否在拖动
+      // u_shaderPick: Number(layer.getShaderPickStat()),
+
       // TODO: 由于 Shader 目前无法根据是否开启拾取进行内容修改，因此即使不开启也需要生成 a_PickingColor
       layer.hooks.init.tapPromise('PixelPickingPlugin', function () {
         var _layer$getLayerConfig = layer.getLayerConfig(),
@@ -34,6 +91,7 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
           type: _l7Core.AttributeType.Attribute,
           descriptor: {
             name: 'a_PickingColor',
+            shaderLocation: _CommonStyleAttribute.ShaderLocation.PICKING_COLOR,
             buffer: {
               data: [],
               type: _l7Core.gl.FLOAT
@@ -53,6 +111,9 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         var _layer$getLayerConfig2 = layer.getLayerConfig(),
           enablePicking = _layer$getLayerConfig2.enablePicking;
         if (enablePicking && layer.isVisible()) {
+          _this2.updatePickOption({
+            u_PickingStage: PickingStage.ENCODE
+          }, rendererService);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.ENCODE
@@ -65,6 +126,9 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
           enablePicking = _layer$getLayerConfig3.enablePicking;
         // 区分选中高亮 和滑过高亮
         if (enablePicking && layer.isVisible()) {
+          _this2.updatePickOption({
+            u_PickingStage: PickingStage.HIGHLIGHT
+          }, rendererService);
           layer.models.forEach(function (model) {
             return model.addUniforms({
               u_PickingStage: PickingStage.HIGHLIGHT
@@ -81,15 +145,17 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         layer.updateLayerConfig({
           pickedFeatureID: (0, _l7Utils.decodePickingColor)(new Uint8Array(pickedColor))
         });
+        var option = {
+          u_PickingStage: PickingStage.HIGHLIGHT,
+          u_PickingColor: pickedColor,
+          u_HighlightColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_activeMix: activeMix
+        };
+        _this2.updatePickOption(option, rendererService);
         layer.models.forEach(function (model) {
-          return model.addUniforms({
-            u_PickingStage: PickingStage.HIGHLIGHT,
-            u_PickingColor: pickedColor,
-            u_HighlightColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_activeMix: activeMix
-          });
+          return model.addUniforms(option);
         });
       });
       layer.hooks.beforeSelect.tap('PixelPickingPlugin', function (pickedColor) {
@@ -101,24 +167,26 @@ var PixelPickingPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#
         layer.updateLayerConfig({
           pickedFeatureID: (0, _l7Utils.decodePickingColor)(new Uint8Array(pickedColor))
         });
+        var option = {
+          u_PickingStage: PickingStage.HIGHLIGHT,
+          u_PickingColor: pickedColor,
+          u_HighlightColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_activeMix: selectMix,
+          u_CurrentSelectedId: pickedColor,
+          u_SelectColor: highlightColorInArray.map(function (c) {
+            return c * 255;
+          }),
+          u_EnableSelect: 1
+        };
+        console.log(option);
+        _this2.updatePickOption(option, rendererService);
         layer.models.forEach(function (model) {
-          return model.addUniforms({
-            u_PickingStage: PickingStage.HIGHLIGHT,
-            u_PickingColor: pickedColor,
-            u_HighlightColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_activeMix: selectMix,
-            u_CurrentSelectedId: pickedColor,
-            u_SelectColor: highlightColorInArray.map(function (c) {
-              return c * 255;
-            }),
-            u_EnableSelect: 1
-          });
+          return model.addUniforms(option);
         });
       });
     }
   }]);
   return PixelPickingPlugin;
-}()) || _class);
-exports.default = PixelPickingPlugin;
+}()) || _class);

package/lib/plugins/RegisterStyleAttributePlugin.js

@@ -10,12 +10,13 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _l7Core = require("@antv/l7-core");
 var _inversify = require("inversify");
 require("reflect-metadata");
+var _CommonStyleAttribute = require("../core/CommonStyleAttribute");
 var _utils = require("../tile/utils/utils");
 var _dec, _class;
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var RegisterStyleAttributePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function RegisterStyleAttributePlugin() {
     (0, _classCallCheck2.default)(this, RegisterStyleAttributePlugin);
   }
@@ -54,6 +55,7 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Position',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.POSITION,
           buffer: {
             data: [],
             type: _l7Core.gl.FLOAT
@@ -65,28 +67,6 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         }
       });
     }
-  }, {
-    key: "registerFilterAttribute",
-    value: function registerFilterAttribute(styleAttributeService) {
-      styleAttributeService.registerStyleAttribute({
-        name: 'filter',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'filter',
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 1,
-          update: function update(feature) {
-            var filter = feature.filter;
-            return filter ? [1] : [0];
-          }
-        }
-      });
-    }
   }, {
     key: "registerColorAttribute",
     value: function registerColorAttribute(styleAttributeService) {
@@ -95,6 +75,7 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_Color',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.COLOR,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -118,6 +99,7 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
         type: _l7Core.AttributeType.Attribute,
         descriptor: {
           name: 'a_vertexId',
+          shaderLocation: _CommonStyleAttribute.ShaderLocation.VERTEX_ID,
           buffer: {
             // give the WebGL driver a hint that this buffer may change
             usage: _l7Core.gl.DYNAMIC_DRAW,
@@ -133,5 +115,4 @@ var RegisterStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_c
     }
   }]);
   return RegisterStyleAttributePlugin;
-}()) || _class);
-exports.default = RegisterStyleAttributePlugin;
+}()) || _class);

package/lib/plugins/ShaderUniformPlugin.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _initializerDefineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/initializerDefineProperty"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -14,7 +16,7 @@ var _initializerWarningHelper2 = _interopRequireDefault(require("@babel/runtime/
 var _l7Core = require("@antv/l7-core");
 var _inversify = require("inversify");
 require("reflect-metadata");
-var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4;
+var _dec, _dec2, _dec3, _dec4, _dec5, _dec6, _class, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
 /**
  * 在渲染之前需要获取当前 Shader 所需 Uniform，例如：
  * 1. 从相机服务中获取 View & ProjectionMatrix，当前缩放等级等等
@@ -22,13 +24,14 @@ var _dec, _dec2, _dec3, _dec4, _dec5, _class, _class2, _descriptor, _descriptor2
  *    @see https://yuque.antfin-inc.com/yuqi.pyq/fgetpa/doml91
  * 3. 当前 Layer 本身的样式属性
  */
-var ShaderUniformPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.ICameraService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.ICoordinateSystemService), _dec4 = (0, _inversify.inject)(_l7Core.TYPES.IRendererService), _dec5 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec(_class = (_class2 = /*#__PURE__*/function () {
+var ShaderUniformPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inversify.inject)(_l7Core.TYPES.ICameraService), _dec3 = (0, _inversify.inject)(_l7Core.TYPES.ICoordinateSystemService), _dec4 = (0, _inversify.inject)(_l7Core.TYPES.IRendererService), _dec5 = (0, _inversify.inject)(_l7Core.TYPES.IMapService), _dec6 = (0, _inversify.inject)(_l7Core.TYPES.ILayerService), _dec(_class = (_class2 = /*#__PURE__*/function () {
   function ShaderUniformPlugin() {
     (0, _classCallCheck2.default)(this, ShaderUniformPlugin);
     (0, _initializerDefineProperty2.default)(this, "cameraService", _descriptor, this);
     (0, _initializerDefineProperty2.default)(this, "coordinateSystemService", _descriptor2, this);
     (0, _initializerDefineProperty2.default)(this, "rendererService", _descriptor3, this);
     (0, _initializerDefineProperty2.default)(this, "mapService", _descriptor4, this);
+    (0, _initializerDefineProperty2.default)(this, "layerService", _descriptor5, this);
   }
   (0, _createClass2.default)(ShaderUniformPlugin, [{
     key: "apply",
@@ -37,6 +40,15 @@ var ShaderUniformPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inv
       var version = this.mapService.version;
       var mvp = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1]; // default matrix (for gaode2.x)
       var sceneCenterMercator = [0, 0];
+      var uniformBuffer;
+      if (!this.rendererService.uniformBuffers[0]) {
+        // Create a Uniform Buffer Object(UBO).
+        uniformBuffer = this.rendererService.createBuffer({
+          data: new Float32Array(16 * 5 + 4 * 6 + 4),
+          isUBO: true
+        });
+        this.rendererService.uniformBuffers[0] = uniformBuffer;
+      }
       layer.hooks.beforeRender.tap('ShaderUniformPlugin', function () {
         // @ts-ignore
         var offset = layer.getLayerConfig().tileOrigin;
@@ -53,12 +65,25 @@ var ShaderUniformPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inv
         var _this$rendererService = _this.rendererService.getViewportSize(),
           width = _this$rendererService.width,
           height = _this$rendererService.height;
+        var _this$generateUBO = _this.generateUBO(mvp, sceneCenterMercator, width, height),
+          data = _this$generateUBO.data,
+          uniforms = _this$generateUBO.uniforms;
+        if (_this.layerService.alreadyInRendering && uniformBuffer) {
+          // Update only once since all models can share one UBO.
+          uniformBuffer.subData({
+            offset: 0,
+            data: data
+          });
+        }
+        // For WebGL1. regl
         layer.models.forEach(function (model) {
-          var _model$addUniforms;
-          model.addUniforms((_model$addUniforms = {}, (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CameraUniform.ProjectionMatrix, _this.cameraService.getProjectionMatrix()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CameraUniform.ViewMatrix, _this.cameraService.getViewMatrix()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CameraUniform.ViewProjectionMatrix, _this.cameraService.getViewProjectionMatrix()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CameraUniform.Zoom, _this.cameraService.getZoom()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CameraUniform.ZoomScale, _this.cameraService.getZoomScale()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CameraUniform.FocalDistance, _this.cameraService.getFocalDistance()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CameraUniform.CameraPosition, _this.cameraService.getCameraPosition()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CoordinateUniform.CoordinateSystem, _this.coordinateSystemService.getCoordinateSystem()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CoordinateUniform.ViewportCenter, _this.coordinateSystemService.getViewportCenter()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CoordinateUniform.ViewportCenterProjection, _this.coordinateSystemService.getViewportCenterProjection()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CoordinateUniform.PixelsPerDegree, _this.coordinateSystemService.getPixelsPerDegree()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CoordinateUniform.PixelsPerDegree2, _this.coordinateSystemService.getPixelsPerDegree2()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CoordinateUniform.PixelsPerMeter, _this.coordinateSystemService.getPixelsPerMeter()), (0, _defineProperty2.default)(_model$addUniforms, _l7Core.CoordinateUniform.Mvp, mvp), (0, _defineProperty2.default)(_model$addUniforms, "u_sceneCenterMercator", sceneCenterMercator), (0, _defineProperty2.default)(_model$addUniforms, "u_ViewportSize", [width, height]), (0, _defineProperty2.default)(_model$addUniforms, "u_ModelMatrix", _this.cameraService.getModelMatrix()), (0, _defineProperty2.default)(_model$addUniforms, "u_DevicePixelRatio", window.devicePixelRatio), (0, _defineProperty2.default)(_model$addUniforms, "u_PickingBuffer", layer.getLayerConfig().pickingBuffer || 0), (0, _defineProperty2.default)(_model$addUniforms, "u_shaderPick", Number(layer.getShaderPickStat())), _model$addUniforms));
+          model.addUniforms((0, _objectSpread2.default)((0, _objectSpread2.default)({}, uniforms), {}, {
+            // TODO: move these 2 uniforms to PixelPickingPlugin
+            u_PickingBuffer: layer.getLayerConfig().pickingBuffer || 0,
+            // Tip: 当前地图是否在拖动
+            u_shaderPick: Number(layer.getShaderPickStat())
+          }));
         });
-
-        // TODO：脏检查，决定是否需要渲染
       });
     }
 
@@ -76,6 +101,44 @@ var ShaderUniformPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inv
         this.mapService.setCoordCenter(layer.coordCenter);
       }
     }
+  }, {
+    key: "generateUBO",
+    value: function generateUBO(u_Mvp, sceneCenterMercator, width, height) {
+      var _uniforms;
+      var u_ProjectionMatrix = this.cameraService.getProjectionMatrix();
+      var u_ViewMatrix = this.cameraService.getViewMatrix();
+      var u_ViewProjectionMatrix = this.cameraService.getViewProjectionMatrix();
+      var u_ModelMatrix = this.cameraService.getModelMatrix();
+      var u_ViewportCenterProjection = this.coordinateSystemService.getViewportCenterProjection();
+      var u_PixelsPerDegree = this.coordinateSystemService.getPixelsPerDegree();
+      var u_Zoom = this.cameraService.getZoom();
+      var u_PixelsPerDegree2 = this.coordinateSystemService.getPixelsPerDegree2();
+      var u_ZoomScale = this.cameraService.getZoomScale();
+      var u_PixelsPerMeter = this.coordinateSystemService.getPixelsPerMeter();
+      var u_CoordinateSystem = this.coordinateSystemService.getCoordinateSystem();
+      var u_CameraPosition = this.cameraService.getCameraPosition();
+      var u_DevicePixelRatio = window.devicePixelRatio;
+      var u_ViewportCenter = this.coordinateSystemService.getViewportCenter();
+      var u_ViewportSize = [width, height];
+      var u_FocalDistance = this.cameraService.getFocalDistance();
+      var data = [].concat((0, _toConsumableArray2.default)(u_ViewMatrix), (0, _toConsumableArray2.default)(u_ProjectionMatrix), (0, _toConsumableArray2.default)(u_ViewProjectionMatrix), (0, _toConsumableArray2.default)(u_ModelMatrix), (0, _toConsumableArray2.default)(u_Mvp), (0, _toConsumableArray2.default)(u_ViewportCenterProjection), (0, _toConsumableArray2.default)(u_PixelsPerDegree), [
+      // 4
+      u_Zoom], (0, _toConsumableArray2.default)(u_PixelsPerDegree2), [
+      // 4
+      u_ZoomScale], (0, _toConsumableArray2.default)(u_PixelsPerMeter), [
+      // 4
+      u_CoordinateSystem], (0, _toConsumableArray2.default)(u_CameraPosition), [
+      // 4
+      u_DevicePixelRatio], (0, _toConsumableArray2.default)(u_ViewportCenter), u_ViewportSize, (0, _toConsumableArray2.default)(sceneCenterMercator), [
+      // 2
+      u_FocalDistance,
+      // 1
+      0]);
+      return {
+        data: data,
+        uniforms: (_uniforms = {}, (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ProjectionMatrix, u_ProjectionMatrix), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ViewMatrix, u_ViewMatrix), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ViewProjectionMatrix, u_ViewProjectionMatrix), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.Zoom, u_Zoom), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.ZoomScale, u_ZoomScale), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.FocalDistance, u_FocalDistance), (0, _defineProperty2.default)(_uniforms, _l7Core.CameraUniform.CameraPosition, u_CameraPosition), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.CoordinateSystem, u_CoordinateSystem), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.ViewportCenter, u_ViewportCenter), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.ViewportCenterProjection, u_ViewportCenterProjection), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.PixelsPerDegree, u_PixelsPerDegree), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.PixelsPerDegree2, u_PixelsPerDegree2), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.PixelsPerMeter, u_PixelsPerMeter), (0, _defineProperty2.default)(_uniforms, _l7Core.CoordinateUniform.Mvp, u_Mvp), (0, _defineProperty2.default)(_uniforms, "u_sceneCenterMercator", sceneCenterMercator), (0, _defineProperty2.default)(_uniforms, "u_ViewportSize", u_ViewportSize), (0, _defineProperty2.default)(_uniforms, "u_ModelMatrix", u_ModelMatrix), (0, _defineProperty2.default)(_uniforms, "u_DevicePixelRatio", u_DevicePixelRatio), _uniforms)
+      };
+    }
   }]);
   return ShaderUniformPlugin;
 }(), (_descriptor = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "cameraService", [_dec2], {
@@ -98,5 +161,9 @@ var ShaderUniformPlugin = (_dec = (0, _inversify.injectable)(), _dec2 = (0, _inv
   enumerable: true,
   writable: true,
   initializer: null
-})), _class2)) || _class);
-exports.default = ShaderUniformPlugin;
+}), _descriptor5 = (0, _applyDecoratedDescriptor2.default)(_class2.prototype, "layerService", [_dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+})), _class2)) || _class);

package/lib/plugins/UpdateModelPlugin.js

@@ -13,7 +13,7 @@ var _dec, _class;
 /**
  * Model 更新
  */
-var UpdateModelPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var UpdateModelPlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function UpdateModelPlugin() {
     (0, _classCallCheck2.default)(this, UpdateModelPlugin);
   }
@@ -36,5 +36,4 @@ var UpdateModelPlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#_
     }
   }]);
   return UpdateModelPlugin;
-}()) || _class);
-exports.default = UpdateModelPlugin;
+}()) || _class);

package/lib/plugins/UpdateStyleAttributePlugin.js

@@ -13,7 +13,7 @@ var _dec, _class;
 /**
  * 在初始化阶段完成属性的注册，以及首次根据 Layer 指定的三角化方法完成 indices 和 attribute 的创建
  */
-var UpdateStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
+var UpdateStyleAttributePlugin = exports.default = (_dec = (0, _inversify.injectable)(), _dec(_class = /*#__PURE__*/function () {
   function UpdateStyleAttributePlugin() {
     (0, _classCallCheck2.default)(this, UpdateStyleAttributePlugin);
   }
@@ -78,5 +78,4 @@ var UpdateStyleAttributePlugin = (_dec = (0, _inversify.injectable)(), _dec(_cla
     }
   }]);
   return UpdateStyleAttributePlugin;
-}()) || _class);
-exports.default = UpdateStyleAttributePlugin;
+}()) || _class);

package/lib/point/index.js

@@ -21,7 +21,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 PointLayer = /*#__PURE__*/function (_BaseLayer) {
+var PointLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(PointLayer, _BaseLayer);
   var _super = _createSuper(PointLayer);
   function PointLayer() {
@@ -32,7 +32,7 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'PointLayer');
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['opacity', 'offsets', 'stroke', 'rotation']);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableShaderEncodeStyles", ['stroke', 'offsets', 'opacity', 'rotation']);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "enableDataEncodeStyles", ['textOffset', 'textAnchor']);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
       data: [],
@@ -209,5 +209,4 @@ var PointLayer = /*#__PURE__*/function (_BaseLayer) {
     }
   }]);
   return PointLayer;
-}(_BaseLayer2.default);
-exports.default = PointLayer;
+}(_BaseLayer2.default);

package/lib/point/models/billboard_point.js

@@ -31,7 +31,7 @@ function PointTriangulation(feature) {
     size: coordinates.length
   };
 }
-var SimplePointModel = /*#__PURE__*/function (_BaseModel) {
+var SimplePointModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(SimplePointModel, _BaseModel);
   var _super = _createSuper(SimplePointModel);
   function SimplePointModel() {
@@ -146,5 +146,4 @@ var SimplePointModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return SimplePointModel;
-}(_BaseModel2.default);
-exports.default = SimplePointModel;
+}(_BaseModel2.default);

package/lib/point/models/earthExtrude.js

@@ -26,7 +26,7 @@ var pointExtrudeFrag = "varying vec4 v_color;\nuniform float u_opacity: 1.0;\n\n
 /* babel-plugin-inline-import '../shaders/earth/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_globel;\nuniform float u_r;\nuniform mat4 u_ModelMatrix;\n\nvarying vec4 v_color;\n\nuniform float u_opacity : 1;\nuniform float u_lightEnable: 1;\nvarying float v_lightWeight;\nvarying float v_barLinearZ;\n// \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\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  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n  vec3 size = a_Size * a_Position;\n\n  // a_Position.z \u662F\u5728\u6784\u5EFA\u7F51\u683C\u7684\u65F6\u5019\u4F20\u5165\u7684\u6807\u51C6\u503C 0 - 1\uFF0C\u5728\u63D2\u503C\u5668\u63D2\u503C\u53EF\u4EE5\u83B7\u53D6 0\uFF5E1 \u7EBF\u6027\u6E10\u53D8\u7684\u503C\n  v_barLinearZ =  a_Position.z;\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  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  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  v_lightWeight = lightWeight;\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, barLinearZ);\n    v_color.rgb *= lightWeight;\n  } else { // \u4F7F\u7528 color \u65B9\u6CD5\u4F20\u5165\u7684\u989C\u8272\n     v_color = a_Color;\n  }\n  v_color.a *= u_opacity;\n\n    \n  // \u5728\u5730\u7403\u6A21\u5F0F\u4E0B\uFF0C\u5C06\u539F\u672C\u5782\u76F4\u4E8E xy \u5E73\u9762\u7684\u5706\u67F1\u8C03\u6574\u59FF\u6001\u5230\u9002\u5E94\u5706\u7684\u89D2\u5EA6\n  //\u65CB\u8F6C\u77E9\u9635mx\uFF0C\u521B\u5EFA\u7ED5x\u8F74\u65CB\u8F6C\u77E9\u9635\n  float r = sqrt(a_Pos.z*a_Pos.z + a_Pos.x*a_Pos.x);\n  float xRadian = getXRadian(a_Pos.y, r);\n  float xcos = cos(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n  float xsin = sin(xRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n  mat4 mx = mat4(\n    1,0,0,0,  \n    0,xcos,-xsin,0,  \n    0,xsin,xcos,0,  \n    0,0,0,1);\n\n  //\u65CB\u8F6C\u77E9\u9635my\uFF0C\u521B\u5EFA\u7ED5y\u8F74\u65CB\u8F6C\u77E9\u9635\n  float yRadian = getYRadian(a_Pos.x, a_Pos.z);\n  float ycos = cos(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u4F59\u5F26\u503C\n  float ysin = sin(yRadian);//\u6C42\u89E3\u65CB\u8F6C\u89D2\u5EA6\u6B63\u5F26\u503C\n  mat4 my = mat4(\n    ycos,0,-ysin,0,  \n    0,1,0,0,  \n    ysin,0,ycos,0,  \n    0,0,0,1);\n\n  gl_Position = u_ViewProjectionMatrix * vec4(( my * mx *  vec4(a_Position * a_Size, 1.0)).xyz + a_Pos, 1.0);\n  \n\n  setPickingColor(a_PickingColor);\n}\n";
 var isNumber = _l7Utils.lodashUtil.isNumber;
-var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
+var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ExtrudeModel, _BaseModel);
   var _super = _createSuper(ExtrudeModel);
   function ExtrudeModel() {
@@ -237,5 +237,4 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return ExtrudeModel;
-}(_BaseModel2.default);
-exports.default = ExtrudeModel;
+}(_BaseModel2.default);

package/lib/point/models/earthFill.js

@@ -25,7 +25,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var pointFillFrag = "uniform float u_additive;\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\n#pragma include \"sdf_2d\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  int shape = int(floor(v_data.w + 0.5));\n\n  vec4 strokeColor = textrueStroke == vec4(0) ? v_color : textrueStroke;\n\n  lowp float antialiasblur = v_data.z;\n  float r = v_radius / (v_radius + strokeWidth);\n\n  float outer_df;\n  float inner_df;\n  // 'circle', 'triangle', 'square', 'pentagon', 'hexagon', 'octogon', 'hexagram', 'rhombus', 'vesica'\n  if (shape == 0) {\n    outer_df = sdCircle(v_data.xy, 1.0);\n    inner_df = sdCircle(v_data.xy, r);\n  } else if (shape == 1) {\n    outer_df = sdEquilateralTriangle(1.1 * v_data.xy);\n    inner_df = sdEquilateralTriangle(1.1 / r * v_data.xy);\n  } else if (shape == 2) {\n    outer_df = sdBox(v_data.xy, vec2(1.));\n    inner_df = sdBox(v_data.xy, vec2(r));\n  } else if (shape == 3) {\n    outer_df = sdPentagon(v_data.xy, 0.8);\n    inner_df = sdPentagon(v_data.xy, r * 0.8);\n  } else if (shape == 4) {\n    outer_df = sdHexagon(v_data.xy, 0.8);\n    inner_df = sdHexagon(v_data.xy, r * 0.8);\n  } else if (shape == 5) {\n    outer_df = sdOctogon(v_data.xy, 1.0);\n    inner_df = sdOctogon(v_data.xy, r);\n  } else if (shape == 6) {\n    outer_df = sdHexagram(v_data.xy, 0.52);\n    inner_df = sdHexagram(v_data.xy, r * 0.52);\n  } else if (shape == 7) {\n    outer_df = sdRhombus(v_data.xy, vec2(1.0));\n    inner_df = sdRhombus(v_data.xy, vec2(r));\n  } else if (shape == 8) {\n    outer_df = sdVesica(v_data.xy, 1.1, 0.8);\n    inner_df = sdVesica(v_data.xy, r * 1.1, r * 0.8);\n  }\n\n  if(outer_df > antialiasblur + 0.018) discard;\n\n  float opacity_t = smoothstep(0.0, antialiasblur, outer_df);\n\n  float color_t = strokeWidth < 0.01 ? 0.0 : smoothstep(\n    antialiasblur,\n    0.0,\n    inner_df\n  );\n\n  if(strokeWidth < 0.01) {\n    gl_FragColor = vec4(v_color.rgb, v_color.a * u_opacity);\n  } else {\n    gl_FragColor = mix(vec4(v_color.rgb, v_color.a * u_opacity), u_stroke_color * u_stroke_opacity, color_t);\n  }\n\n  if(u_additive > 0.0) {\n    gl_FragColor *= opacity_t;\n    gl_FragColor = filterColorAlpha(gl_FragColor, gl_FragColor.a);\n  } else {\n    gl_FragColor.a *= opacity_t;\n    gl_FragColor = filterColor(gl_FragColor);\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/earth/fill_vert.glsl' */
 var pointFillVert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nattribute vec3 a_Extrude;\nattribute float a_Size;\nattribute float a_Shape;\nuniform mat4 u_ModelMatrix;\n\n\nvarying vec4 v_data;\nvarying vec4 v_color;\nvarying float v_radius;\n\nuniform float u_opacity : 1;\nuniform float u_stroke_opacity : 1;\nuniform float u_stroke_width : 2;\nuniform vec4 u_stroke_color : [0.0, 0.0, 0.0, 0.0];\nuniform vec2 u_offsets;\n\nuniform float u_blur : 0.0;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\n\nvoid main() {\n  vec3 extrude = a_Extrude;\n  float shape_type = a_Shape;\n  /*\n  *  setPickingSize \u8BBE\u7F6E\u62FE\u53D6\u5927\u5C0F\n  */\n  float newSize = setPickingSize(a_Size);\n  // float newSize = setPickingSize(a_Size) * 0.00001038445708445579;\n\n  // unpack color(vec2)\n  v_color = a_Color;\n\n  // radius(16-bit)\n  v_radius = newSize;\n\n  // anti-alias\n  //  float antialiased_blur = -max(u_blur, antialiasblur);\n  float antialiasblur = -max(2.0 / u_DevicePixelRatio / newSize, u_blur);\n\n  // TODP: /abs(extrude.x) \u662F\u4E3A\u4E86\u517C\u5BB9\u5730\u7403\u6A21\u5F0F\n  v_data = vec4(extrude.x/abs(extrude.x), extrude.y/abs(extrude.y), antialiasblur,shape_type);\n\n\n  gl_Position = u_ViewProjectionMatrix * vec4(a_Position + extrude * newSize * 0.1 + u_offsets, 1.0);\n\n  setPickingColor(a_PickingColor);\n}\n";
-var FillModel = /*#__PURE__*/function (_BaseModel) {
+var FillModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(FillModel, _BaseModel);
   var _super = _createSuper(FillModel);
   function FillModel() {
@@ -221,5 +221,4 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return FillModel;
-}(_BaseModel2.default);
-exports.default = FillModel;
+}(_BaseModel2.default);

package/lib/point/models/extrude.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 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";
 /* 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(pos);\n\n  gl_Position = project_common_position_to_clipspace_v2(pos);\n\n  setPickingColor(a_PickingColor);\n}\n";
-var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
+var ExtrudeModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(ExtrudeModel, _BaseModel);
   var _super = _createSuper(ExtrudeModel);
   function ExtrudeModel() {
@@ -236,5 +236,4 @@ var ExtrudeModel = /*#__PURE__*/function (_BaseModel) {
     }
   }]);
   return ExtrudeModel;
-}(_BaseModel2.default);
-exports.default = ExtrudeModel;
+}(_BaseModel2.default);