@antv/l7-layers 2.9.27-alpha.2 → 2.9.27-alpha.4

package/lib/tile/tmsTileLayer.js

@@ -25,6 +25,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 
 var _baseTileLayer = _interopRequireDefault(require("./tileLayer/baseTileLayer"));
 
+var _utils = require("./utils");
+
 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; } }
@@ -98,18 +100,39 @@ var TMSTileLayer = /*#__PURE__*/function (_BaseTileLayer) {
 
           var _layers = _this2.tileLayerManager.getChilds(tile.layerIDList);
 
-          _this2.tileLayerManager.updateLayersConfig(_layers, 'visible', tile.isVisible);
+          _this2.updateTileVisible(tile, _layers);
 
           _this2.setPickState(_layers);
         }
       });
-      this.parent.renderLayers();
 
       if (this.tilesetManager.isLoaded) {
         // 将事件抛出，图层上可以使用瓦片
         this.parent.emit('tiles-loaded', this.tilesetManager.currentTiles);
       }
     }
+  }, {
+    key: "emitTileVisibleEvent",
+    value: function emitTileVisibleEvent(tile, callback) {
+      if (tile.isVisible) {
+        callback();
+      } else {
+        (0, _utils.tileAllLoad)(tile, function () {
+          callback();
+        });
+      }
+    }
+  }, {
+    key: "updateTileVisible",
+    value: function updateTileVisible(tile, layers) {
+      var _this3 = this;
+
+      this.emitTileVisibleEvent(tile, function () {
+        _this3.tileLayerManager.updateLayersConfig(layers, 'visible', tile.isVisible);
+
+        _this3.layerService.reRender();
+      });
+    }
   }]);
   return TMSTileLayer;
 }(_baseTileLayer.default);

package/lib/tile/utils.js

@@ -8,10 +8,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.getContainerSize = getContainerSize;
 exports.getLayerShape = getLayerShape;
 exports.getMaskValue = getMaskValue;
+exports.isTileChildLoaded = isTileChildLoaded;
+exports.isTileLoaded = isTileLoaded;
+exports.isTileParentLoaded = isTileParentLoaded;
 exports.isVectorTile = isVectorTile;
 exports.readPixel = readPixel;
 exports.readRasterValue = readRasterValue;
 exports.registerLayers = registerLayers;
+exports.tileAllLoad = tileAllLoad;
 exports.tileVectorParser = void 0;
 
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -155,4 +159,38 @@ function readPixel(x, y, rendererService) {
     data: new Uint8Array(1 * 1 * 4)
   });
   return pickedColors;
+}
+
+function isTileLoaded(tile) {
+  return tile.layerIDList.length === tile.loadedLayers;
+}
+
+function isTileChildLoaded(tile) {
+  var childs = tile.children;
+  return childs.filter(function (child) {
+    return isTileLoaded(child);
+  }).length === childs.length;
+}
+
+function isTileParentLoaded(tile) {
+  var parent = tile.parent;
+
+  if (!parent) {
+    return true;
+  } else {
+    return isTileLoaded(parent);
+  }
+}
+
+function tileAllLoad(tile, callback) {
+  var timer = window.setInterval(function () {
+    var tileLoaded = isTileLoaded(tile);
+    var tileChildLoaded = isTileChildLoaded(tile);
+    var tileParentLoaded = isTileParentLoaded(tile);
+
+    if (tileLoaded && tileChildLoaded && tileParentLoaded) {
+      callback();
+      window.clearInterval(timer);
+    }
+  }, 36);
 }

package/lib/utils/dataMappingStyle.js

