@antv/l7-layers 2.21.1 → 2.21.2

package/lib/raster/models/rasterRgb.js

@@ -5,225 +5,153 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 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 _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 _l7Core = require("@antv/l7-core");
-var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _BaseModel = _interopRequireDefault(require("../../core/BaseModel"));
 var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../core/triangulation");
-var _excluded = ["data"],
+const _excluded = ["data"],
   _excluded2 = ["rasterData"];
-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/rgb/raster_rgb_frag.glsl' */
-var rasterFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nin vec2 v_texCoord;\n\nout vec4 outputColor;\n\nvoid main() {\n\n  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;\n\n  if(rgb == vec3(u_noDataValue)) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    outputColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n\n  if(outputColor.a < 0.01)\n    discard;\n \n}";
+const rasterFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nin vec2 v_texCoord;\n\nout vec4 outputColor;\n\nvoid main() {\n\n  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;\n\n  if(rgb == vec3(u_noDataValue)) {\n    outputColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    outputColor = vec4(rgb.r / (u_rminmax.y -u_rminmax.x), rgb.g /(u_gminmax.y -u_gminmax.x), rgb.b/ (u_bminmax.y - u_bminmax.x), u_opacity);\n  }\n\n  if(outputColor.a < 0.01)\n    discard;\n \n}";
 /* babel-plugin-inline-import '../shaders/rgb/raster_rgb_vert.glsl' */
-var rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\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_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
-var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
-  (0, _inherits2.default)(RasterModel, _BaseModel);
-  var _super = _createSuper(RasterModel);
-  function RasterModel() {
-    var _this;
-    (0, _classCallCheck2.default)(this, RasterModel);
-    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), "dataOption", {});
-    return _this;
+const rasterVert = "\nlayout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n vec2 u_rminmax;\n vec2 u_gminmax;\n vec2 u_bminmax;\n float u_opacity;\n float u_noDataValue;\n};\n\nout vec2 v_texCoord;\n\n#pragma include \"projection\"\n\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_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
+class RasterModel extends _BaseModel.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "texture", void 0);
+    (0, _defineProperty2.default)(this, "dataOption", {});
   }
