@antv/l7-layers 2.20.3 → 2.20.6

package/lib/raster/models/rasterRgb.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 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"));
@@ -18,15 +18,16 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _l7Core = require("@antv/l7-core");
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+var _CommonStyleAttribute = require("../../core/CommonStyleAttribute");
 var _triangulation = require("../../core/triangulation");
 var _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/raster_2d_vert.glsl' */
-var rasterVert = "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\n    gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));\n}\n";
-/* babel-plugin-inline-import '../shaders/raster_rgb_frag.glsl' */
-var rasterFrag = "precision mediump float;\nuniform vec2 u_rminmax: vec2(0,255); \nuniform vec2 u_gminmax: vec2(0,255);\nuniform vec2 u_bminmax: vec2(0,255);\nuniform float u_opacity: 1.0;\nuniform sampler2D u_texture;\nuniform float u_noDataValue : 0.0;\nvarying vec2 v_texCoord;\n\nvoid main() {\n  vec3 rgb = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y)).rgb;\n  if(rgb == vec3(u_noDataValue)) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n    gl_FragColor = 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  if(gl_FragColor.a < 0.01)\n    discard;\n \n}";
+/* 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  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);
@@ -43,23 +44,37 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
   (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,
-        rMinMax = _this$dataOption.rMinMax,
-        gMinMax = _this$dataOption.gMinMax,
-        bMinMax = _this$dataOption.bMinMax;
-      return {
-        u_opacity: opacity || 1,
-        u_texture: this.texture,
-        u_noDataValue: noDataValue,
+        _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_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",
@@ -116,25 +131,26 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         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 = 5;
+              _context2.next = 6;
               return this.getRasterData(parserDataItem);
-            case 5:
+            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: data,
+                data: new Float32Array(data),
                 width: width,
                 height: height,
                 format: _l7Core.gl.RGB,
                 type: _l7Core.gl.FLOAT
               });
-              _context2.next = 12;
+              _context2.next = 13;
               return this.layer.buildLayerModel({
                 moduleName: 'rasterImageDataRGBA',
                 vertexShader: rasterVert,
@@ -145,10 +161,10 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
                   enable: false
                 }
               });
-            case 12:
+            case 13:
               model = _context2.sent;
               return _context2.abrupt("return", [model]);
-            case 14:
+            case 15:
             case "end":
               return _context2.stop();
           }
@@ -193,6 +209,7 @@ var RasterModel = exports.default = /*#__PURE__*/function (_BaseModel) {
         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,

package/lib/raster/models/rasterTerrainRgb.js

@@ -18,9 +18,9 @@ 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; } }
-/* babel-plugin-inline-import '../shaders/raster_terrain_rgb_frag.glsl' */
+/* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_frag.glsl' */
 var Raster_terrainFrag = "precision mediump float;\nuniform float u_opacity: 1.0;\n\nuniform sampler2D u_texture;\nuniform sampler2D u_colorTexture;\n\nvarying vec2 v_texCoord;\n\nuniform vec2 u_domain;\nuniform float u_noDataValue;\nuniform bool u_clampLow: true;\nuniform bool u_clampHigh: true;\nuniform vec4 u_unpack;\n\nfloat getElevation(vec2 coord, float bias) {\n    // Convert encoded elevation value to meters\n    vec4 data = texture2D(u_texture, coord,bias) * 255.0;\n    data.a = -1.0;\n    return dot(data, u_unpack);\n}\n\nvec4 getColor(float value) {\n   float normalisedValue =(value- u_domain[0]) / (u_domain[1] - u_domain[0]);\n    vec2 coord = vec2(normalisedValue, 0);\n    return texture2D(u_colorTexture, coord);\n}\n\nvoid main() {\n  float value = getElevation(v_texCoord,0.0);\n  if (value == u_noDataValue) {\n    gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {\n     gl_FragColor = vec4(0.0, 0, 0, 0.0);\n  } else {\n   \n    gl_FragColor = getColor(value);\n    gl_FragColor.a =  gl_FragColor.a * u_opacity ;\n      if(gl_FragColor.a < 0.01)\n      discard;\n  }\n}\n";
-/* babel-plugin-inline-import '../shaders/rater_terrain_rgb_vert.glsl' */
+/* babel-plugin-inline-import '../shaders/terrain/terrain_rgb_vert.glsl' */
 var Raster_terrainVert = "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";
 var RasterTerrainRGB = exports.default = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(RasterTerrainRGB, _BaseModel);

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

