@antv/l7-layers 2.16.0 → 2.16.2

package/lib/polygon/models/fill.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
@@ -14,19 +15,18 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
-var _lodash = require("lodash");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
 var _triangulation = require("../../core/triangulation");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 /* babel-plugin-inline-import '../shaders/polygon_frag.glsl' */
-var polygon_frag = "uniform float u_opacity: 1.0;\nvarying vec4 v_color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  gl_FragColor = v_color;\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+var polygon_frag = "varying vec4 v_color;\n#pragma include \"picking\"\n\nvoid main() {\n  gl_FragColor = v_color;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/polygon_linear_frag.glsl' */
-var polygon_linear_frag = "uniform float u_opacity: 1.0;\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u4F20\u9012\u4ECE\u7247\u5143\u4E2D\u4F20\u9012\u7684\u6620\u5C04\u6570\u636E\n\n#pragma include \"picking\"\nuniform float u_opacitylinear: 0.0;\nuniform float u_dir: 1.0;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\n\nvoid main() {\n  float opacity = styleMappingMat[0][0];\n  gl_FragColor = v_Color;\n  \n  if(u_opacitylinear > 0.0) {\n    gl_FragColor.a *= u_dir == 1.0 ? 1.0 - length(v_pos - v_linear.xy)/v_linear.z : length(v_pos - v_linear.xy)/v_linear.z;\n  }\n\n  gl_FragColor.a *= opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+var polygon_linear_frag = "#pragma include \"picking\"\nuniform float u_opacitylinear: 0.0;\nuniform float u_dir: 1.0;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\n\nvoid main() {\n  \n  if(u_opacitylinear > 0.0) {\n    gl_FragColor.a *= u_dir == 1.0 ? 1.0 - length(v_pos - v_linear.xy)/v_linear.z : length(v_pos - v_linear.xy)/v_linear.z;\n  }\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
 /* babel-plugin-inline-import '../shaders/polygon_linear_vert.glsl' */
-var polygon_linear_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_opacity: 1.0;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_Color;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nuniform float u_opacitylinear: 0.0;\n\nattribute vec3 a_linear;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\nvoid main() {\n  if(u_opacitylinear > 0.0) {\n    v_linear = a_linear;\n    v_pos = a_Position.xy;\n  }\n  \n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\nstyleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_Color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  project_pos.z += u_raisingHeight;\n\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    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\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  setPickingColor(a_PickingColor);\n}";
+var polygon_linear_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_Color;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nuniform float u_opacitylinear: 0.0;\n\nattribute vec3 a_linear;\nvarying vec3 v_linear;\nvarying vec2 v_pos;\n\nvoid main() {\n  if(u_opacitylinear > 0.0) {\n    v_linear = a_linear;\n    v_pos = a_Position.xy;\n  }\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  project_pos.z += u_raisingHeight;\n\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    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\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  setPickingColor(a_PickingColor);\n}";
 /* babel-plugin-inline-import '../shaders/polygon_vert.glsl' */
-var polygon_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_opacity: 1.0;\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_color;\nvarying mat4 styleMappingMat; // \u7528\u4E8E\u5C06\u5728\u9876\u70B9\u7740\u8272\u5668\u4E2D\u8BA1\u7B97\u597D\u7684\u6837\u5F0F\u503C\u4F20\u9012\u7ED9\u7247\u5143\n\n#pragma include \"styleMapping\"\n#pragma include \"styleMappingCalOpacity\"\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\nstyleMappingMat = mat4(\n    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty\n    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA\n    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]\n    0.0, 0.0, 0.0, 0.0\n  );\n\n  float rowCount = u_cellTypeLayout[0][0];    // \u5F53\u524D\u7684\u6570\u636E\u7EB9\u7406\u6709\u51E0\u884C\n  float columnCount = u_cellTypeLayout[0][1]; // \u5F53\u770B\u5230\u6570\u636E\u7EB9\u7406\u6709\u51E0\u5217\n  float columnWidth = 1.0/columnCount;  // \u5217\u5BBD\n  float rowHeight = 1.0/rowCount;       // \u884C\u9AD8\n  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets\n  float id = a_vertexId; // \u7B2Cn\u4E2A\u9876\u70B9\n  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u884C\n  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // \u8D77\u59CB\u70B9\u5728\u7B2C\u51E0\u5217\n  \n  // cell \u56FA\u5B9A\u987A\u5E8F opacity -> strokeOpacity -> strokeWidth -> stroke ... \n  // \u6309\u987A\u5E8F\u4ECE cell \u4E2D\u53D6\u503C\u3001\u82E5\u6CA1\u6709\u5219\u81EA\u52A8\u5F80\u4E0B\u53D6\u503C\n  float textureOffset = 0.0; // \u5728 cell \u4E2D\u53D6\u503C\u7684\u504F\u79FB\u91CF\n\n  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);\n  styleMappingMat[0][0] = opacityAndOffset.r;\n  textureOffset = opacityAndOffset.g;\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = a_Color;\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  project_pos.z += u_raisingHeight;\n\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    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\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  setPickingColor(a_PickingColor);\n}\n\n";
+var polygon_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nuniform float u_raisingHeight: 0.0;\n\nvarying vec4 v_color;\n\n\n#pragma include \"projection\"\n#pragma include \"picking\"\n\nvoid main() {\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  // cal style mapping - \u6570\u636E\u7EB9\u7406\u6620\u5C04\u90E8\u5206\u7684\u8BA1\u7B97\n\n  v_color = vec4(a_Color.xyz, a_Color.w * opacity);\n  vec4 project_pos = project_position(vec4(a_Position, 1.0));\n  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n\n  project_pos.z += u_raisingHeight;\n\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    project_pos.z *= mapboxZoomScale;\n    project_pos.z += u_raisingHeight * mapboxZoomScale;\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  setPickingColor(a_PickingColor);\n}\n\n";
 var FillModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(FillModel, _BaseModel);
   var _super = _createSuper(FillModel);