-  (0, _createClass2.default)(RasterModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
-      var commoninfo = this.getCommonUniformsInfo();
-      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
-      this.updateStyleUnifoms();
-      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
-    }
-  }, {
-    key: "getCommonUniformsInfo",
-    value: function getCommonUniformsInfo() {
-      var _ref = this.layer.getLayerConfig(),
-        _ref$opacity = _ref.opacity,
-        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-        _ref$noDataValue = _ref.noDataValue,
-        noDataValue = _ref$noDataValue === void 0 ? 0 : _ref$noDataValue;
-      var _this$dataOption = this.dataOption,
-        _this$dataOption$rMin = _this$dataOption.rMinMax,
-        rMinMax = _this$dataOption$rMin === void 0 ? [0, 255] : _this$dataOption$rMin,
-        _this$dataOption$gMin = _this$dataOption.gMinMax,
-        gMinMax = _this$dataOption$gMin === void 0 ? [0, 255] : _this$dataOption$gMin,
-        _this$dataOption$bMin = _this$dataOption.bMinMax,
-        bMinMax = _this$dataOption$bMin === void 0 ? [0, 255] : _this$dataOption$bMin;
-      var commonOptions = {
-        u_rminmax: rMinMax,
-        u_gminmax: gMinMax,
-        u_bminmax: bMinMax,
-        u_opacity: opacity || 1,
-        u_noDataValue: noDataValue,
-        u_texture: this.texture
-      };
-      this.textures = [this.texture];
-      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
-      return commonBufferInfo;
-    }
-  }, {
-    key: "getRasterData",
-    value: function () {
-      var _getRasterData = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(parserDataItem) {
-        var data, rescfg, _yield$parserDataItem, rasterData, rest;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              if (!Array.isArray(parserDataItem.data)) {
-                _context.next = 4;
-                break;
-              }
-              data = parserDataItem.data, rescfg = (0, _objectWithoutProperties2.default)(parserDataItem, _excluded);
-              this.dataOption = rescfg;
-              return _context.abrupt("return", (0, _objectSpread2.default)({
-                data: data
-              }, rescfg));
-            case 4:
-              _context.next = 6;
-              return parserDataItem.data;
-            case 6:
-              _yield$parserDataItem = _context.sent;
-              rasterData = _yield$parserDataItem.rasterData;
-              rest = (0, _objectWithoutProperties2.default)(_yield$parserDataItem, _excluded2);
-              this.dataOption = rest;
-              if (!Array.isArray(rasterData)) {
-                _context.next = 14;
-                break;
-              }
-              return _context.abrupt("return", (0, _objectSpread2.default)({
-                data: rasterData
-              }, rest));
-            case 14:
-              return _context.abrupt("return", (0, _objectSpread2.default)({
-                data: Array.from(rasterData)
-              }, rest));
-            case 15:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function getRasterData(_x) {
-        return _getRasterData.apply(this, arguments);
-      }
-      return getRasterData;
-    }()
-  }, {
-    key: "initModels",
-    value: function () {
-      var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              this.initUniformsBuffer();
-              source = this.layer.getSource();
-              createTexture2D = this.rendererService.createTexture2D;
-              parserDataItem = source.data.dataArray[0];
-              _context2.next = 6;
-              return this.getRasterData(parserDataItem);
-            case 6:
-              _yield$this$getRaster = _context2.sent;
-              data = _yield$this$getRaster.data;
-              width = _yield$this$getRaster.width;
-              height = _yield$this$getRaster.height;
-              this.texture = createTexture2D({
-                // @ts-ignore
-                data: new Float32Array(data),
-                width: width,
-                height: height,
-                format: _l7Core.gl.RGB,
-                type: _l7Core.gl.FLOAT
-              });
-              _context2.next = 13;
-              return this.layer.buildLayerModel({
-                moduleName: 'rasterImageDataRGBA',
-                vertexShader: rasterVert,
-                fragmentShader: rasterFrag,
-                triangulation: _triangulation.RasterImageTriangulation,
-                primitive: _l7Core.gl.TRIANGLES,
-                depth: {
-                  enable: false
-                },
-                pickingEnabled: false
-              });
-            case 13:
-              model = _context2.sent;
-              return _context2.abrupt("return", [model]);
-            case 15:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
+  getUninforms() {
+    const commoninfo = this.getCommonUniformsInfo();
+    const attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+    this.updateStyleUnifoms();
+    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, commoninfo.uniformsOption), attributeInfo.uniformsOption);
+  }
+  getCommonUniformsInfo() {
+    const {
+      opacity = 1,
+      noDataValue = 0
+    } = this.layer.getLayerConfig();
+    const {
+      rMinMax = [0, 255],
+      gMinMax = [0, 255],
+      bMinMax = [0, 255]
+    } = this.dataOption;
+    const commonOptions = {
+      u_rminmax: rMinMax,
+      u_gminmax: gMinMax,
+      u_bminmax: bMinMax,
+      u_opacity: opacity || 1,
+      u_noDataValue: noDataValue,
+      u_texture: this.texture
+    };
+    this.textures = [this.texture];
+    const commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+    return commonBufferInfo;
+  }
+  getRasterData(parserDataItem) {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      if (Array.isArray(parserDataItem.data)) {
+        const {
+            data
+          } = parserDataItem,
+          rescfg = (0, _objectWithoutProperties2.default)(parserDataItem, _excluded);
+        _this.dataOption = rescfg;
+        return (0, _objectSpread2.default)({
+          data
+        }, rescfg);
       }
-      return initModels;
-    }()
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              return _context3.abrupt("return", this.initModels());
-            case 1:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
+      const _yield$parserDataItem = yield parserDataItem.data,
+        {
+          rasterData
+        } = _yield$parserDataItem,
+        rest = (0, _objectWithoutProperties2.default)(_yield$parserDataItem, _excluded2);
+      _this.dataOption = rest;
+      if (Array.isArray(rasterData)) {
+        // 直接传入波段数据
+        return (0, _objectSpread2.default)({
+          data: rasterData
+        }, rest);
+      } else {
+        // 多波段形式、需要进行处理
+        // 支持彩色栅格（多通道）
+        return (0, _objectSpread2.default)({
+          data: Array.from(rasterData)
+        }, rest);
       }
-      return buildModels;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
-    }
-  }, {
-    key: "registerBuiltinAttributes",
-    value: function registerBuiltinAttributes() {
-      // point layer size;
-      this.styleAttributeService.registerStyleAttribute({
-        name: 'uv',
-        type: _l7Core.AttributeType.Attribute,
-        descriptor: {
-          name: 'a_Uv',
-          shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
-          buffer: {
-            // give the WebGL driver a hint that this buffer may change
-            usage: _l7Core.gl.DYNAMIC_DRAW,
-            data: [],
-            type: _l7Core.gl.FLOAT
-          },
-          size: 2,
-          update: function update(feature, featureIdx, vertex) {
-            return [vertex[3], vertex[4]];
-          }
-        }
+    })();
+  }
+  initModels() {
+    var _this2 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      _this2.initUniformsBuffer();
+      const source = _this2.layer.getSource();
+      const {
+        createTexture2D
+      } = _this2.rendererService;
+      const parserDataItem = source.data.dataArray[0];
+      const {
+        data,
+        width,
+        height
+      } = yield _this2.getRasterData(parserDataItem);
+      _this2.texture = createTexture2D({
+        // @ts-ignore
+        data: new Float32Array(data),
+        width,
+        height,
+        format: _l7Core.gl.RGB,
+        type: _l7Core.gl.FLOAT
+      });
+      const model = yield _this2.layer.buildLayerModel({
+        moduleName: 'rasterImageDataRGBA',
+        vertexShader: rasterVert,
+        fragmentShader: rasterFrag,
+        triangulation: _triangulation.RasterImageTriangulation,
+        primitive: _l7Core.gl.TRIANGLES,
+        depth: {
+          enable: false
+        },
+        pickingEnabled: false
       });
-    }
-  }]);
-  return RasterModel;
-}(_BaseModel2.default);
+      return [model];
+    })();
+  }
+  buildModels() {
+    var _this3 = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      return _this3.initModels();
+    })();
+  }
+  clearModels() {
+    var _this$texture;
+    (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+  }
+  registerBuiltinAttributes() {
+    // point layer size;
+    this.styleAttributeService.registerStyleAttribute({
+      name: 'uv',
+      type: _l7Core.AttributeType.Attribute,
+      descriptor: {
+        name: 'a_Uv',
+        shaderLocation: _CommonStyleAttribute.ShaderLocation.UV,
+        buffer: {
+          // give the WebGL driver a hint that this buffer may change
+          usage: _l7Core.gl.DYNAMIC_DRAW,
+          data: [],
+          type: _l7Core.gl.FLOAT
+        },
+        size: 2,
+        update: (feature, featureIdx, vertex) => {
+          return [vertex[3], vertex[4]];
+        }
+      }
+    });
+  }
+}
+exports.default = RasterModel;

package/lib/raster/models/rasterTerrainRgb.d.ts

@@ -0,0 +1,16 @@
+import type { IModel, ITexture2D } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class RasterTerrainRGB extends BaseModel {
+    protected texture: ITexture2D;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    initModels(): Promise<IModel[]>;
+    clearModels(): void;
+    buildModels(): Promise<IModel[]>;
+    protected registerBuiltinAttributes(): void;
+}