@antv/l7-layers 2.20.3 → 2.20.6

package/es/heatmap/shaders/{heatmap_3d_vert.glsl → heatmap/heatmap_3d_vert.glsl}

@@ -1,13 +1,20 @@
-precision highp float;
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
+
+layout(std140) uniform commonUniforms {
+  mat4 u_ViewProjectionMatrixUncentered;
+  mat4 u_InverseViewProjectionMatrix;
+  float u_opacity;
+  float u_common_uniforms_padding1;
+  float u_common_uniforms_padding2;
+  float u_common_uniforms_padding3;
+};
+
 uniform sampler2D u_texture;
-varying vec2 v_texCoord;
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_InverseViewProjectionMatrix;
-uniform mat4 u_ViewProjectionMatrixUncentered;
-varying float v_intensity;
+uniform sampler2D u_colorTexture;
 
+out vec2 v_texCoord;
+out float v_intensity;
 
 vec2 toBezier(float t, vec2 P0, vec2 P1, vec2 P2, vec2 P3) {
     float t2 = t * t;
@@ -18,7 +25,10 @@ vec2 toBezier(float t, vec2 P0, vec2 P1, vec2 P2, vec2 P3) {
 vec2 toBezier(float t, vec4 p){
     return toBezier(t, vec2(0.0, 0.0), vec2(p.x, p.y), vec2(p.z, p.w), vec2(1.0, 1.0));
 }
+
 #pragma include "projection"
+#pragma include "project"
+
 void main() {
   v_texCoord = a_Uv;
 
@@ -39,7 +49,7 @@ void main() {
   vec4 b= vec4(0.5000, 0.0, 1.0, 0.5000);
   float fh;
 
-  v_intensity = texture2D(u_texture, v_texCoord).r;
+  v_intensity = texture(SAMPLER_2D(u_texture), v_texCoord).r;
   fh = toBezier(v_intensity, b).y;
   gl_Position = u_ViewProjectionMatrixUncentered * vec4(position.xy, fh * project_pixel(50.), 1.0);
  

package/es/heatmap/shaders/heatmap/heatmap_frag.glsl

@@ -0,0 +1,52 @@
+uniform sampler2D u_texture;        // 热力强度图
+uniform sampler2D u_colorTexture;   // 根据强度分布的色带
+
+layout(std140) uniform commonUniforms {
+  float u_opacity;
+  float u_common_uniforms_padding1;
+  float u_common_uniforms_padding2;
+  float u_common_uniforms_padding3;
+};
+in vec2 v_texCoord;
+out vec4 outputColor;
+
+#pragma include "scene_uniforms"
+
+float getBlurIndusty() {
+    float vW = 2.0/ u_ViewportSize.x;
+    float vH = 2.0/ u_ViewportSize.y;
+    vec2 vUv = v_texCoord;
+    float i11 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;
+    float i12 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;
+    float i13 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;
+
+    float i21 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y) ).r;
+    float i22 = texture(SAMPLER_2D(u_texture), vec2( vUv.x , vUv.y) ).r;
+    float i23 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y) ).r;
+
+    float i31 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;
+    float i32 = texture(SAMPLER_2D(u_texture), vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;
+    float i33 = texture(SAMPLER_2D(u_texture), vec2( vUv.x + 1.0 * vW, vUv.y-1.0*vH) ).r;
+
+    return(
+        i11 + 
+        i12 + 
+        i13 + 
+        i21 + 
+        i21 + 
+        i22 + 
+        i23 + 
+        i31 + 
+        i32 + 
+        i33
+        )/9.0;
+}
+
+
+void main(){
+    // float intensity = texture(u_texture, v_texCoord).r;
+    float intensity = getBlurIndusty();
+    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(intensity, 0.0));
+    outputColor = color;
+    outputColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;
+}

package/es/heatmap/shaders/heatmap/heatmap_framebuffer_frag.glsl