@@ -29,6 +29,9 @@ function registerStyleAttribute(fieldName, layer, field, values, updateOptions)
 
 
 function handleStyleDataMapping(configToUpdate, layer) {
+  // 瓦片图层不需要进行样式数据映射
+  if (layer.tileLayer || layer.isTileLayer) return;
+
   if (configToUpdate.opacity) {
     // 处理 style 中 opacity 属性的数据映射
     handleStyleFloat('opacity', layer, configToUpdate.opacity);

package/lib/utils/layerData.js

@@ -28,7 +28,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
     if (typeof mappedData[0].coordinates[0] === 'number') {
       // 单个的点数据
       // @ts-ignore
-      mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
+      mappedData // 避免经纬度被重复计算导致坐标位置偏移
       .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {
@@ -42,7 +42,7 @@ function adjustData2Amap2Coordinates(mappedData, mapService) {
     } else {
       // 连续的线、面数据
       // @ts-ignore
-      mappedData // TODO: 避免经纬度被重复计算导致坐标位置偏移
+      mappedData // 避免经纬度被重复计算导致坐标位置偏移
       .filter(function (d) {
         return !d.originCoordinates;
       }).map(function (d) {

package/lib/utils/updateShape.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateShape = updateShape;
-// TODO: shapeUpdateList 存储一系列的 shape 类型
+// shapeUpdateList 存储一系列的 shape 类型
 // 当这一系列的 shape 相互切换的时候需要重构 layer 的 model (顶点数据集)
 var shapeUpdateList = [// PointLayer
 ['circle', 'cylinder'], ['square', 'cylinder'], ['triangle', 'cylinder'], ['pentagon', 'cylinder'], ['hexagon', 'cylinder'], ['octogon', 'cylinder'], ['hexagram', 'cylinder'], ['rhombus', 'cylinder'], ['vesica', 'cylinder']];
@@ -18,7 +18,7 @@ function updateShape(layer, lastShape, currentShape) {
 
     shapeUpdateList.map(function (shapes) {
       if (shapes.includes(lastShape) && shapes.includes(currentShape)) {
-        // TODO: dataSourceNeedUpdate 借用数据更新时更新 layer model 的工作流
+        // dataSourceNeedUpdate 借用数据更新时更新 layer model 的工作流
         layer.dataState.dataSourceNeedUpdate = true;
         return;
       }

package/lib/wind/index.js

@@ -58,7 +58,9 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       this.layerModel.initModels(function (models) {
         _this2.models = models;
 
-        _this2.renderLayers();
+        _this2.emit('modelLoaded', null);
+
+        _this2.layerService.throttleRenderLayers();
       });
     }
   }, {
@@ -67,7 +69,9 @@ var WindLayer = /*#__PURE__*/function (_BaseLayer) {
       var _this3 = this;
 
       this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
+        _this3.models = models;
+
+        _this3.emit('modelLoaded', null);
       });
     }
   }, {

package/lib/wind/models/wind.js

@@ -39,7 +39,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 var WindFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nvarying vec2 v_texCoord;\nvoid main() {\n  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));\n  gl_FragColor = color;\n  gl_FragColor.a *= u_opacity;\n}\n";
 
 /* babel-plugin-inline-import '../shaders/wind_vert.glsl' */
-var WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
+var WindVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nvarying vec2 v_texCoord;\n#pragma include \"projection\"\nvoid main() {\n   v_texCoord = a_Uv;\n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n   \n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));\n   }\n}\n";
 var defaultRampColors = {
   0.0: '#3288bd',
   0.1: '#66c2a5',
@@ -165,9 +165,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
           height: imageHeight
         });
 
-        _this3.layerService.updateLayerRenderList();
-
-        _this3.layerService.renderLayers();
+        _this3.layerService.reRender();
       });
       this.layer.buildLayerModel({
         moduleName: 'wind',
@@ -178,7 +176,9 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
         depth: {
           enable: false
         },
-        blend: this.getBlend()
+        stencil: (0, _l7Utils.getMask)(mask, maskInside),
+        blend: this.getBlend(),
+        pick: false
       }).then(function (model) {
         _this3.colorModel = model;
         callbackModel([model]);
@@ -241,7 +241,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
             type: _l7Core.gl.FLOAT
           },
           size: 2,
-          update: function update(feature, featureIdx, vertex, attributeIdx) {
+          update: function update(feature, featureIdx, vertex) {
             return [vertex[3], vertex[4]];
           }
         }
@@ -307,7 +307,7 @@ var WindModel = /*#__PURE__*/function (_BaseModel) {
         var _this$wind$draw = this.wind.draw(),
             d = _this$wind$draw.d,
             w = _this$wind$draw.w,
-            h = _this$wind$draw.h; // TODO: 恢复 L7 渲染流程中 gl 状态
+            h = _this$wind$draw.h; // 恢复 L7 渲染流程中 gl 状态
 
 
         this.rendererService.setBaseState();

package/lib/wind/shaders/wind_vert.glsl

@@ -8,7 +8,7 @@ varying vec2 v_texCoord;
 void main() {
    v_texCoord = a_Uv;
    vec4 project_pos = project_position(vec4(a_Position, 1.0));
-   // gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy,0., 1.0));
+   
    if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
       gl_Position = u_Mvp * (vec4(project_pos.xy,0., 1.0));
    } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.27-alpha.2",
+  "version": "2.9.27-alpha.4",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -26,13 +26,14 @@
   "author": "xiaoiver",
   "license": "ISC",
   "dependencies": {
-    "@antv/async-hook": "^2.1.0",
-    "@antv/l7-core": "2.9.27-alpha.2",
-    "@antv/l7-maps": "2.9.27-alpha.2",
-    "@antv/l7-source": "2.9.27-alpha.2",
-    "@antv/l7-utils": "2.9.27-alpha.2",
+    "@antv/async-hook": "^2.2.2",
+    "@antv/l7-core": "2.9.27-alpha.4",
+    "@antv/l7-maps": "2.9.27-alpha.4",
+    "@antv/l7-source": "2.9.27-alpha.4",
+    "@antv/l7-utils": "2.9.27-alpha.4",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
+    "@turf/clone": "^6.5.0",
     "@turf/helpers": "^6.1.4",
     "@turf/meta": "^6.0.2",
     "@turf/polygon-to-line": "^6.5.0",
@@ -60,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "209f0b76af7ad1c7342f5ea21aa1c2179e8c460d",
+  "gitHead": "9e77012376360246d49d7b5392eecd16b43b9109",
   "publishConfig": {
     "access": "public"
   }

package/es/line/shaders/tile/line_tile_frag.glsl

@@ -1,79 +0,0 @@
-#define LineTexture 1.0
-uniform float u_blur : 0.99;
-uniform float u_opacity : 1.0;
-uniform float u_textureBlend;
-
-uniform float u_borderWidth: 0.0;
-uniform vec4 u_borderColor;
-varying vec4 v_color;
-
-// line texture
-uniform float u_line_texture;
-uniform sampler2D u_texture;
-uniform vec2 u_textSize;
-
-varying vec2 v_iconMapUV;
-
-#pragma include "picking"
-
-varying mat4 styleMappingMat;
-
-void main() {
-  float opacity = styleMappingMat[0][0];
-  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
-  gl_FragColor = v_color;
-  // anti-alias
-  // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
-  gl_FragColor.a *= opacity; // 全局透明度
-
-
-  if(u_line_texture == LineTexture) { // while load texture
-    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
-    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
-    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen);
-    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
-
-    // v = max(smoothstep(0.95, 1.0, v), v);
-    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
-    
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, vec2(u, v)));
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, uv));
-     vec4 pattern = texture2D(u_texture, uv);
-
-    if(u_textureBlend == 0.0) { // normal
-      pattern.a = 0.0;
-      gl_FragColor += pattern;
-    } else { // replace
-        pattern.a *= opacity;
-        if(gl_FragColor.a <= 0.0) {
-          pattern.a = 0.0;
-        }
-        gl_FragColor = pattern;
-    }
-  } 
-
-  float v = styleMappingMat[3].a;
-  float borderWidth = min(0.5, u_borderWidth);
-  // 绘制 border
-  if(borderWidth > 0.01) {
-    float borderOuterWidth = borderWidth/2.0;
-
-    if(v >= 1.0 - borderWidth || v <= borderWidth) {
-      if(v > borderWidth) {
-        float linear = smoothstep(0.0, 1.0, (v - (1.0 - borderWidth))/borderWidth);
-        gl_FragColor.rgb = mix(gl_FragColor.rgb, u_borderColor.rgb, linear);
-      } else if(v <= borderWidth) {
-        float linear = smoothstep(0.0, 1.0, v/borderWidth);
-        gl_FragColor.rgb = mix(u_borderColor.rgb, gl_FragColor.rgb, linear);
-      }
-    }
-
-    if(v < borderOuterWidth) {
-      gl_FragColor.a = mix(0.0, gl_FragColor.a, v/borderOuterWidth);
-    } else if(v > 1.0 - borderOuterWidth) {
-      gl_FragColor.a = mix(gl_FragColor.a, 0.0, (v - (1.0 - borderOuterWidth))/borderOuterWidth);
-    }
-  }
-
-  gl_FragColor = filterColor(gl_FragColor);
-}

