@antv/l7-layers 2.9.21 → 2.9.22-alpha.0

package/lib/line/shaders/wall_vert.glsl

@@ -0,0 +1,111 @@
+#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/lib/mask/index.js

@@ -1,96 +1,62 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/mask/index.ts
+var mask_exports = {};
+__export(mask_exports, {
+  default: () => MaskLayer
 });
-exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
-
-var _models = _interopRequireDefault(require("./models"));
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
-var MaskLayer = function (_BaseLayer) {
-  (0, _inherits2.default)(MaskLayer, _BaseLayer);
-
-  var _super = _createSuper(MaskLayer);
-
-  function MaskLayer() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, MaskLayer);
-
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'MaskLayer');
-    return _this;
+module.exports = __toCommonJS(mask_exports);
+var import_BaseLayer = __toESM(require("../core/BaseLayer"));
+var import_models = __toESM(require("./models"));
+var MaskLayer = class extends import_BaseLayer.default {
+  constructor() {
+    super(...arguments);
+    this.type = "MaskLayer";
   }
-
-  (0, _createClass2.default)(MaskLayer, [{
-    key: "buildModels",
-    value: function buildModels() {
-      var _this2 = this;
-
-      var shape = this.getModelType();
-      this.layerModel = new _models.default[shape](this);
-      this.layerModel.initModels(function (models) {
-        _this2.models = models;
-
-        _this2.renderLayers();
-      });
-    }
-  }, {
-    key: "rebuildModels",
-    value: function rebuildModels() {
-      var _this3 = this;
-
-      this.layerModel.buildModels(function (models) {
-        return _this3.models = models;
-      });
-    }
-  }, {
-    key: "getConfigSchema",
-    value: function getConfigSchema() {
-      return {
-        properties: {
-          opacity: {
-            type: 'number',
-            minimum: 0,
-            maximum: 1
-          }
+  buildModels() {
+    const shape = this.getModelType();
+    this.layerModel = new import_models.default[shape](this);
+    this.layerModel.initModels((models) => {
+      this.models = models;
+      this.renderLayers();
+    });
+  }
+  rebuildModels() {
+    this.layerModel.buildModels((models) => this.models = models);
+  }
+  getConfigSchema() {
+    return {
+      properties: {
+        opacity: {
+          type: "number",
+          minimum: 0,
+          maximum: 1
         }
-      };
-    }
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      return 'fill';
-    }
-  }]);
-  return MaskLayer;
-}(_BaseLayer2.default);
-
-exports.default = MaskLayer;
-//# sourceMappingURL=index.js.map
+      }
+    };
+  }
+  getModelType() {
+    return "fill";
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/lib/mask/models/fill.js

@@ -1,135 +1,85 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/mask/models/fill.ts
+var fill_exports = {};
+__export(fill_exports, {
+  default: () => MaskModel
 });
-exports.default = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _isNumber2 = _interopRequireDefault(require("lodash/isNumber"));
-
-var _l7Core = require("@antv/l7-core");
-
-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; } }
-
-var mask_frag = "uniform float u_opacity;\nvarying vec4 v_Color;\n\nvoid main() {\n  gl_FragColor = v_Color;\n  gl_FragColor.a *= u_opacity;\n}\n";
-var mask_vert = "attribute vec4 a_Color;\nattribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\n\nvarying vec4 v_Color;\n\n#pragma include \"projection\"\n\nvoid main() {\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  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\n";
-
-var MaskModel = function (_BaseModel) {
-  (0, _inherits2.default)(MaskModel, _BaseModel);
-
-  var _super = _createSuper(MaskModel);
-
-  function MaskModel() {
-    (0, _classCallCheck2.default)(this, MaskModel);
-    return _super.apply(this, arguments);
+module.exports = __toCommonJS(fill_exports);
+var import_l7_core = require("@antv/l7-core");
+var import_lodash = require("lodash");
+var import_BaseModel = __toESM(require("../../core/BaseModel"));
+var import_triangulation = require("../../core/triangulation");
+var import_mask_frag = __toESM(require("../shaders/mask_frag.glsl"));
+var import_mask_vert = __toESM(require("../shaders/mask_vert.glsl"));
+var MaskModel = class extends import_BaseModel.default {
+  getUninforms() {
+    const {
+      opacity = 0
+    } = this.layer.getLayerConfig();
+    return {
+      u_opacity: (0, import_lodash.isNumber)(opacity) ? opacity : 0
+    };
   }
-
-  (0, _createClass2.default)(MaskModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 0 : _ref$opacity;
-
-      return {
-        u_opacity: (0, _isNumber2.default)(opacity) ? opacity : 0.0
-      };
-    }
-  }, {
-    key: "initModels",
-    value: function initModels(callbackModel) {
-      this.buildModels(callbackModel);
-    }
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(callbackModel) {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                this.layer.buildLayerModel({
-                  moduleName: 'mask',
-                  vertexShader: mask_vert,
-                  fragmentShader: mask_frag,
-                  triangulation: _triangulation.polygonTriangulation,
-                  depth: {
-                    enable: false
-                  },
-                  blend: this.getBlend(),
-                  stencil: {
-                    enable: true,
-                    mask: 0xff,
-                    func: {
-                      cmp: _l7Core.gl.ALWAYS,
-                      ref: 1,
-                      mask: 0xff
-                    },
-                    opFront: {
-                      fail: _l7Core.gl.REPLACE,
-                      zfail: _l7Core.gl.REPLACE,
-                      zpass: _l7Core.gl.REPLACE
-                    }
-                  }
-                }).then(function (model) {
-                  callbackModel([model]);
-                }).catch(function (err) {
-                  console.warn(err);
-                  callbackModel([]);
-                });
-
-              case 1:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function buildModels(_x) {
-        return _buildModels.apply(this, arguments);
+  initModels(callbackModel) {
+    this.buildModels(callbackModel);
+  }
+  async buildModels(callbackModel) {
+    this.layer.buildLayerModel({
+      moduleName: "mask",
+      vertexShader: import_mask_vert.default,
+      fragmentShader: import_mask_frag.default,
+      triangulation: import_triangulation.polygonTriangulation,
+      depth: { enable: false },
+      blend: this.getBlend(),
+      stencil: {
+        enable: true,
+        mask: 255,
+        func: {
+          cmp: import_l7_core.gl.ALWAYS,
+          ref: 1,
+          mask: 255
+        },
+        opFront: {
+          fail: import_l7_core.gl.REPLACE,
+          zfail: import_l7_core.gl.REPLACE,
+          zpass: import_l7_core.gl.REPLACE
+        }
       }
-
-      return buildModels;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$dataTexture;
-
-      (_this$dataTexture = this.dataTexture) === null || _this$dataTexture === void 0 ? void 0 : _this$dataTexture.destroy();
-      this.layerService.clear();
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      return '';
-    }
-  }]);
-  return MaskModel;
-}(_BaseModel2.default);
-
-exports.default = MaskModel;
-//# sourceMappingURL=fill.js.map
+    }).then((model) => {
+      callbackModel([model]);
+    }).catch((err) => {
+      console.warn(err);
+      callbackModel([]);
+    });
+  }
+  clearModels() {
+    var _a;
+    (_a = this.dataTexture) == null ? void 0 : _a.destroy();
+    this.layerService.clear();
+  }
+  registerBuiltinAttributes() {
+    return "";
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/lib/mask/models/index.js

@@ -1,17 +1,34 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/mask/models/index.ts
+var models_exports = {};
+__export(models_exports, {
+  default: () => models_default
 });
-exports.default = void 0;
-
-var _fill = _interopRequireDefault(require("./fill"));
-
+module.exports = __toCommonJS(models_exports);
+var import_fill = __toESM(require("./fill"));
 var MaskModels = {
-  fill: _fill.default
+  fill: import_fill.default
 };
-var _default = MaskModels;
-exports.default = _default;
-//# sourceMappingURL=index.js.map
+var models_default = MaskModels;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/lib/mask/shaders/mask_frag.glsl

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

package/lib/mask/shaders/mask_vert.glsl

@@ -0,0 +1,22 @@
+attribute vec4 a_Color;
+attribute vec3 a_Position;
+uniform mat4 u_ModelMatrix;
+uniform mat4 u_Mvp;
+
+varying vec4 v_Color;
+
+#pragma include "projection"
+
+void main() {
+
+  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));
+
+  if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x
+    gl_Position = u_Mvp * (vec4(project_pos.xyz, 1.0));
+  } else {
+    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));
+  }
+}
+