@@ -0,0 +1,34 @@
+layout(std140) uniform commonUniforms {
+  vec2 u_domain;
+  float u_opacity;
+  float u_noDataValue;
+  bool u_clampLow;
+  bool u_clampHigh;
+};
+
+uniform sampler2D u_rasterTexture;
+uniform sampler2D u_colorTexture;
+
+in vec2 v_texCoord;
+
+bool isnan_emu(float x) { return (x > 0.0 || x < 0.0) ? x != x : x != 0.0; }
+
+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;
+  if (value == u_noDataValue || isnan_emu(value)) {
+    discard;
+  } else if ((!u_clampLow && value < u_domain[0]) || (!u_clampHigh && value > u_domain[1])) {
+    discard;
+  } else {
+    float normalisedValue =(value - u_domain[0]) / (u_domain[1] - u_domain[0]);
+    vec4 color = texture(SAMPLER_2D(u_colorTexture), vec2(normalisedValue, 0));
+    
+    outputColor = color;
+    outputColor.a = outputColor.a * u_opacity ;
+    if (outputColor.a < 0.01)
+      discard;
+  }
+}

package/lib/raster/shaders/raster/raster_2d_vert.glsl

@@ -0,0 +1,21 @@
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
+
+layout(std140) uniform commonUniforms {
+  vec2 u_domain;
+  float u_opacity;
+  float u_noDataValue;
+  bool u_clampLow;
+  bool u_clampHigh;
+};
+
+out vec2 v_texCoord;
+
+#pragma include "projection"
+
+void main() {
+   v_texCoord = a_Uv;
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+  gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+}

package/lib/raster/shaders/rgb/raster_rgb_frag.glsl

@@ -0,0 +1,26 @@
+uniform sampler2D u_texture;
+layout(std140) uniform commonUniforms {
+ vec2 u_rminmax;
+ vec2 u_gminmax;
+ vec2 u_bminmax;
+ float u_opacity;
+ float u_noDataValue;
+};
+
+in vec2 v_texCoord;
+
+out vec4 outputColor;
+
+void main() {
+
+  vec3 rgb = texture(SAMPLER_2D(u_texture),vec2(v_texCoord.x,v_texCoord.y)).rgb;
+
+  if(rgb == vec3(u_noDataValue)) {
+    outputColor = vec4(0.0, 0, 0, 0.0);
+  } else {
+    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);
+  }
+  if(outputColor.a < 0.01)
+    discard;
+ 
+}

package/lib/raster/shaders/rgb/raster_rgb_vert.glsl

@@ -0,0 +1,21 @@
+
+layout(location = 0) in vec3 a_Position;
+layout(location = 14) in vec2 a_Uv;
+
+layout(std140) uniform commonUniforms {
+ vec2 u_rminmax;
+ vec2 u_gminmax;
+ vec2 u_bminmax;
+ float u_opacity;
+ float u_noDataValue;
+};
+
+out vec2 v_texCoord;
+
+#pragma include "projection"
+
+void main() {
+   v_texCoord = a_Uv;
+   vec4 project_pos = project_position(vec4(a_Position, 1.0));
+   gl_Position = project_common_position_to_clipspace_v2(vec4(project_pos.xy,0., 1.0));
+}

package/lib/tile/utils/constants.js

@@ -11,4 +11,4 @@ var ProxyFuncs = exports.ProxyFuncs = [
  * 1. 需要作用到所属子图层才会生效的方法
  * 2. 不需要主动重新创建 model 的方法
  */
-'shape', 'color', 'size', 'style', 'animate', 'filter', 'rotate', 'scale', 'setBlend', 'setSelect', 'setActive', 'disableMask', 'enableMask'];
+'shape', 'color', 'size', 'style', 'animate', 'filter', 'rotate', 'scale', 'setBlend', 'setSelect', 'setActive', 'disableMask', 'enableMask', 'addMask', 'removeMask'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.20.3",
+  "version": "2.20.6",
   "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.3",
-    "@antv/l7-maps": "2.20.3",
-    "@antv/l7-source": "2.20.3",
-    "@antv/l7-utils": "2.20.3",
+    "@antv/l7-core": "2.20.6",
+    "@antv/l7-maps": "2.20.6",
+    "@antv/l7-source": "2.20.6",
+    "@antv/l7-utils": "2.20.6",
     "@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.3",