package/es/line/shaders/wall_vert.glsl

@@ -1,111 +0,0 @@
-#define Animate 0.0
-
-attribute float a_Miter;
-attribute vec4 a_Color;
-attribute vec2 a_Size;
-attribute vec3 a_Normal;
-attribute vec3 a_Position;
-attribute vec2 a_iconMapUV;
-
-attribute float a_Total_Distance;
-attribute float a_Distance;
-
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
-uniform float u_icon_step: 100;
-uniform float u_heightfixed;
-
-#pragma include "projection"
-#pragma include "light"
-#pragma include "picking"
-
-varying vec4 v_color;
-varying float v_blur;
-
-// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
-varying vec2 v_iconMapUV;
-
-uniform float u_linearColor: 0;
-
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "light"
-#pragma include "styleMappingCalOpacity"
-
-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  // distance_ratio/distance/pixelLen/texV
-  );
-
-  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 d_distance_ratio; // 当前点位距离占线总长的比例
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-
-  v_iconMapUV = a_iconMapUV;
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    d_texPixelLen = project_pixel(u_icon_step);
-  } else {
-    d_texPixelLen = u_icon_step;
-  }
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
-
-  if(u_aimate.x == Animate || u_linearColor == 1.0) {
-      d_distance_ratio = a_Distance / a_Total_Distance;
-  }
-
-  float miter = (a_Miter + 1.0)/2.0;
-  // 设置数据集的参数
-  styleMappingMat[3][0] = d_distance_ratio; // 当前点位距离占线总长的比例
-  styleMappingMat[3][1] = a_Distance;       // 当前顶点的距离
-  styleMappingMat[3][2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-  styleMappingMat[3][3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
-
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  float originSize = a_Size.x;  // 固定高度
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    originSize = project_float_pixel(a_Size.x);
-  }
-
-  float wallHeight = originSize * miter;
-  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
-
-  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
-
-  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);
-  // v_color = a_Color;
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
-  }
-
-  setPickingColor(a_PickingColor);
-}

