@antv/l7-layers 2.20.8 → 2.20.10

package/es/core/BaseLayer.d.ts

@@ -159,6 +159,7 @@ export default class BaseLayer<ChildLayerStyleOptions = {}> extends EventEmitter
      * 渲染所有的图层
      */
     renderLayers(): void;
+    prerender(): void;
     render(options?: Partial<IRenderOptions>): ILayer;
     /**
      * renderMultiPass 专门用于渲染支持 multipass 的 layer

package/es/core/BaseLayer.js

@@ -633,6 +633,9 @@ var BaseLayer = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
       this.layerService.reRender();
       this.rendering = false;
     }
+  }, {
+    key: "prerender",
+    value: function prerender() {}
   }, {
     key: "render",
     value: function render() {

package/es/core/BaseModel.d.ts

@@ -50,6 +50,7 @@ export default class BaseModel<ChildLayerStyleOptions = {}> implements ILayerMod
         };
         elements: IElements;
     };
+    prerender(): void;
     render(renderOptions?: Partial<IRenderOptions>): void;
     protected registerBuiltinAttributes(): void;
     protected animateOption2Array(option: IAnimateOption): number[];

package/es/core/BaseModel.js

@@ -13,9 +13,9 @@ import { BlendType, lazyInject, MaskOperation, StencilType, TYPES } from '@antv/
 import { rgb2arr } from '@antv/l7-utils';
 import { BlendTypes } from "../utils/blend";
 import { getStencil as _getStencil, getStencilMask } from "../utils/stencil";
+import { getCommonStyleAttributeOptions, ShaderLocation } from "./CommonStyleAttribute";
 import { DefaultUniformStyleType, DefaultUniformStyleValue } from "./constant";
 import { MultipleOfFourNumber } from "./utils";
-import { getCommonStyleAttributeOptions, ShaderLocation } from "./CommonStyleAttribute";
 var shaderLocationMap = {
   opacity: ShaderLocation.OPACITY,
   stroke: ShaderLocation.STROKE,
@@ -204,6 +204,9 @@ var BaseModel = (_dec = lazyInject(TYPES.IGlobalConfigService), (_class = /*#__P
     value: function getAttribute() {
       throw new Error('Method not implemented.');
     }
+  }, {
+    key: "prerender",
+    value: function prerender() {}
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "render",

package/es/heatmap/index.d.ts

@@ -5,6 +5,7 @@ import type { HeatMapModelType } from './models';
 export default class HeatMapLayer extends BaseLayer<IHeatMapLayerStyleOptions> {
     type: string;
     buildModels(): Promise<void>;
+    prerender(): void;
     renderModels(options?: Partial<IRenderOptions>): this;
     updateModelData(data: IAttributeAndElements): void;
     getModelType(): HeatMapModelType;

package/es/heatmap/index.js

@@ -47,6 +47,16 @@ var HeatMapLayer = /*#__PURE__*/function (_BaseLayer) {
       }
       return buildModels;
     }()