@@ -40,50 +40,16 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
       var _ref = this.layer.getLayerConfig(),
         _ref$raisingHeight = _ref.raisingHeight,
         raisingHeight = _ref$raisingHeight === void 0 ? 0 : _ref$raisingHeight,
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
         _ref$opacityLinear = _ref.opacityLinear,
         opacityLinear = _ref$opacityLinear === void 0 ? {
           enable: false,
           dir: 'in'
         } : _ref$opacityLinear;
-      if (this.dataTextureTest && this.dataTextureNeedUpdate({
-        opacity: opacity
-      })) {
-        this.judgeStyleAttributes({
-          opacity: opacity
-        });
-        var encodeData = this.layer.getEncodedData();
-        var _this$calDataFrame = this.calDataFrame(this.cellLength, encodeData, this.cellProperties),
-          data = _this$calDataFrame.data,
-          width = _this$calDataFrame.width,
-          height = _this$calDataFrame.height;
-        this.rowCount = height; // 当前数据纹理有多少行
-        this.dataTexture = this.cellLength > 0 && data.length > 0 ? this.createTexture2D({
-          flipY: true,
-          data: data,
-          format: _l7Core.gl.LUMINANCE,
-          type: _l7Core.gl.FLOAT,
-          width: width,
-          height: height
-        }) : this.createTexture2D({
-          flipY: true,
-          data: [1],
-          format: _l7Core.gl.LUMINANCE,
-          type: _l7Core.gl.FLOAT,
-          width: 1,
-          height: 1
-        });
-      }
-      return {
-        u_dataTexture: this.dataTexture,
-        // 数据纹理 - 有数据映射的时候纹理中带数据，若没有任何数据映射时纹理是 [1]
-        u_cellTypeLayout: this.getCellTypeLayout(),
+      return (0, _objectSpread2.default)({
         u_raisingHeight: Number(raisingHeight),
-        u_opacity: (0, _lodash.isNumber)(opacity) ? opacity : 1.0,
         u_opacitylinear: Number(opacityLinear.enable),
         u_dir: opacityLinear.dir === 'in' ? 1.0 : 0.0
-      };
+      }, this.getStyleAttribute());
     }
   }, {
     key: "initModels",
@@ -120,6 +86,7 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
                 moduleName: type,
                 vertexShader: vert,
                 fragmentShader: frag,
+                inject: this.getInject(),
                 triangulation: triangulation,
                 primitive: _l7Core.gl.TRIANGLES,
                 depth: {
@@ -145,12 +112,6 @@ var FillModel = /*#__PURE__*/function (_BaseModel) {
       }
       return buildModels;
     }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$dataTexture;
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-    }
   }, {
     key: "registerBuiltinAttributes",
     value: function registerBuiltinAttributes() {

package/lib/polygon/shaders/extrude/polygon_extrude_frag.glsl

@@ -1,4 +1,3 @@
-uniform float u_opacity: 1.0;
 uniform vec4 u_sourceColor;
 uniform vec4 u_targetColor;
 uniform float u_linearColor: 0;
@@ -7,39 +6,19 @@ uniform float u_topsurface: 1.0;
 uniform float u_sidesurface: 1.0;
 
 varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];  
-  float isSide = styleMappingMat[0][3];
-  float sidey = styleMappingMat[3][0];
-  float lightWeight = styleMappingMat[3][1];
-
-  // Tip: 部分机型 GPU 计算精度兼容
-  if(isSide < 0.999) {
-    // side face
-    if(u_sidesurface < 1.0) {
-      discard;
-    }
 
-    if(u_linearColor == 1.0) {
-      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);
-      linearColor.rgb *= lightWeight;
-      gl_FragColor = linearColor;
-    } else {
-      gl_FragColor = v_Color;
-    }
 
-  } else {
      // top face
     if(u_topsurface < 1.0) {
       discard;
     }
 
     gl_FragColor = v_Color;
-  }
+  
 