@@ -0,0 +1,16 @@
+layout(std140) uniform commonUniforms {
+  float u_radius;
+  float u_intensity;
+  float u_common_uniforms_padding1;
+  float u_common_uniforms_padding2;
+};
+
+in float v_weight;
+in vec2 v_extrude;
+out vec4 outputColor;
+#define GAUSS_COEF  0.3989422804014327
+void main(){
+    float d = -0.5 * 3.0 * 3.0 * dot(v_extrude, v_extrude);
+    float val = v_weight * u_intensity * GAUSS_COEF * exp(d);
+    outputColor = vec4(val, 1., 1., 1.);
+}

package/{lib/heatmap/shaders → es/heatmap/shaders/heatmap}/heatmap_framebuffer_vert.glsl

@@ -1,12 +1,17 @@
-precision highp float;
-attribute vec3 a_Position;
-attribute float a_Size;
-attribute vec2 a_Dir;
-uniform float u_intensity;
-uniform float u_radius;
-varying vec2 v_extrude;
-varying float v_weight;
-uniform mat4 u_ModelMatrix;
+layout(location = 0) in vec3 a_Position;
+layout(location = 9) in float a_Size;
+layout(location = 10) in vec2 a_Dir;
+
+
+layout(std140) uniform commonUniforms {
+  float u_radius;
+  float u_intensity;
+  float u_common_uniforms_padding1;
+  float u_common_uniforms_padding2;
+};
+
+out vec2 v_extrude;
+out float v_weight;
 
 
 #define GAUSS_COEF  0.3989422804014327

package/es/heatmap/shaders/heatmap/heatmap_vert.glsl

@@ -0,0 +1,19 @@
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
+
+layout(std140) uniform commonUniforms {
+  float u_opacity;
+  float u_common_uniforms_padding1;
+  float u_common_uniforms_padding2;
+  float u_common_uniforms_padding3;
+};
+
+#pragma include "scene_uniforms"
+
+out vec2 v_texCoord;
+void main() {
+  v_texCoord = a_Uv;
+
+  gl_Position = vec4(a_Position.xy, 0, 1.);
+}

package/es/heatmap/shaders/hexagon/hexagon_frag.glsl

@@ -0,0 +1,8 @@
+in vec4 v_color;
+
+#pragma include "picking"
+out vec4 outputColor;
+void main() {
+  outputColor = v_color;
+  outputColor = filterColor(outputColor);
+}

package/es/heatmap/shaders/{hexagon_vert.glsl → hexagon/hexagon_vert.glsl}

@@ -1,18 +1,16 @@
-precision highp float;
-// 多边形顶点坐标
-attribute vec3 a_Position;
-// 多边形经纬度坐标
-attribute vec3 a_Pos;
-attribute float a_Size;
-attribute vec4 a_Color;
-uniform vec2 u_radius;
-uniform float u_coverage: 0.9;
-uniform float u_angle: 0;
-uniform mat4 u_ModelMatrix;
+layout(location = 0) in vec3 a_Position;
+layout(location = 1) in vec4 a_Color;
+layout(location = 10) in vec3 a_Pos;
 
-varying vec4 v_color;
+layout(std140) uniform commonUniforms {
+    vec2 u_radius;
+    float u_opacity;
+    float u_coverage;
+    float u_angle;
+};
+
+out vec4 v_color;
 
-uniform vec2 u_sceneCenterMercator;
 
 #pragma include "projection"
 #pragma include "project"
