@antv/l7-layers 2.16.1 → 2.16.2

package/es/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/es/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/es/raster/buffers/triangulation.js

@@ -2,18 +2,16 @@
 import Martini from '@mapbox/martini';
 export function RasterTriangulation(parserData) {
   var data = parserData.data,
-      width = parserData.width,
-      height = parserData.height;
+    width = parserData.width,
+    height = parserData.height;
   var maxlength = Math.max(width, height);
   var gridSize = Math.pow(2, Math.ceil(Math.log2(maxlength))) + 1;
   var terrain = new Float32Array(gridSize * gridSize);
-
   for (var i = 0; i < width; i++) {
     for (var j = 0; j < height; j++) {
       terrain[i * gridSize + j] = data[i * width + j];
     }
   }
-
   var martini = new Martini(gridSize);
   var tile = martini.createTile(terrain);
   var mesh = tile.getMesh(gridSize / 2);

package/es/raster/index.js

@@ -7,61 +7,44 @@ import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConst
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-
 import BaseLayer from "../core/BaseLayer";
 import RasterModels from "./models/index";
-
 var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
   _inherits(RaterLayer, _BaseLayer);
-
   var _super = _createSuper(RaterLayer);
-
   function RaterLayer() {
     var _this;
-
     _classCallCheck(this, RaterLayer);
-
     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));
-
     _defineProperty(_assertThisInitialized(_this), "type", 'RasterLayer');
-
     return _this;
   }
-
   _createClass(RaterLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var modelType;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new RasterModels[modelType](this);
-                _context.next = 4;
-                return this.initLayerModels();
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              modelType = this.getModelType();
+              this.layerModel = new RasterModels[modelType](this);
+              _context.next = 4;
+              return this.initLayerModels();
+            case 4:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this);
       }));
-
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
-
       return buildModels;
     }()
   }, {
@@ -81,24 +64,18 @@ var RaterLayer = /*#__PURE__*/function (_BaseLayer) {
     value: function getModelType() {
       // 根据 source 的类型判断 model type
       var parserType = this.layerSource.getParserType();
-
       switch (parserType) {
         case 'raster':
           return 'raster';
-
         case 'rasterRgb':
           return 'rasterRgb';
-
         case 'image':
           return 'rasterTerrainRgb';
-
         default:
           return 'raster';
       }
     }
   }]);
-
   return RaterLayer;
 }(BaseLayer);
-
 export { RaterLayer as default };

package/es/raster/models/raster.js

@@ -5,48 +5,37 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _possibleConstructorReturn from "@babel/runtime/helpers/esm/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime/helpers/esm/getPrototypeOf";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(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; } }
-
 import { AttributeType, gl } from '@antv/l7-core';
 import { getDefaultDomain } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
-
 /* babel-plugin-inline-import '../shaders/raster_2d_frag.glsl' */
 var rasterFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\nuniform float u_min;\nuniform float u_max;\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nvarying vec2 v_texCoord;\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\n\nvoid main() {\n\n  float value = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).r;\n  if (value == u_noDataValue || isnan_emu(value))\n      discard;\n  else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1]))\n     discard;\n  else {\n    float normalisedValue =(value - u_domain[0]) / (u_domain[1] -u_domain[0]);\n    vec4 color = texture2D(u_colorTexture,vec2(normalisedValue, 0));\n    \n    gl_FragColor = color;\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n    if(gl_FragColor.a < 0.01)\n      discard;\n   \n  }\n}\n";
-
 /* babel-plugin-inline-import '../shaders/raster_2d_vert.glsl' */
 var rasterVert = "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 RasterModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(RasterModel, _BaseModel);
-
   var _super = _createSuper(RasterModel);
-
   function RasterModel() {
     _classCallCheck(this, RasterModel);
-
     return _super.apply(this, arguments);
   }