-  gl_FragColor.a *= opacity;
   gl_FragColor = filterColor(gl_FragColor);
 }

package/lib/polygon/shaders/extrude/polygon_extrude_picklight_frag.glsl

@@ -7,14 +7,16 @@ uniform float u_topsurface: 1.0;
 uniform float u_sidesurface: 1.0;
 
 varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+varying vec3 v_uvs;
+varying vec2 v_texture_data;
+
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  float isSide = styleMappingMat[0][3];
-  float sidey = styleMappingMat[3][0];
-  float lightWeight = styleMappingMat[3][1];
+  float opacity = u_opacity;
+  float isSide =  v_texture_data.x;
+  float sidey = v_uvs[2];
+  float lightWeight = v_texture_data.y;
 
   // Tip: 部分机型 GPU 计算精度兼容
   if(isSide < 0.999) {

package/lib/polygon/shaders/extrude/polygon_extrude_picklight_vert.glsl

@@ -12,46 +12,22 @@ attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 
-varying vec4 v_Color;
 uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_raisingHeight: 0.0;
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+varying vec2 v_texture_data;
+varying vec3 v_uvs;
+varying vec4 v_Color;
+
 
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
 
 void main() {
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - isSide
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0  // sidey
-  );
-  styleMappingMat[0][3] = a_Position.z;
-  styleMappingMat[3][0] = a_uvs[2];
 
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
 
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
+  v_uvs = a_uvs;
   // cal style mapping - 数据纹理映射部分的计算
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);
   vec4 project_pos = project_position(pos);
@@ -76,10 +52,9 @@ void main() {
   }
 
   float lightWeight = calc_lighting(pos);
-  // v_Color = a_Color;
-  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);
+  v_texture_data = vec2(a_Position.z,lightWeight);
 
-  styleMappingMat[3][1] = lightWeight;
+  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);
 
   setPickingColor(a_PickingColor);
 }

package/lib/polygon/shaders/extrude/polygon_extrude_vert.glsl

@@ -11,50 +11,31 @@ attribute float a_Size;
 attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+uniform float u_linearColor: 0;
+
+uniform float u_topsurface: 1.0;
+uniform float u_sidesurface: 1.0;
 
 varying vec4 v_Color;
 uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_raisingHeight: 0.0;
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
 
 void main() {
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - isSide
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0  // sidey
-  );
-  styleMappingMat[0][3] = a_Position.z;
-  styleMappingMat[3][0] = a_uvs[2];
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
+ 
+  float isSide = a_Position.z;
+ float topU = a_uvs[0];
+ float topV = 1.0 - a_uvs[1];
+ float sidey = a_uvs[2];
 
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);
+  float lightWeight = calc_lighting(pos);
+
   vec4 project_pos = project_position(pos);
 
   if(u_heightfixed > 0.0) { // 判断几何体是否固定高度
@@ -68,10 +49,7 @@ void main() {
     }
   }
 
-  // project_pos.z += 500000.0; // amap1
 
-  // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));
@@ -80,11 +58,28 @@ void main() {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
   }
 
-  float lightWeight = calc_lighting(pos);
+  // Tip: 部分机型 GPU 计算精度兼容
+  if(isSide < 0.999) {
+    // side face
+    // if(u_sidesurface < 1.0) {
+    //   discard;
+    // }
+
+    if(u_linearColor == 1.0) {
+      vec4 linearColor = mix(u_targetColor, u_sourceColor, sidey);
+      linearColor.rgb *= lightWeight;
+      v_Color = linearColor;
+    } else {
+      v_Color = a_Color;
+    }
+
+  } else {
+    v_Color = a_Color;
+  }
+
   // v_Color = a_Color;
-  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w);
+  v_Color = vec4(a_Color.rgb * lightWeight, a_Color.w * opacity);
 
-  styleMappingMat[3][1] = lightWeight;
 
   setPickingColor(a_PickingColor);
 }