@@ -20,6 +18,7 @@ uniform vec2 u_sceneCenterMercator;
 
 void main() {
   v_color = a_Color;
+  v_color.a *= u_opacity;
     
   mat2 rotationMatrix = mat2(cos(u_angle), sin(u_angle), -sin(u_angle), cos(u_angle));
   vec2 offset =(vec2(a_Position.xy * u_radius * rotationMatrix * u_coverage));

package/es/image/index.d.ts

@@ -1,6 +1,6 @@
 import BaseLayer from '../core/BaseLayer';
-import { IImageLayerStyleOptions } from '../core/interface';
-import { ImageModelType } from './models/index';
+import type { IImageLayerStyleOptions } from '../core/interface';
+import type { ImageModelType } from './models/index';
 export default class ImageLayer extends BaseLayer<IImageLayerStyleOptions> {
     type: string;
     buildModels(): Promise<void>;

package/es/image/models/image.d.ts

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

package/es/image/models/image.js

@@ -11,9 +11,11 @@ import { AttributeType, gl } from '@antv/l7-core';
 import BaseModel from "../../core/BaseModel";
 import { RasterImageTriangulation } from "../../core/triangulation";
 /* babel-plugin-inline-import '../shaders/image_frag.glsl' */
-var ImageFrag = "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  if(gl_FragColor.a < 0.01)\n    discard;\n}\n";
+var ImageFrag = "uniform sampler2D u_texture;\nlayout(std140) uniform commonUniforms {\n    float u_opacity:1.0;\n    float u_brightness:1.0;\n    float u_contrast:1.0;\n    float u_saturation:1.0;\n    float u_gamma:1.0;\n};\n\nin vec2 v_texCoord;\nout vec4 outputColor;\nvec3 setContrast(vec3 rgb, float contrast) {\n  vec3 color = mix(vec3(0.5), rgb, contrast);\n  color = clamp(color, 0.0, 1.0);\n  return color;\n}\nvec3 setSaturation(vec3 rgb, float adjustment) {\n  const vec3 grayVector = vec3(0.2125, 0.7154, 0.0721);\n  vec3 intensity = vec3(dot(rgb, grayVector));\n  vec3 color = mix(intensity, rgb, adjustment);\n  color = clamp(color, 0.0, 1.0);\n  return color;\n}\nvoid main() {\n  vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));\n  //brightness\n  color.rgb = mix(vec3(0.0, 0.0, 0.0), color.rgb, u_brightness);\n  //contrast\n  color.rgb = setContrast(color.rgb, u_contrast);\n  // saturation\n  color.rgb = setSaturation(color.rgb, u_saturation);\n  // gamma\n  color.rgb = pow(color.rgb, vec3(u_gamma));\n  outputColor = color;\n  outputColor.a *= u_opacity;\n  if(outputColor.a < 0.01)\n    discard;\n}\n";
 /* babel-plugin-inline-import '../shaders/image_vert.glsl' */
-var ImageVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\n\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_v2(vec4(project_pos.xy,0., 1.0));\n \n}\n";
+var ImageVert = "layout(location = 0) in vec3 a_Position;\nlayout(location = 14) in vec2 a_Uv;\n\nlayout(std140) uniform commonUniforms {\n    float u_opacity:1.0;\n    float u_brightness:1.0;\n    float u_contrast:1.0;\n    float u_saturation:1.0;\n    float u_gamma:1.0;\n};\n\nout 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_v2(vec4(project_pos.xy,0., 1.0));\n \n}\n";
+import { ShaderLocation } from "../../core/CommonStyleAttribute";
+import { defaultValue, rgb2arr } from '@antv/l7-utils';
 var ImageModel = /*#__PURE__*/function (_BaseModel) {
   _inherits(ImageModel, _BaseModel);
   var _super = _createSuper(ImageModel);
@@ -22,33 +24,74 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
     return _super.apply(this, arguments);
   }
   _createClass(ImageModel, [{
-    key: "getUninforms",
-    value: function getUninforms() {
+    key: "getCommonUniformsInfo",
+    value: function getCommonUniformsInfo() {
       var _ref = this.layer.getLayerConfig(),
-        opacity = _ref.opacity;
-      return {
-        u_opacity: opacity || 1,
-        u_texture: this.texture
+        _ref$color = _ref.color,
+        color = _ref$color === void 0 ? 'rgb(255,255,255)' : _ref$color,
+        opacity = _ref.opacity,
+        brightness = _ref.brightness,
+        contrast = _ref.contrast,
+        saturation = _ref.saturation,
+        gamma = _ref.gamma;
+      var colorArry = rgb2arr(color);
+      var commonOptions = {
+        u_opacity: defaultValue(opacity, 1.0),
+        u_brightness: defaultValue(brightness, 1.0),
+        u_contrast: defaultValue(contrast, 1.0),
+        u_saturation: defaultValue(saturation, 1.0),
+        u_gamma: defaultValue(gamma, 1.0)
       };
+      this.textures = [this.texture];
+      var commonBufferInfo = this.getUniformsBufferInfo(commonOptions);
+      return commonBufferInfo;
     }
   }, {
     key: "initModels",
     value: function () {
       var _initModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var source, createTexture2D, imageData, model;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              source = this.layer.getSource();
+              _context.next = 2;
+              return this.loadTexture();
+            case 2:
+              return _context.abrupt("return", this.buildModels());
+            case 3:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this);
+      }));
+      function initModels() {
+        return _initModels.apply(this, arguments);
+      }
+      return initModels;
+    }()
+  }, {
+    key: "clearModels",
+    value: function clearModels() {
+      var _this$texture;
+      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
+    }
+  }, {
+    key: "loadTexture",
+    value: function () {
+      var _loadTexture = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var createTexture2D, source, imageData;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
               createTexture2D = this.rendererService.createTexture2D;
               this.texture = createTexture2D({
                 height: 0,
                 width: 0
               });
-              _context.next = 5;
+              source = this.layer.getSource();
+              _context2.next = 5;
               return source.data.images;
             case 5:
-              imageData = _context.sent;
+              imageData = _context2.sent;
               this.texture = createTexture2D({
                 data: imageData[0],
                 width: imageData[0].width,
@@ -56,7 +99,27 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
                 mag: gl.LINEAR,
                 min: gl.LINEAR
               });
-              _context.next = 9;
+            case 7:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function loadTexture() {
+        return _loadTexture.apply(this, arguments);
+      }
+      return loadTexture;
+    }()
+  }, {
+    key: "buildModels",
+    value: function () {
+      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+        var model;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              this.initUniformsBuffer();
+              _context3.next = 3;
               return this.layer.buildLayerModel({
                 moduleName: 'rasterImage',
                 vertexShader: ImageVert,
@@ -71,39 +134,14 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 9:
-              model = _context.sent;
-              return _context.abrupt("return", [model]);
-            case 11:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function initModels() {
-        return _initModels.apply(this, arguments);
-      }
-      return initModels;
-    }()
-  }, {
-    key: "clearModels",
-    value: function clearModels() {
-      var _this$texture;
-      (_this$texture = this.texture) === null || _this$texture === void 0 || _this$texture.destroy();
-    }
-  }, {
-    key: "buildModels",
-    value: function () {
-      var _buildModels = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              return _context2.abrupt("return", this.initModels());
-            case 1:
+            case 3:
+              model = _context3.sent;
+              return _context3.abrupt("return", [model]);
+            case 5:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this);
+        }, _callee3, this);
       }));
       function buildModels() {
         return _buildModels.apply(this, arguments);
@@ -118,6 +156,7 @@ var ImageModel = /*#__PURE__*/function (_BaseModel) {
         type: AttributeType.Attribute,
         descriptor: {
           name: 'a_Uv',
+          shaderLocation: ShaderLocation.UV,
           buffer: {
             usage: gl.DYNAMIC_DRAW,
             data: [],

package/es/image/shaders/image_frag.glsl

@@ -1,11 +1,38 @@
-precision mediump float;
-uniform float u_opacity: 1.0;
 uniform sampler2D u_texture;
-varying vec2 v_texCoord;
+layout(std140) uniform commonUniforms {
+    float u_opacity:1.0;
+    float u_brightness:1.0;
+    float u_contrast:1.0;
+    float u_saturation:1.0;
+    float u_gamma:1.0;
+};
+
+in vec2 v_texCoord;
+out vec4 outputColor;
+vec3 setContrast(vec3 rgb, float contrast) {
+  vec3 color = mix(vec3(0.5), rgb, contrast);
+  color = clamp(color, 0.0, 1.0);
+  return color;
+}
+vec3 setSaturation(vec3 rgb, float adjustment) {
+  const vec3 grayVector = vec3(0.2125, 0.7154, 0.0721);
+  vec3 intensity = vec3(dot(rgb, grayVector));
+  vec3 color = mix(intensity, rgb, adjustment);
+  color = clamp(color, 0.0, 1.0);
+  return color;
+}
 void main() {
-  vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));
-  gl_FragColor = color;
-  gl_FragColor.a *= u_opacity;
-  if(gl_FragColor.a < 0.01)
+  vec4 color = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y));
+  //brightness
+  color.rgb = mix(vec3(0.0, 0.0, 0.0), color.rgb, u_brightness);
+  //contrast
+  color.rgb = setContrast(color.rgb, u_contrast);
+  // saturation
+  color.rgb = setSaturation(color.rgb, u_saturation);
+  // gamma
+  color.rgb = pow(color.rgb, vec3(u_gamma));
+  outputColor = color;
+  outputColor.a *= u_opacity;
+  if(outputColor.a < 0.01)
     discard;
 }