package/es/mask/shaders/mask_frag.glsl

@@ -1,7 +0,0 @@
-uniform float u_opacity;
-varying vec4 v_Color;
-
-void main() {
-  gl_FragColor = v_Color;
-  gl_FragColor.a *= u_opacity;
-}

package/es/polygon/shaders/tile/polygon_tile_frag.glsl

@@ -1,12 +0,0 @@
-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/line/shaders/tile/line_tile_frag.glsl

@@ -1,79 +0,0 @@
-#define LineTexture 1.0
-uniform float u_blur : 0.99;
-uniform float u_opacity : 1.0;
-uniform float u_textureBlend;
-
-uniform float u_borderWidth: 0.0;
-uniform vec4 u_borderColor;
-varying vec4 v_color;
-
-// line texture
-uniform float u_line_texture;
-uniform sampler2D u_texture;
-uniform vec2 u_textSize;
-
-varying vec2 v_iconMapUV;
-
-#pragma include "picking"
-
-varying mat4 styleMappingMat;
-
-void main() {
-  float opacity = styleMappingMat[0][0];
-  float d_distance_ratio = styleMappingMat[3].r; // 当前点位距离占线总长的比例
-  gl_FragColor = v_color;
-  // anti-alias
-  // float blur = 1.0 - smoothstep(u_blur, 1., length(v_normal.xy));
-  gl_FragColor.a *= opacity; // 全局透明度
-
-
-  if(u_line_texture == LineTexture) { // while load texture
-    float aDistance = styleMappingMat[3].g;      // 当前顶点的距离
-    float d_texPixelLen = styleMappingMat[3].b;  // 贴图的像素长度，根据地图层级缩放
-    float u = fract(mod(aDistance, d_texPixelLen)/d_texPixelLen);
-    float v = styleMappingMat[3].a;  // 线图层贴图部分的 v 坐标值
-
-    // v = max(smoothstep(0.95, 1.0, v), v);
-    vec2 uv= v_iconMapUV / u_textSize + vec2(u, v) / u_textSize * 64.;
-    
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, vec2(u, v)));
-    // gl_FragColor = filterColor(gl_FragColor + texture2D(u_texture, uv));
-     vec4 pattern = texture2D(u_texture, uv);
-
-    if(u_textureBlend == 0.0) { // normal
-      pattern.a = 0.0;
-      gl_FragColor += pattern;
-    } else { // replace
-        pattern.a *= opacity;
-        if(gl_FragColor.a <= 0.0) {
-          pattern.a = 0.0;
-        }
-        gl_FragColor = pattern;
-    }
-  } 
-
-  float v = styleMappingMat[3].a;
-  float borderWidth = min(0.5, u_borderWidth);
-  // 绘制 border
-  if(borderWidth > 0.01) {
-    float borderOuterWidth = borderWidth/2.0;
-
-    if(v >= 1.0 - borderWidth || v <= borderWidth) {
-      if(v > borderWidth) {
-        float linear = smoothstep(0.0, 1.0, (v - (1.0 - borderWidth))/borderWidth);
-        gl_FragColor.rgb = mix(gl_FragColor.rgb, u_borderColor.rgb, linear);
-      } else if(v <= borderWidth) {
-        float linear = smoothstep(0.0, 1.0, v/borderWidth);
-        gl_FragColor.rgb = mix(u_borderColor.rgb, gl_FragColor.rgb, linear);
-      }
-    }
-
-    if(v < borderOuterWidth) {
-      gl_FragColor.a = mix(0.0, gl_FragColor.a, v/borderOuterWidth);
-    } else if(v > 1.0 - borderOuterWidth) {
-      gl_FragColor.a = mix(gl_FragColor.a, 0.0, (v - (1.0 - borderOuterWidth))/borderOuterWidth);
-    }
-  }
-
-  gl_FragColor = filterColor(gl_FragColor);
-}