+  }, {
+    key: "prerender",
+    value: function prerender() {
+      var shape = this.getModelType();
+      if (shape === 'heatmap') {
+        if (this.layerModel) {
+          this.layerModel.prerender(); // 独立的渲染流程
+        }
+      }
+    }
   }, {
     key: "renderModels",
     value: function renderModels() {

package/es/heatmap/models/heatmap.d.ts

@@ -12,6 +12,7 @@ export default class HeatMapModel extends BaseModel {
     private preRampColors;
     private colorModelUniformBuffer;
     private heat3DModelUniformBuffer;
+    prerender(): void;
     render(options: Partial<IRenderOptions>): void;
     getUninforms(): IModelUniform;
     initModels(): Promise<IModel[]>;

package/es/heatmap/models/heatmap.js

@@ -12,7 +12,7 @@ var _dec, _class;
 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, TextureUsage } from '@antv/l7-core';
+import { AttributeType, TextureUsage, gl } from '@antv/l7-core';
 import { generateColorRamp, getCullFace, lodashUtil } from '@antv/l7-utils';
 import { mat4 } from 'gl-matrix';
 import { injectable } from 'inversify';
@@ -49,14 +49,12 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
     return _this;
   }
   _createClass(HeatMapModel, [{
-    key: "render",
-    value: function render(options) {
+    key: "prerender",
+    value: function prerender() {
       var _this2 = this;
       var _this$rendererService = this.rendererService,
         clear = _this$rendererService.clear,
         useFramebuffer = _this$rendererService.useFramebuffer;
-      var _ref = this.layer.getLayerConfig(),
-        rampColors = _ref.rampColors;
       useFramebuffer(this.heatmapFramerBuffer, function () {
         clear({
           color: [0, 0, 0, 0],
@@ -66,7 +64,12 @@ var HeatMapModel = (_dec = injectable(), _dec(_class = /*#__PURE__*/function (_B
         });
         _this2.drawIntensityMode(); // 密度图
       });
-
+    }
+  }, {
+    key: "render",
+    value: function render(options) {
+      var _ref = this.layer.getLayerConfig(),
+        rampColors = _ref.rampColors;
       if (!isEqual(this.preRampColors, rampColors)) {
         this.updateColorTexture();
       }

package/es/mask/models/fill.d.ts

@@ -2,8 +2,14 @@ import type { IModel } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class MaskModel extends BaseModel {
     getUninforms(): {
-        u_opacity: number;
-        u_color: number[];
+        [x: string]: any;
+    };
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
     };
     initModels(): Promise<IModel[]>;
     buildModels(): Promise<IModel[]>;

package/es/mask/models/fill.js

@@ -1,4 +1,5 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _inherits from "@babel/runtime/helpers/esm/inherits";
@@ -7,14 +8,13 @@ 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 { lodashUtil, rgb2arr } from '@antv/l7-utils';
+import { rgb2arr } from '@antv/l7-utils';
 import BaseModel from "../../core/BaseModel";
 import { polygonTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../../shader/minify_frag.glsl' */
-var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+var mask_frag = "layout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\nout vec4 outputColor;\n\nvoid main() {\n  outputColor = u_color;\n  outputColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
-var mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\n\n\n#pragma include \"projection\"\n\nvoid main() {\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.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
-var isNumber = lodashUtil.isNumber;
+var mask_vert = "layout(location = 0) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\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.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 = /*#__PURE__*/function (_BaseModel) {
   _inherits(MaskModel, _BaseModel);
   var _super = _createSuper(MaskModel);
@@ -25,15 +25,25 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
   _createClass(MaskModel, [{
     key: "getUninforms",
     value: function getUninforms() {
+      var commoninfo = this.getCommonUniformsInfo();
+      var attributeInfo = this.getUniformsBufferInfo(this.getStyleAttribute());
+      this.updateStyleUnifoms();
+      return _objectSpread(_objectSpread({}, 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$color = _ref.color,
         color = _ref$color === void 0 ? '#000' : _ref$color;
-      return {
-        u_opacity: isNumber(opacity) ? opacity : 0.0,
-        u_color: rgb2arr(color)
+      var commonOptions = {
+        u_color: rgb2arr(color),
+        u_opacity: opacity || 1
       };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -62,7 +72,8 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              this.initUniformsBuffer();
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'mask',
                 vertexShader: mask_vert,
@@ -73,10 +84,10 @@ var MaskModel = /*#__PURE__*/function (_BaseModel) {
                 },
                 pick: false
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }

package/es/mask/shaders/mask_vert.glsl

@@ -1,6 +1,9 @@
-attribute vec3 a_Position;
-uniform mat4 u_ModelMatrix;
+layout(location = 0) in vec3 a_Position;
 
+layout(std140) uniform commonUniorm {
+  vec4 u_color;
+  float u_opacity;
+};
 
 #pragma include "projection"
 

package/es/raster/models/raster.js

@@ -14,7 +14,7 @@ import BaseModel from "../../core/BaseModel";
 import { ShaderLocation } from "../../core/CommonStyleAttribute";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/raster/raster_2d_frag.glsl' */
-var rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r * 255.0;\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 = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
+var rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), 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 = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/raster/raster_2d_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_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\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 = /*#__PURE__*/function (_BaseModel) {
@@ -141,11 +141,11 @@ var RasterModel = /*#__PURE__*/function (_BaseModel) {
               width = _yield$this$getRaster.width;
               height = _yield$this$getRaster.height;
               this.texture = createTexture2D({
-                data: new Uint8Array(data),
+                data: data,
                 width: width,
                 height: height,
                 format: gl.LUMINANCE,
-                type: gl.UNSIGNED_BYTE,
+                type: gl.FLOAT,
                 alignment: 1
                 // aniso: 4,
               });

package/es/raster/shaders/raster/raster_2d_frag.glsl

@@ -17,7 +17,7 @@ out vec4 outputColor;
 
 void main() {
   // Can use any component here since u_rasterTexture is under luminance format.
-  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r * 255.0;
+  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r;
   if (value == u_noDataValue || isnan_emu(value)) {
     discard;
   } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {

package/es/shader/minify_frag.glsl

@@ -1,7 +1,11 @@
-uniform float u_opacity : 1.0;
-uniform vec4 u_color;
+layout(std140) uniform commonUniorm {
+  vec4 u_color;
+  float u_opacity;
+};
+
+out vec4 outputColor;
 
 void main() {
-  gl_FragColor = u_color;
-  gl_FragColor.a *= u_opacity;
+  outputColor = u_color;
+  outputColor.a *= u_opacity;
 }

package/es/utils/stencil.js

@@ -1,4 +1,4 @@
-import { gl, MaskOperation, StencilType } from '@antv/l7-core';
+import { MaskOperation, StencilType, gl } from '@antv/l7-core';
 // 掩膜配置
 export function getStencil(mask, maskInside) {
   return {

package/lib/core/BaseLayer.js

@@ -639,6 +639,9 @@ var BaseLayer = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
       this.layerService.reRender();
       this.rendering = false;
     }
+  }, {
+    key: "prerender",
+    value: function prerender() {}
   }, {
     key: "render",
     value: function render() {

package/lib/core/BaseModel.js

@@ -19,9 +19,9 @@ var _l7Core = require("@antv/l7-core");
 var _l7Utils = require("@antv/l7-utils");
 var _blend = require("../utils/blend");
 var _stencil = require("../utils/stencil");
+var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _constant = require("./constant");
 var _utils = require("./utils");
-var _CommonStyleAttribute = require("./CommonStyleAttribute");
 var _dec, _class, _descriptor;
 var shaderLocationMap = {
   opacity: _CommonStyleAttribute.ShaderLocation.OPACITY,
@@ -211,6 +211,9 @@ var BaseModel = exports.default = (_dec = (0, _l7Core.lazyInject)(_l7Core.TYPES.
     value: function getAttribute() {
       throw new Error('Method not implemented.');
     }
+  }, {
+    key: "prerender",
+    value: function prerender() {}
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
   }, {
     key: "render",

package/lib/heatmap/index.js

@@ -54,6 +54,16 @@ var HeatMapLayer = exports.default = /*#__PURE__*/function (_BaseLayer) {
       }
       return buildModels;
     }()
+  }, {
+    key: "prerender",
+    value: function prerender() {
+      var shape = this.getModelType();
+      if (shape === 'heatmap') {
+        if (this.layerModel) {
+          this.layerModel.prerender(); // 独立的渲染流程
+        }
+      }
+    }
   }, {
     key: "renderModels",
     value: function renderModels() {

package/lib/heatmap/models/heatmap.js

@@ -56,14 +56,12 @@ var HeatMapModel = exports.default = (_dec = (0, _inversify.injectable)(), _dec(
     return _this;
   }
   (0, _createClass2.default)(HeatMapModel, [{
-    key: "render",
-    value: function render(options) {
+    key: "prerender",
+    value: function prerender() {
       var _this2 = this;
       var _this$rendererService = this.rendererService,
         clear = _this$rendererService.clear,
         useFramebuffer = _this$rendererService.useFramebuffer;
-      var _ref = this.layer.getLayerConfig(),
-        rampColors = _ref.rampColors;
       useFramebuffer(this.heatmapFramerBuffer, function () {
         clear({
           color: [0, 0, 0, 0],
@@ -73,7 +71,12 @@ var HeatMapModel = exports.default = (_dec = (0, _inversify.injectable)(), _dec(
         });
         _this2.drawIntensityMode(); // 密度图
       });
-
+    }
+  }, {
+    key: "render",
+    value: function render(options) {
+      var _ref = this.layer.getLayerConfig(),
+        rampColors = _ref.rampColors;
       if (!isEqual(this.preRampColors, rampColors)) {
         this.updateColorTexture();
       }

package/lib/mask/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"));
@@ -18,10 +19,9 @@ 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 '../../shader/minify_frag.glsl' */
-var mask_frag = "uniform float u_opacity : 1.0;\nuniform vec4 u_color;\n\nvoid main() {\n  gl_FragColor = u_color;\n  gl_FragColor.a *= u_opacity;\n}\n";
+var mask_frag = "layout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\nout vec4 outputColor;\n\nvoid main() {\n  outputColor = u_color;\n  outputColor.a *= u_opacity;\n}\n";
 /* babel-plugin-inline-import '../shaders/mask_vert.glsl' */
-var mask_vert = "attribute vec3 a_Position;\nuniform mat4 u_ModelMatrix;\n\n\n#pragma include \"projection\"\n\nvoid main() {\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.xyz, 1.0));\n  } else {\n    gl_Position = project_common_position_to_clipspace(vec4(project_pos.xyz, 1.0));\n  }\n}\n\n";
-var isNumber = _l7Utils.lodashUtil.isNumber;
+var mask_vert = "layout(location = 0) in vec3 a_Position;\n\nlayout(std140) uniform commonUniorm {\n  vec4 u_color;\n  float u_opacity;\n};\n\n#pragma include \"projection\"\n\nvoid main() {\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.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 = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(MaskModel, _BaseModel);
   var _super = _createSuper(MaskModel);
@@ -32,15 +32,25 @@ var MaskModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _createClass2.default)(MaskModel, [{
     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$color = _ref.color,
         color = _ref$color === void 0 ? '#000' : _ref$color;
-      return {
-        u_opacity: isNumber(opacity) ? opacity : 0.0,
-        u_color: (0, _l7Utils.rgb2arr)(color)
+      var commonOptions = {
+        u_color: (0, _l7Utils.rgb2arr)(color),
+        u_opacity: opacity || 1
       };
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
@@ -69,7 +79,8 @@ var MaskModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context2.next = 2;
+              this.initUniformsBuffer();
+              _context2.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'mask',
                 vertexShader: mask_vert,
@@ -80,10 +91,10 @@ var MaskModel = exports.default = /*#__PURE__*/function (_BaseModel) {
                 },
                 pick: false
               });
-            case 2:
+            case 3:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 4:
+            case 5:
             case "end":
               return _context2.stop();
           }

package/lib/mask/shaders/mask_vert.glsl

@@ -1,6 +1,9 @@
-attribute vec3 a_Position;
-uniform mat4 u_ModelMatrix;
+layout(location = 0) in vec3 a_Position;
 
+layout(std140) uniform commonUniorm {
+  vec4 u_color;
+  float u_opacity;
+};
 
 #pragma include "projection"
 

package/lib/raster/models/raster.js

@@ -21,7 +21,7 @@ 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/raster/raster_2d_frag.glsl' */
-var rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r * 255.0;\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 = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
+var rasterFrag = "layout(std140) uniform commonUniforms {\n  vec2 u_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\n};\n\nuniform sampler2D u_rasterTexture;\nuniform sampler2D u_colorTexture;\n\nin vec2 v_texCoord;\n\nbool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }\n\nout vec4 outputColor;\n\nvoid main() {\n  // Can use any component here since u_rasterTexture is under luminance format.\n  float value = texture(SAMPLER_2D(u_rasterTexture), 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 = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));\n    \n    outputColor = color;\n    outputColor.a = outputColor.a * u_opacity ;\n    if (outputColor.a < 0.01)\n      discard;\n  }\n}\n";
 /* babel-plugin-inline-import '../shaders/raster/raster_2d_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_domain;\n  float u_opacity;\n  float u_noDataValue;\n  bool u_clampLow;\n  bool u_clampHigh;\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) {
@@ -148,11 +148,11 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
               width = _yield$this$getRaster.width;
               height = _yield$this$getRaster.height;
               this.texture = createTexture2D({
-                data: new Uint8Array(data),
+                data: data,
                 width: width,
                 height: height,
                 format: _l7Core.gl.LUMINANCE,
-                type: _l7Core.gl.UNSIGNED_BYTE,
+                type: _l7Core.gl.FLOAT,
                 alignment: 1
                 // aniso: 4,
               });

package/lib/raster/shaders/raster/raster_2d_frag.glsl

@@ -17,7 +17,7 @@ out vec4 outputColor;
 
 void main() {
   // Can use any component here since u_rasterTexture is under luminance format.
-  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r * 255.0;
+  float value = texture(SAMPLER_2D(u_rasterTexture), vec2(v_texCoord.x, v_texCoord.y)).r;
   if (value == u_noDataValue || isnan_emu(value)) {
     discard;
   } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {

package/lib/shader/minify_frag.glsl

@@ -1,7 +1,11 @@
-uniform float u_opacity : 1.0;
-uniform vec4 u_color;
+layout(std140) uniform commonUniorm {
+  vec4 u_color;
+  float u_opacity;
+};
+
+out vec4 outputColor;
 
 void main() {
-  gl_FragColor = u_color;
-  gl_FragColor.a *= u_opacity;
+  outputColor = u_color;
+  outputColor.a *= u_opacity;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.8",
+  "version": "2.20.10",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,10 +27,10 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.2.9",
-    "@antv/l7-core": "2.20.8",
-    "@antv/l7-maps": "2.20.8",
-    "@antv/l7-source": "2.20.8",
-    "@antv/l7-utils": "2.20.8",
+    "@antv/l7-core": "2.20.10",
+    "@antv/l7-maps": "2.20.10",
+    "@antv/l7-source": "2.20.10",
+    "@antv/l7-utils": "2.20.10",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/clone": "^6.5.0",
@@ -52,7 +52,7 @@
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "@antv/l7-test-utils": "2.20.8",
+    "@antv/l7-test-utils": "2.20.10",
     "@types/d3-array": "^2.0.0",
     "@types/d3-color": "^1.2.2",
     "@types/d3-interpolate": "1.1.6",
@@ -61,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "66dd7560d7515a92f7b13666e74c2e58c1a0aeee",
+  "gitHead": "228c2056e3c5a7ffb334158dff12c79d55ed4ed7",
   "publishConfig": {
     "access": "public"
   }