+    "@antv/l7-test-utils": "2.20.6",
     "@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": "c9f82837e7f8a6f661bce8dee94e794d3cec89c7",
+  "gitHead": "b5af1f23f8f5524cbbb2ea858399fefba63b0163",
   "publishConfig": {
     "access": "public"
   }

package/es/earth/shaders/atmosphere_vert.glsl

@@ -1,26 +0,0 @@
-
-attribute vec3 a_Position;
-attribute vec3 a_Normal;
-attribute vec2 a_Uv;
-attribute vec4 a_Color;
-uniform vec3 u_CameraPosition;
-varying float v_CamreaDistance;
-
-uniform mat4 u_ViewProjectionMatrix;
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_ViewMatrix;
-
-varying vec3 vVertexNormal;
-varying vec4 v_Color;
-varying float v_offset;
-
-void main() {
-    float EARTH_RADIUS = 100.0;
-    
-    v_Color = a_Color;
-
-    v_offset = min(((length(u_CameraPosition) - EARTH_RADIUS)/600.0) * 0.5 + 0.4, 1.0);
-    vVertexNormal = a_Normal;
-
-    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
-}

package/es/earth/shaders/base_frag.glsl

@@ -1,13 +0,0 @@
-
-uniform sampler2D u_texture;
-
-varying vec2 v_texCoord;
-varying float v_lightWeight;
-
-
-void main() {
-
-    vec4 color = texture2D(u_texture,vec2(v_texCoord.x,v_texCoord.y));
-    color.xyz = color.xyz * v_lightWeight;
-    gl_FragColor = color;
-}

package/es/earth/shaders/base_vert.glsl

@@ -1,52 +0,0 @@
-// attribute vec4 a_Color;
-attribute vec3 a_Position;
-attribute vec3 a_Normal;
-attribute vec2 a_Uv;
-varying vec2 v_texCoord;
-
-// attribute vec2 a_Extrude;
-// attribute float a_Size;
-// attribute float a_Shape;
-
-uniform vec3 u_CameraPosition;
-uniform mat4 u_ViewProjectionMatrix;
-uniform mat4 u_ModelMatrix;
-uniform float u_ambientRatio : 0.5;
-uniform float u_diffuseRatio : 0.3;
-uniform float u_specularRatio : 0.2;
-uniform vec3 u_sunLight: [1.0, -10.5, 12.0];
-
-
-
-float calc_lighting(vec4 pos) {
-
-    vec3 worldPos = vec3(pos * u_ModelMatrix);
-
-    vec3 worldNormal = a_Normal;
-
-    // cal light weight
-    vec3 viewDir = normalize(u_CameraPosition - worldPos);
-
-    vec3 lightDir = normalize(u_sunLight);
-
-    vec3 halfDir = normalize(viewDir+lightDir);
-    // lambert
-    float lambert = dot(worldNormal, lightDir);
-    // specular
-    float specular = pow(max(0.0, dot(worldNormal, halfDir)), 32.0);
-    //sum to light weight
-    float lightWeight = u_ambientRatio + u_diffuseRatio * lambert + u_specularRatio * specular;
-
-    return lightWeight;
-}
-
-varying float v_lightWeight;
-void main() {
-
-    v_texCoord = a_Uv;
-
-    float lightWeight = calc_lighting(vec4(a_Position, 1.0));
-    v_lightWeight = lightWeight;
-
-    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
-}

package/es/earth/shaders/bloomsphere_frag.glsl

@@ -1,15 +0,0 @@
-
-uniform float u_opacity;
-uniform vec3 u_CameraPosition;
-varying vec3 vVertexNormal;
-
-varying vec4 v_Color;
-void main() {
-
-
-    float intensity =  - dot(normalize(vVertexNormal), normalize(u_CameraPosition));
-    // 去除背面
-    if(intensity > 1.0) intensity = 0.0;
-
-    gl_FragColor = vec4(v_Color.rgb, v_Color.a * intensity * u_opacity);
-}

package/es/earth/shaders/bloomsphere_vert.glsl

