@antv/l7-layers 2.9.23 → 2.9.25

package/lib/wind/models/windShader.js

@@ -1,183 +1,25 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/wind/models/windShader.ts
-var windShader_exports = {};
-__export(windShader_exports, {
-  drawFrag: () => drawFrag,
-  drawVert: () => drawVert,
-  fullScreenFrag: () => fullScreenFrag,
-  fullScreenVert: () => fullScreenVert,
-  updateFrag: () => updateFrag,
-  updateVert: () => updateVert
-});
-module.exports = __toCommonJS(windShader_exports);
-var drawVert = `
- precision mediump float;
-
- attribute float a_index;
-
- uniform sampler2D u_particles;
- uniform float u_particles_res;
-
- varying vec2 v_particle_pos;
-
- void main() {
-     vec4 color = texture2D(u_particles, vec2(
-         fract(a_index / u_particles_res),
-         floor(a_index / u_particles_res) / u_particles_res)
-     );
-
-     // decode current particle position from the pixel's RGBA value
-     v_particle_pos = vec2( color.r / 255.0 + color.b, color.g / 255.0 + color.a);
-
-     gl_PointSize = 1.0;
-     gl_Position = vec4(2.0 * v_particle_pos.x - 1.0, 1.0 - 2.0 * v_particle_pos.y, 0, 1);
- }`;
-var drawFrag = `
- precision mediump float;
-
- uniform sampler2D u_wind;
- uniform vec2 u_wind_min;
- uniform vec2 u_wind_max;
- uniform sampler2D u_color_ramp;
-
- varying vec2 v_particle_pos;
-
- void main() {
-     vec2 velocity = mix(u_wind_min, u_wind_max, texture2D(u_wind, v_particle_pos).rg);
-     float speed_t = length(velocity) / length(u_wind_max);
-
-     // color ramp is encoded in a 16x16 texture
-     vec2 ramp_pos = vec2( fract(16.0 * speed_t), floor(16.0 * speed_t) / 16.0);
-
-     gl_FragColor = texture2D(u_color_ramp, ramp_pos);
- }`;
-var updateVert = `
- precision mediump float;
-
- attribute vec2 a_pos;
-
- varying vec2 v_tex_pos;
-
- void main() {
-     v_tex_pos = a_pos;
-     gl_Position = vec4(1.0 - 2.0 * a_pos, 0, 1);
-     // framebuffer \u59CB\u7EC8\u7528\u94FA\u6EE1\u5C4F\u5E55\u7684 texture
- }`;
-var updateFrag = `
- precision highp float;
-
- uniform sampler2D u_particles;
- uniform sampler2D u_wind;
- uniform vec2 u_wind_res;
- uniform vec2 u_wind_min;
- uniform vec2 u_wind_max;
- uniform float u_rand_seed;
- uniform float u_speed_factor;
- uniform float u_drop_rate;
- uniform float u_drop_rate_bump;
-
- varying vec2 v_tex_pos;
-
- // pseudo-random generator
- const vec3 rand_constants = vec3(12.9898, 78.233, 4375.85453);
- float rand(const vec2 co) {
- float t = dot(rand_constants.xy, co);
-     return fract(sin(t) * (rand_constants.z + t));
- }
-
- // wind speed lookup; use manual bilinear filtering based on 4 adjacent pixels for smooth interpolation
- vec2 lookup_wind(const vec2 uv) {
-     // return texture2D(u_wind, uv).rg; // lower-res hardware filtering
-     vec2 px = 1.0 / u_wind_res;
-     vec2 vc = (floor(uv * u_wind_res)) * px;
-     vec2 f = fract(uv * u_wind_res);
-     vec2 tl = texture2D(u_wind, vc).rg;
-     vec2 tr = texture2D(u_wind, vc + vec2(px.x, 0)).rg;
-     vec2 bl = texture2D(u_wind, vc + vec2(0, px.y)).rg;
-     vec2 br = texture2D(u_wind, vc + px).rg;
-     return mix(mix(tl, tr, f.x), mix(bl, br, f.x), f.y);
- }
-
- void main() {
-     vec4 color = texture2D(u_particles, v_tex_pos);
-     vec2 pos = vec2(
-         color.r / 255.0 + color.b,
-         color.g / 255.0 + color.a); // decode particle position from pixel RGBA
-     vec2 velocity = mix(u_wind_min, u_wind_max, lookup_wind(pos));
-     float speed_t = length(velocity) / length(u_wind_max);
-
-     // take EPSG:4236 distortion into account for calculating where the particle moved
-     float distortion = cos(radians(pos.y * 180.0 - 90.0));
-     vec2 offset = vec2(velocity.x / distortion, -velocity.y) * 0.0001 * u_speed_factor;
-
-     // update particle position, wrapping around the date line
-     pos = fract(1.0 + pos + offset);
-
-     // a random seed to use for the particle drop
-     vec2 seed = (pos + v_tex_pos) * u_rand_seed;
-
-     // drop rate is a chance a particle will restart at random position, to avoid degeneration
-     float drop_rate = u_drop_rate + speed_t * u_drop_rate_bump;
-     float drop = step(1.0 - drop_rate, rand(seed));
-
-     vec2 random_pos = vec2(
-         rand(seed + 1.3),
-         rand(seed + 2.1));
-         pos = mix(pos, random_pos, drop);
-
-     // encode the new particle position back into RGBA
-     gl_FragColor = vec4(
-         fract(pos * 255.0),
-         floor(pos * 255.0) / 255.0);
- }`;
-var fullScreenVert = `
-     precision mediump float;
-
-     attribute vec2 a_pos;
-
-     varying vec2 v_tex_pos;
-
-     void main() {
-         v_tex_pos = a_pos;
-         gl_Position = vec4(1.0 - 2.0 * a_pos, 0.0, 1.0);
-         gl_PointSize = 100.0;
- }`;
-var fullScreenFrag = `
- precision mediump float;
-
- uniform sampler2D u_screen;
- uniform float u_opacity;
- varying vec2 v_tex_pos;
-
- void main() {
-     vec4 color = texture2D(u_screen, 1.0 - v_tex_pos);
-
-     // a hack to guarantee opacity fade out even with a value close to 1.0
-     gl_FragColor = vec4(floor(255.0 * color * u_opacity) / 255.0);
- }`;
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  drawFrag,
-  drawVert,
-  fullScreenFrag,
-  fullScreenVert,
-  updateFrag,
-  updateVert
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
+exports.updateVert = exports.updateFrag = exports.fullScreenVert = exports.fullScreenFrag = exports.drawVert = exports.drawFrag = void 0;
+
+/**
+ * drawProgram          drawVert drawFrag
+ * screenProgram        screenVert screenFrag
+ * updateProgram        updateVert updateFrag
+ * fullScreenProgram    fullScreenVert fullScreenFrag
+ */
+var drawVert = "\n precision mediump float;\n\n attribute float a_index;\n\n uniform sampler2D u_particles;\n uniform float u_particles_res;\n\n varying vec2 v_particle_pos;\n\n void main() {\n     vec4 color = texture2D(u_particles, vec2(\n         fract(a_index / u_particles_res),\n         floor(a_index / u_particles_res) / u_particles_res)\n     );\n\n     // decode current particle position from the pixel's RGBA value\n     v_particle_pos = vec2( color.r / 255.0 + color.b, color.g / 255.0 + color.a);\n\n     gl_PointSize = 1.0;\n     gl_Position = vec4(2.0 * v_particle_pos.x - 1.0, 1.0 - 2.0 * v_particle_pos.y, 0, 1);\n }";
+exports.drawVert = drawVert;
+var drawFrag = "\n precision mediump float;\n\n uniform sampler2D u_wind;\n uniform vec2 u_wind_min;\n uniform vec2 u_wind_max;\n uniform sampler2D u_color_ramp;\n\n varying vec2 v_particle_pos;\n\n void main() {\n     vec2 velocity = mix(u_wind_min, u_wind_max, texture2D(u_wind, v_particle_pos).rg);\n     float speed_t = length(velocity) / length(u_wind_max);\n\n     // color ramp is encoded in a 16x16 texture\n     vec2 ramp_pos = vec2( fract(16.0 * speed_t), floor(16.0 * speed_t) / 16.0);\n\n     gl_FragColor = texture2D(u_color_ramp, ramp_pos);\n }";
+exports.drawFrag = drawFrag;
+var updateVert = "\n precision mediump float;\n\n attribute vec2 a_pos;\n\n varying vec2 v_tex_pos;\n\n void main() {\n     v_tex_pos = a_pos;\n     gl_Position = vec4(1.0 - 2.0 * a_pos, 0, 1);\n     // framebuffer \u59CB\u7EC8\u7528\u94FA\u6EE1\u5C4F\u5E55\u7684 texture\n }";
+exports.updateVert = updateVert;
+var updateFrag = "\n precision highp float;\n\n uniform sampler2D u_particles;\n uniform sampler2D u_wind;\n uniform vec2 u_wind_res;\n uniform vec2 u_wind_min;\n uniform vec2 u_wind_max;\n uniform float u_rand_seed;\n uniform float u_speed_factor;\n uniform float u_drop_rate;\n uniform float u_drop_rate_bump;\n\n varying vec2 v_tex_pos;\n\n // pseudo-random generator\n const vec3 rand_constants = vec3(12.9898, 78.233, 4375.85453);\n float rand(const vec2 co) {\n float t = dot(rand_constants.xy, co);\n     return fract(sin(t) * (rand_constants.z + t));\n }\n\n // wind speed lookup; use manual bilinear filtering based on 4 adjacent pixels for smooth interpolation\n vec2 lookup_wind(const vec2 uv) {\n     // return texture2D(u_wind, uv).rg; // lower-res hardware filtering\n     vec2 px = 1.0 / u_wind_res;\n     vec2 vc = (floor(uv * u_wind_res)) * px;\n     vec2 f = fract(uv * u_wind_res);\n     vec2 tl = texture2D(u_wind, vc).rg;\n     vec2 tr = texture2D(u_wind, vc + vec2(px.x, 0)).rg;\n     vec2 bl = texture2D(u_wind, vc + vec2(0, px.y)).rg;\n     vec2 br = texture2D(u_wind, vc + px).rg;\n     return mix(mix(tl, tr, f.x), mix(bl, br, f.x), f.y);\n }\n\n void main() {\n     vec4 color = texture2D(u_particles, v_tex_pos);\n     vec2 pos = vec2(\n         color.r / 255.0 + color.b,\n         color.g / 255.0 + color.a); // decode particle position from pixel RGBA\n     vec2 velocity = mix(u_wind_min, u_wind_max, lookup_wind(pos));\n     float speed_t = length(velocity) / length(u_wind_max);\n\n     // take EPSG:4236 distortion into account for calculating where the particle moved\n     float distortion = cos(radians(pos.y * 180.0 - 90.0));\n     vec2 offset = vec2(velocity.x / distortion, -velocity.y) * 0.0001 * u_speed_factor;\n\n     // update particle position, wrapping around the date line\n     pos = fract(1.0 + pos + offset);\n\n     // a random seed to use for the particle drop\n     vec2 seed = (pos + v_tex_pos) * u_rand_seed;\n\n     // drop rate is a chance a particle will restart at random position, to avoid degeneration\n     float drop_rate = u_drop_rate + speed_t * u_drop_rate_bump;\n     float drop = step(1.0 - drop_rate, rand(seed));\n\n     vec2 random_pos = vec2(\n         rand(seed + 1.3),\n         rand(seed + 2.1));\n         pos = mix(pos, random_pos, drop);\n\n     // encode the new particle position back into RGBA\n     gl_FragColor = vec4(\n         fract(pos * 255.0),\n         floor(pos * 255.0) / 255.0);\n }";
+exports.updateFrag = updateFrag;
+var fullScreenVert = "\n     precision mediump float;\n\n     attribute vec2 a_pos;\n\n     varying vec2 v_tex_pos;\n\n     void main() {\n         v_tex_pos = a_pos;\n         gl_Position = vec4(1.0 - 2.0 * a_pos, 0.0, 1.0);\n         gl_PointSize = 100.0;\n }";
+exports.fullScreenVert = fullScreenVert;
+var fullScreenFrag = "\n precision mediump float;\n\n uniform sampler2D u_screen;\n uniform float u_opacity;\n varying vec2 v_tex_pos;\n\n void main() {\n     vec4 color = texture2D(u_screen, 1.0 - v_tex_pos);\n\n     // a hack to guarantee opacity fade out even with a value close to 1.0\n     gl_FragColor = vec4(floor(255.0 * color * u_opacity) / 255.0);\n }";
+exports.fullScreenFrag = fullScreenFrag;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/l7-layers",
-  "version": "2.9.23",
+  "version": "2.9.25",
   "description": "L7's collection of built-in layers",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -27,14 +27,15 @@
   "license": "ISC",
   "dependencies": {
     "@antv/async-hook": "^2.1.0",
-    "@antv/l7-core": "2.9.23",
-    "@antv/l7-maps": "2.9.23",
-    "@antv/l7-source": "2.9.23",
-    "@antv/l7-utils": "2.9.23",
+    "@antv/l7-core": "2.9.25",
+    "@antv/l7-maps": "2.9.25",
+    "@antv/l7-source": "2.9.25",
+    "@antv/l7-utils": "2.9.25",
     "@babel/runtime": "^7.7.7",
     "@mapbox/martini": "^0.2.0",
     "@turf/helpers": "^6.1.4",
     "@turf/meta": "^6.0.2",
+    "@turf/polygon-to-line": "^6.5.0",
     "@turf/union": "^6.5.0",
     "d3-array": "1",
     "d3-color": "^1.4.0",
@@ -60,7 +61,7 @@
     "@types/gl-matrix": "^2.4.5",
     "@types/lodash": "^4.14.138"
   },
-  "gitHead": "b8bef9861bce80ff9b27a53d7bfb386c74005087",
+  "gitHead": "fe8fde9091697af0b11e0fe5713ffef7c71405be",
   "publishConfig": {
     "access": "public"
   }