package/lib/polygon/shaders/extrude/polygon_extrudetex_frag.glsl

@@ -8,19 +8,21 @@ uniform float u_topsurface: 1.0;
 uniform float u_sidesurface: 1.0;
 
 varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
+varying vec3 v_uvs;
+varying vec2 v_texture_data;
+
+
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  float isSide = styleMappingMat[0][3];
-  float lightWeight = styleMappingMat[3][1];
-  float topU = styleMappingMat[2][2];
-  float topV = styleMappingMat[2][3];
-
-  float sidey = styleMappingMat[3][0];
+  float opacity = u_opacity;
+  float isSide = v_texture_data.x;
+  float lightWeight = v_texture_data.y;
+  float topU = v_uvs[0];
+  float topV = 1.0 - v_uvs[1];
+  float sidey = v_uvs[2];
   // Tip: 部分机型 GPU 计算精度兼容
-  if(isSide < 0.999) {
+  if(isSide < 0.999) {// 是否是边缘
     // side face
     if(u_sidesurface < 1.0) {
       discard;
@@ -41,6 +43,7 @@ void main() {
     }
 
     gl_FragColor = texture2D(u_texture, vec2(topU, topV));
+    // gl_FragColor = vec4(1.0, 0., 0., 1.0);
   }
   
 

package/lib/polygon/shaders/extrude/polygon_extrudetex_vert.glsl

@@ -11,57 +11,33 @@ attribute float a_Size;
 attribute vec3 a_uvs;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
+uniform sampler2D u_texture;
 
+
+uniform vec4 u_sourceColor;
+uniform vec4 u_targetColor;
+uniform float u_topsurface: 1.0;
+uniform float u_sidesurface: 1.0;
 varying vec4 v_Color;
 uniform float u_heightfixed: 0.0; // 默认不固定
 uniform float u_raisingHeight: 0.0;
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
+uniform float u_linearColor: 0.0;
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
+varying vec2 v_texture_data;
+varying vec3 v_uvs;
 
 #pragma include "projection"
 #pragma include "light"
 #pragma include "picking"
 
 void main() {
-  v_Color = a_Color;
-
-  // cal style mapping - 数据纹理映射部分的计算
-  styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - a_Position.z(judge side by a_Position.z)
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1] - u - v
-    0.0, 0.0, 0.0, 0.0  // sidey
-  );
-  
-  styleMappingMat[0][3] = a_Position.z;
-  styleMappingMat[2][2] = a_uvs[0];
-  styleMappingMat[2][3] = 1.0 - a_uvs[1];
-  styleMappingMat[3][0] = a_uvs[2];
-
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
-
+ 
   vec4 pos = vec4(a_Position.xy, a_Position.z * a_Size, 1.0);
+  float lightWeight = calc_lighting(pos);
   vec4 project_pos = project_position(pos);
+  v_uvs = a_uvs;
+
+  v_texture_data = vec2(a_Position.z, lightWeight);
 
   if(u_heightfixed > 0.0) { // 判断几何体是否固定高度
     project_pos.z = a_Position.z * a_Size;
@@ -74,10 +50,6 @@ void main() {
     }
   }
 
-  // project_pos.z += 500000.0; // amap1
-
-  // project_pos.z += (500000.0 * 4.0)/pow(2.0, 21.0 - u_Zoom); // mapbox
-  // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 
   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
     // gl_Position = u_Mvp * (vec4(project_pos.xyz * vec3(1.0, 1.0, -1.0), 1.0));
@@ -86,8 +58,8 @@ void main() {
     gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
   }
 
-  float lightWeight = calc_lighting(pos);
-  styleMappingMat[3][1] = lightWeight;
+
+
 
   setPickingColor(a_PickingColor);
 }

package/lib/polygon/shaders/polygon_frag.glsl

@@ -1,12 +1,7 @@
-uniform float u_opacity: 1.0;
 varying vec4 v_color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
 #pragma include "picking"
 
 void main() {
-  float opacity = styleMappingMat[0][0];
   gl_FragColor = v_color;
-  gl_FragColor.a *= opacity;
   gl_FragColor = filterColor(gl_FragColor);
 }

package/lib/polygon/shaders/polygon_linear_frag.glsl

@@ -1,7 +1,3 @@
-uniform float u_opacity: 1.0;
-varying vec4 v_Color;
-varying mat4 styleMappingMat; // 传递从片元中传递的映射数据
-
 #pragma include "picking"
 uniform float u_opacitylinear: 0.0;
 uniform float u_dir: 1.0;