package/es/image/shaders/image_vert.glsl

@@ -1,9 +1,15 @@
-precision highp float;
-uniform mat4 u_ModelMatrix;
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
 
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
-varying vec2 v_texCoord;
+layout(std140) uniform commonUniforms {
+    float u_opacity:1.0;
+    float u_brightness:1.0;
+    float u_contrast:1.0;
+    float u_saturation:1.0;
+    float u_gamma:1.0;
+};
+
+out vec2 v_texCoord;
 #pragma include "projection"
 void main() {
    v_texCoord = a_Uv;

package/es/line/index.d.ts

@@ -1,7 +1,7 @@
-import { IParseDataItem } from '@antv/l7-core';
+import type { IParseDataItem } from '@antv/l7-core';
 import BaseLayer from '../core/BaseLayer';
-import { ILineLayerStyleOptions } from '../core/interface';
-import { LineModelType } from './models';
+import type { ILineLayerStyleOptions } from '../core/interface';
+import type { LineModelType } from './models';
 export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
     type: string;
     enableShaderEncodeStyles: string[];
@@ -24,7 +24,7 @@ export default class LineLayer extends BaseLayer<ILineLayerStyleOptions> {
         };
     };
     buildModels(): Promise<void>;
-    protected getDefaultConfig(): {} | {} | {} | {} | {
+    protected getDefaultConfig(): {} | {} | {} | {
         blend: string;
     } | {
         blend: string;

package/es/line/index.js

@@ -23,7 +23,8 @@ var LineLayer = /*#__PURE__*/function (_BaseLayer) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "type", 'LineLayer');
-    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['opacity', 'offsets', 'stroke', 'thetaOffset']);
+    _defineProperty(_assertThisInitialized(_this), "enableShaderEncodeStyles", ['stroke', 'offsets', 'opacity', 'thetaOffset']);
+    //注意顺序 4+2+1+1
     _defineProperty(_assertThisInitialized(_this), "arrowInsertCount", 0);
     _defineProperty(_assertThisInitialized(_this), "defaultSourceConfig", {
       data: [{

package/es/line/models/arc.d.ts

@@ -1,9 +1,14 @@
-import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
+import type { IModel, ITexture2D } from '@antv/l7-core';
 import BaseModel from '../../core/BaseModel';
 export default class ArcModel extends BaseModel {
     protected texture: ITexture2D;
-    getUninforms(): IModelUniform;
-    getAnimateUniforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
     initModels(): Promise<IModel[]>;
     clearModels(): void;
     getShaders(): {