-
   _createClass(RasterModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref = this.layer.getLayerConfig(),
-          _ref$opacity = _ref.opacity,
-          opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
-          _ref$clampLow = _ref.clampLow,
-          clampLow = _ref$clampLow === void 0 ? true : _ref$clampLow,
-          _ref$clampHigh = _ref.clampHigh,
-          clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
-          _ref$noDataValue = _ref.noDataValue,
-          noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
-          domain = _ref.domain,
-          rampColors = _ref.rampColors;
-
+        _ref$opacity = _ref.opacity,
+        opacity = _ref$opacity === void 0 ? 1 : _ref$opacity,
+        _ref$clampLow = _ref.clampLow,
+        clampLow = _ref$clampLow === void 0 ? true : _ref$clampLow,
+        _ref$clampHigh = _ref.clampHigh,
+        clampHigh = _ref$clampHigh === void 0 ? true : _ref$clampHigh,
+        _ref$noDataValue = _ref.noDataValue,
+        noDataValue = _ref$noDataValue === void 0 ? -9999999 : _ref$noDataValue,
+        domain = _ref.domain,
+        rampColors = _ref.rampColors;
       var newdomain = domain || getDefaultDomain(rampColors);
       this.colorTexture = this.layer.textureService.getColorTexture(rampColors, newdomain);
       return {
@@ -64,49 +53,40 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _getRasterData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(parserDataItem) {
         var _yield$parserDataItem, rasterData, width, height;
-
         return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                if (!Array.isArray(parserDataItem.data)) {
-                  _context.next = 4;
-                  break;
-                }
-
-                return _context.abrupt("return", {
-                  data: parserDataItem.data,
-                  width: parserDataItem.width,
-                  height: parserDataItem.height
-                });
-
-              case 4:
-                _context.next = 6;
-                return parserDataItem.data;
-
-              case 6:
-                _yield$parserDataItem = _context.sent;
-                rasterData = _yield$parserDataItem.rasterData;
-                width = _yield$parserDataItem.width;
-                height = _yield$parserDataItem.height;
-                return _context.abrupt("return", {
-                  data: Array.from(rasterData),
-                  width: width,
-                  height: height
-                });
-
-              case 11:
-              case "end":
-                return _context.stop();
-            }
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!Array.isArray(parserDataItem.data)) {
+                _context.next = 4;
+                break;
+              }
+              return _context.abrupt("return", {
+                data: parserDataItem.data,
+                width: parserDataItem.width,
+                height: parserDataItem.height
+              });
+            case 4:
+              _context.next = 6;
+              return parserDataItem.data;
+            case 6:
+              _yield$parserDataItem = _context.sent;
+              rasterData = _yield$parserDataItem.rasterData;
+              width = _yield$parserDataItem.width;
+              height = _yield$parserDataItem.height;
+              return _context.abrupt("return", {
+                data: Array.from(rasterData),
+                width: width,
+                height: height
+              });
+            case 11:
+            case "end":
+              return _context.stop();
           }
         }, _callee);
       }));
-
       function getRasterData(_x) {
         return _getRasterData.apply(this, arguments);
       }
-
       return getRasterData;
     }()
   }, {
@@ -114,58 +94,50 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
         var source, createTexture2D, parserDataItem, _yield$this$getRaster, data, width, height, model;
-
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                source = this.layer.getSource();
-                createTexture2D = this.rendererService.createTexture2D;
-                parserDataItem = source.data.dataArray[0];
-                _context2.next = 5;
-                return this.getRasterData(parserDataItem);
-
-              case 5:
-                _yield$this$getRaster = _context2.sent;
-                data = _yield$this$getRaster.data;
-                width = _yield$this$getRaster.width;
-                height = _yield$this$getRaster.height;
-                this.texture = createTexture2D({
-                  data: data,
-                  width: width,
-                  height: height,
-                  format: gl.LUMINANCE,
-                  type: gl.FLOAT // aniso: 4,
-
-                });
-                _context2.next = 12;
-                return this.layer.buildLayerModel({
-                  moduleName: 'rasterImageData',
-                  vertexShader: rasterVert,
-                  fragmentShader: rasterFrag,
-                  triangulation: RasterImageTriangulation,
-                  primitive: gl.TRIANGLES,
-                  depth: {
-                    enable: false
-                  }
-                });
-
-              case 12:
-                model = _context2.sent;
-                return _context2.abrupt("return", [model]);
-
-              case 14:
-              case "end":
-                return _context2.stop();
-            }
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              source = this.layer.getSource();
+              createTexture2D = this.rendererService.createTexture2D;
+              parserDataItem = source.data.dataArray[0];
+              _context2.next = 5;
+              return this.getRasterData(parserDataItem);
+            case 5:
+              _yield$this$getRaster = _context2.sent;
+              data = _yield$this$getRaster.data;
+              width = _yield$this$getRaster.width;
+              height = _yield$this$getRaster.height;
+              this.texture = createTexture2D({
+                data: data,
+                width: width,
+                height: height,
+                format: gl.LUMINANCE,
+                type: gl.FLOAT
+                // aniso: 4,
+              });
+              _context2.next = 12;
+              return this.layer.buildLayerModel({
+                moduleName: 'rasterImageData',
+                vertexShader: rasterVert,
+                fragmentShader: rasterFrag,
+                triangulation: RasterImageTriangulation,
+                primitive: gl.TRIANGLES,
+                depth: {
+                  enable: false
+                }
+              });
+            case 12:
+              model = _context2.sent;
+              return _context2.abrupt("return", [model]);
+            case 14:
+            case "end":
+              return _context2.stop();
           }
         }, _callee2, this);
       }));
-
       function initModels() {
         return _initModels.apply(this, arguments);
       }
-
       return initModels;
     }()
   }, {
@@ -173,30 +145,24 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
         return _regeneratorRuntime.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();
-            }
+          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);
       }
-
       return buildModels;
     }()
   }, {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture, _this$colorTexture;
-
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
       (_this$colorTexture = this.colorTexture) === null || _this$colorTexture === void 0 ? void 0 : _this$colorTexture.destroy();
     }
@@ -223,8 +189,6 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
       });
     }
   }]);
-
   return RasterModel;
 }(BaseModel);
-
 export { RasterModel as default };