@@ -10,13 +6,9 @@ varying vec2 v_pos;
 
 
 void main() {
-  float opacity = styleMappingMat[0][0];
-  gl_FragColor = v_Color;
   
   if(u_opacitylinear > 0.0) {
     gl_FragColor.a *= u_dir == 1.0 ? 1.0 - length(v_pos - v_linear.xy)/v_linear.z : length(v_pos - v_linear.xy)/v_linear.z;
   }
-
-  gl_FragColor.a *= opacity;
   gl_FragColor = filterColor(gl_FragColor);
 }

package/lib/polygon/shaders/polygon_linear_vert.glsl

@@ -3,14 +3,10 @@ attribute vec3 a_Position;
 
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
-uniform float u_opacity: 1.0;
 uniform float u_raisingHeight: 0.0;
 
 varying vec4 v_Color;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "picking"
@@ -26,34 +22,6 @@ void main() {
     v_linear = a_linear;
     v_pos = a_Position.xy;
   }
-  
-  // cal style mapping - 数据纹理映射部分的计算
-styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0
-  );
-
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
-  // cal style mapping - 数据纹理映射部分的计算
-
-  v_Color = a_Color;
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
   project_pos.z += u_raisingHeight;

package/lib/polygon/shaders/polygon_vert.glsl

@@ -4,46 +4,20 @@ attribute vec3 a_Position;
 uniform mat4 u_ModelMatrix;
 uniform mat4 u_Mvp;
 
-uniform float u_opacity: 1.0;
 uniform float u_raisingHeight: 0.0;
 
 varying vec4 v_color;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
 
-#pragma include "styleMapping"
-#pragma include "styleMappingCalOpacity"
 
 #pragma include "projection"
 #pragma include "picking"
 
 void main() {
   // cal style mapping - 数据纹理映射部分的计算
-styleMappingMat = mat4(
-    0.0, 0.0, 0.0, 0.0, // opacity - strokeOpacity - strokeWidth - empty
-    0.0, 0.0, 0.0, 0.0, // strokeR - strokeG - strokeB - strokeA
-    0.0, 0.0, 0.0, 0.0, // offsets[0] - offsets[1]
-    0.0, 0.0, 0.0, 0.0
-  );
 
-  float rowCount = u_cellTypeLayout[0][0];    // 当前的数据纹理有几行
-  float columnCount = u_cellTypeLayout[0][1]; // 当看到数据纹理有几列
-  float columnWidth = 1.0/columnCount;  // 列宽
-  float rowHeight = 1.0/rowCount;       // 行高
-  float cellCount = calCellCount(); // opacity - strokeOpacity - strokeWidth - stroke - offsets
-  float id = a_vertexId; // 第n个顶点
-  float cellCurrentRow = floor(id * cellCount / columnCount) + 1.0; // 起始点在第几行
-  float cellCurrentColumn = mod(id * cellCount, columnCount) + 1.0; // 起始点在第几列
-  
-  // cell 固定顺序 opacity -> strokeOpacity -> strokeWidth -> stroke ... 
-  // 按顺序从 cell 中取值、若没有则自动往下取值
-  float textureOffset = 0.0; // 在 cell 中取值的偏移量
-
-  vec2 opacityAndOffset = calOpacityAndOffset(cellCurrentRow, cellCurrentColumn, columnCount, textureOffset, columnWidth, rowHeight);
-  styleMappingMat[0][0] = opacityAndOffset.r;
-  textureOffset = opacityAndOffset.g;
   // cal style mapping - 数据纹理映射部分的计算
 
-  v_color = a_Color;
+  v_color = vec4(a_Color.xyz, a_Color.w * opacity);
   vec4 project_pos = project_position(vec4(a_Position, 1.0));
   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
 

package/lib/utils/layerData.js

@@ -32,7 +32,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
         d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
         // d.coordinates = mapService.lngLatToCoord(d.coordinates);
-        d.coordinates = mapService.lngLatToCoordByLayer(d.coordinates, layerCenter);
+        d.coordinates = mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
       });
     } else {
       // 连续的线、面数据
@@ -47,7 +47,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService, layer) {
         d.originCoordinates = (0, _lodash.cloneDeep)(d.coordinates); // 为了兼容高德1.x 需要保存一份原始的经纬度坐标数据（许多上层逻辑依赖经纬度数据）
         // @ts-ignore
         // d.coordinates = mapService.lngLatToCoords(d.coordinates);
-        d.coordinates = mapService.lngLatToCoordsByLayer(d.coordinates, layerCenter);
+        d.coordinates = mapService.coordToAMap2RelativeCoordinates(d.coordinates, layerCenter);
       });
     }
   }