@@ -1,20 +0,0 @@
-
-attribute vec3 a_Position;
-attribute vec3 a_Normal;
-attribute vec2 a_Uv;
-attribute vec4 a_Color;
-uniform vec3 u_CameraPosition;
-uniform mat4 u_ViewProjectionMatrix;
-uniform mat4 u_ModelMatrix;
-uniform mat4 u_ViewMatrix;
-
-varying vec3 vVertexNormal;
-varying vec4 v_Color;
-
-void main() {
-    v_Color = a_Color;
-
-    vVertexNormal = a_Normal;
-
-    gl_Position = u_ViewProjectionMatrix * u_ModelMatrix * vec4(a_Position, 1.0);
-}

package/es/heatmap/shaders/heatmap_3d_frag.glsl

@@ -1,14 +0,0 @@
-uniform sampler2D u_texture;
-uniform sampler2D u_colorTexture;
-uniform float u_opacity;
-varying vec2 v_texCoord;
-varying float v_intensity;
-
-void main(){
-   
-     float intensity = texture2D(u_texture, v_texCoord).r;
-    vec4 color = texture2D(u_colorTexture,vec2(intensity, 0));
-    gl_FragColor = color;
-    // gl_FragColor.a = color.a * smoothstep(0.1,0.2,intensity)* u_opacity;
-     gl_FragColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;
-}

package/es/heatmap/shaders/heatmap_frag.glsl

@@ -1,47 +0,0 @@
-uniform sampler2D u_texture;        // 热力强度图
-uniform sampler2D u_colorTexture;   // 根据强度分布的色带
-uniform float u_opacity;
-varying vec2 v_texCoord;
-
-uniform vec2 u_ViewportSize;
-
-float getBlurIndusty() {
-    float vW = 2.0/u_ViewportSize.x;
-    float vH = 2.0/u_ViewportSize.y;
-    vec2 vUv = v_texCoord;
-    float i11 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y + 1.0 * vH) ).r;
-    float i12 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y + 1.0 * vH) ).r;
-    float i13 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y + 1.0 * vH) ).r;
-
-    float i21 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y) ).r;
-    float i22 = texture2D( u_texture, vec2( vUv.x , vUv.y) ).r;
-    float i23 = texture2D( u_texture, vec2( vUv.x + 1.0 * vW, vUv.y) ).r;
-
-    float i31 = texture2D( u_texture, vec2( vUv.x - 1.0 * vW, vUv.y-1.0*vH) ).r;
-    float i32 = texture2D( u_texture, vec2( vUv.x - 0.0 * vW, vUv.y-1.0*vH) ).r;
-    float i33 = texture2D( 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 = texture2D(u_texture, v_texCoord).r;
-    float intensity = getBlurIndusty();
-    vec4 color = texture2D(u_colorTexture, vec2(intensity, 0.0));
-
-    gl_FragColor =color;
-    gl_FragColor.a = color.a * smoothstep(0.,0.1,intensity) * u_opacity;
-
-}

package/es/heatmap/shaders/heatmap_framebuffer_frag.glsl

@@ -1,10 +0,0 @@
-precision highp float;
-uniform float u_intensity;
-varying float v_weight;
-varying vec2 v_extrude;
-#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);
-    gl_FragColor = vec4(val, 1., 1., 1.);
-}

package/es/heatmap/shaders/heatmap_vert.glsl

@@ -1,10 +0,0 @@
-precision highp float;
-attribute vec3 a_Position;
-attribute vec2 a_Uv;
-varying vec2 v_texCoord;
-
-void main() {
-  v_texCoord = a_Uv;
-
-  gl_Position = vec4(a_Position.xy, 0, 1.);
-}

package/es/heatmap/shaders/hexagon_frag.glsl

@@ -1,12 +0,0 @@
-precision highp float;
-varying vec4 v_color;
-uniform float u_opacity: 1;
-
-#pragma include "picking"
-
-void main() {
-  gl_FragColor = v_color;
-  gl_FragColor.a *= u_opacity;
-
-  gl_FragColor = filterColor(gl_FragColor);
-}

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

@@ -1,17 +0,0 @@
-import { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
-import BaseModel from '../../core/BaseModel';
-export default class Arc3DModel extends BaseModel {
-    protected texture: ITexture2D;
-    getUninforms(): IModelUniform;
-    getAnimateUniforms(): IModelUniform;
-    initModels(): Promise<IModel[]>;
-    clearModels(): void;
-    getShaders(): {
-        frag: string;
-        vert: string;
-        type: string;
-    };
-    buildModels(): Promise<IModel[]>;
-    protected registerBuiltinAttributes(): void;
-    private updateTexture;
-}