package/lib/line/shaders/wall_vert.glsl

@@ -1,111 +0,0 @@
-#define Animate 0.0
-
-attribute float a_Miter;
-attribute vec4 a_Color;
-attribute vec2 a_Size;
-attribute vec3 a_Normal;
-attribute vec3 a_Position;
-attribute vec2 a_iconMapUV;
-
-attribute float a_Total_Distance;
-attribute float a_Distance;
-
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_Mvp;
-uniform vec4 u_aimate: [ 0, 2., 1.0, 0.2 ];
-uniform float u_icon_step: 100;
-uniform float u_heightfixed;
-
-#pragma include "projection"
-#pragma include "light"
-#pragma include "picking"
-
-varying vec4 v_color;
-varying float v_blur;
-
-// texV 线图层 - 贴图部分的 v 坐标（线的宽度方向）
-varying vec2 v_iconMapUV;
-
-uniform float u_linearColor: 0;
-
-uniform float u_opacity: 1.0;
-varying mat4 styleMappingMat; // 用于将在顶点着色器中计算好的样式值传递给片元
-
-#pragma include "styleMapping"
-#pragma include "light"
-#pragma include "styleMappingCalOpacity"
-
-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  // distance_ratio/distance/pixelLen/texV
-  );
-
-  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 d_distance_ratio; // 当前点位距离占线总长的比例
-  float d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-
-  v_iconMapUV = a_iconMapUV;
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    d_texPixelLen = project_pixel(u_icon_step);
-  } else {
-    d_texPixelLen = u_icon_step;
-  }
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) {
-    d_texPixelLen *= 10.0;
-  }
-
-  if(u_aimate.x == Animate || u_linearColor == 1.0) {
-      d_distance_ratio = a_Distance / a_Total_Distance;
-  }
-
-  float miter = (a_Miter + 1.0)/2.0;
-  // 设置数据集的参数
-  styleMappingMat[3][0] = d_distance_ratio; // 当前点位距离占线总长的比例
-  styleMappingMat[3][1] = a_Distance;       // 当前顶点的距离
-  styleMappingMat[3][2] = d_texPixelLen;    // 贴图的像素长度，根据地图层级缩放
-  styleMappingMat[3][3] = miter;          // 线图层贴图部分的 v 坐标值 0 - 1
-
-  vec4 project_pos = project_position(vec4(a_Position.xy, 0, 1.0));
-
-  float originSize = a_Size.x;  // 固定高度
-  if(u_heightfixed < 1.0) {     // 高度随 zoom 调整
-    originSize = project_float_pixel(a_Size.x);
-  }
-
-  float wallHeight = originSize * miter;
-  float lightWeight = calc_lighting(vec4(project_pos.xy, wallHeight, 1.0));
-
-  v_blur = min(project_float_pixel(2.0) / originSize, 0.05);
-
-  v_color = vec4(a_Color.rgb * lightWeight, a_Color.w);
-  // v_color = a_Color;
-
-  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
-    gl_Position = u_Mvp * (vec4(project_pos.xy, wallHeight, 1.0));
-  } else {
-    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, wallHeight, 1.0));
-  }
-
-  setPickingColor(a_PickingColor);
-}