@antv/l7-layers 2.15.1 → 2.15.3

package/es/wind/models/windRender.js

@@ -3,50 +3,40 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import * as glUtils from "./utils";
 import { drawFrag, drawVert, fullScreenFrag, fullScreenVert, updateFrag, updateVert } from "./windShader";
-
 function getColorRamp(colors) {
   var canvas = document.createElement('canvas');
   var ctx = canvas.getContext('2d');
   canvas.width = 256;
   canvas.height = 1;
   var gradient = ctx.createLinearGradient(0, 0, 256, 0);
-
   for (var _i = 0, _Object$keys = Object.keys(colors); _i < _Object$keys.length; _i++) {
     var stop = _Object$keys[_i];
     gradient.addColorStop(+stop, colors[+stop]);
   }
-
   ctx.fillStyle = gradient;
-  ctx.fillRect(0, 0, 256, 1); // @ts-ignore dispose canvas element
+  ctx.fillRect(0, 0, 256, 1);
 
+  // @ts-ignore dispose canvas element
   canvas = null;
   return new Uint8Array(ctx.getImageData(0, 0, 256, 1).data);
 }
-
 function bindAttribute(gl, buffer, attribute, numComponents) {
   gl.bindBuffer(gl.ARRAY_BUFFER, buffer);
   gl.enableVertexAttribArray(attribute);
   gl.vertexAttribPointer(attribute, numComponents, gl.FLOAT, false, 0, 0);
 }
-
 function bindFramebuffer(gl, framebuffer, texture) {
   gl.bindFramebuffer(gl.FRAMEBUFFER, framebuffer);
-
   if (texture) {
     gl.framebufferTexture2D(gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, gl.TEXTURE_2D, texture, 0);
   }
 }
-
 export var Wind = /*#__PURE__*/function () {
   function Wind(options) {
     _classCallCheck(this, Wind);
-
     _defineProperty(this, "width", 512);
-
     _defineProperty(this, "height", 512);
-
     _defineProperty(this, "numParticles", 65536);
-
     this.gl = options.glContext;
     this.width = options.imageWidth;
     this.height = options.imageHeight;
@@ -57,17 +47,13 @@ export var Wind = /*#__PURE__*/function () {
     this.rampColors = options.rampColors;
     this.init();
   }
-
   _createClass(Wind, [{
     key: "init",
     value: function init() {
       var gl = this.gl;
       this.fadeOpacity = 0.996; // how fast the particle trails fade on each frame
-
       this.speedFactor = 0.25; // how fast the particles move
-
       this.dropRate = 0.003; // how often the particles move to a random place
-
       this.dropRateBump = 0.01; // drop rate increase relative to individual particle speed
 
       this.drawProgram = glUtils.createProgram(gl, drawVert, drawFrag);
@@ -76,29 +62,28 @@ export var Wind = /*#__PURE__*/function () {
       this.quadBuffer = glUtils.createBuffer(gl, new Float32Array([0, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 1]));
       this.framebuffer = gl.createFramebuffer();
       this.colorRampTexture = glUtils.createTexture(this.gl, this.gl.LINEAR, getColorRamp(this.rampColors), 16, 16);
-      var emptyPixels = new Uint8Array(this.width * this.height * 4); // screen textures to hold the drawn screen for the previous and the current frame
+      var emptyPixels = new Uint8Array(this.width * this.height * 4);
 
-      this.backgroundTexture = glUtils.createTexture(gl, gl.NEAREST, emptyPixels, this.width, this.height);
-      this.screenTexture = glUtils.createTexture(gl, gl.NEAREST, emptyPixels, this.width, this.height); // we create a square texture where each pixel will hold a particle position encoded as RGBA
+      // screen textures to hold the drawn screen for the previous and the current frame
 
-      var particleRes = this.particleStateResolution = Math.ceil(Math.sqrt(this.numParticles)); // particleRes size
+      this.backgroundTexture = glUtils.createTexture(gl, gl.NEAREST, emptyPixels, this.width, this.height);
+      this.screenTexture = glUtils.createTexture(gl, gl.NEAREST, emptyPixels, this.width, this.height);
 
+      // we create a square texture where each pixel will hold a particle position encoded as RGBA
+      var particleRes = this.particleStateResolution = Math.ceil(Math.sqrt(this.numParticles));
+      // particleRes size
       this.numParticlesSize = particleRes * particleRes;
       var particleState = new Uint8Array(this.numParticlesSize * 4);
-
       for (var i = 0; i < particleState.length; i++) {
         particleState[i] = Math.floor(Math.random() * 256); // randomize the initial particle positions
-      } // textures to hold the particle state for the current and the next frame
-
-
+      }
+      // textures to hold the particle state for the current and the next frame
       this.particleStateTexture0 = glUtils.createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
       this.particleStateTexture1 = glUtils.createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
       var particleIndices = new Float32Array(this.numParticlesSize);
-
       for (var i$1 = 0; i$1 < this.numParticlesSize; i$1++) {
         particleIndices[i$1] = i$1;
       }
-
       this.particleIndexBuffer = glUtils.createBuffer(gl, particleIndices);
     }
   }, {
@@ -107,40 +92,36 @@ export var Wind = /*#__PURE__*/function () {
       this.windData = windData;
       this.windTexture = glUtils.createDataTexture(this.gl, this.gl.LINEAR, windData.image);
     }
+
     /**
      * 更新风场粒子数量
      * @param num
      */
-
   }, {
     key: "updateParticelNum",
     value: function updateParticelNum(num) {
       var gl = this.gl;
-
       if (num !== this.numParticles) {
         this.numParticles = num; // params number
-        // we create a square texture where each pixel will hold a particle position encoded as RGBA
 
+        // we create a square texture where each pixel will hold a particle position encoded as RGBA
         var particleRes = this.particleStateResolution = Math.ceil(Math.sqrt(this.numParticles));
         this.numParticlesSize = particleRes * particleRes;
         var particleState = new Uint8Array(this.numParticlesSize * 4);
-
         for (var i = 0; i < particleState.length; i++) {
           particleState[i] = Math.floor(Math.random() * 256); // randomize the initial particle positions
-        } // textures to hold the particle state for the current and the next frame
-
-
+        }
+        // textures to hold the particle state for the current and the next frame
         this.particleStateTexture0 = glUtils.createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
         this.particleStateTexture1 = glUtils.createTexture(gl, gl.NEAREST, particleState, particleRes, particleRes);
         var particleIndices = new Float32Array(this.numParticlesSize);
-
         for (var i$1 = 0; i$1 < this.numParticlesSize; i$1++) {
           particleIndices[i$1] = i$1;
         }
-
         this.particleIndexBuffer = glUtils.createBuffer(gl, particleIndices);
       }
     }
+
     /**
      * 更新风场风向风速
      * @param uMin
@@ -148,7 +129,6 @@ export var Wind = /*#__PURE__*/function () {
      * @param vMin
      * @param vMax
      */
-
   }, {
     key: "updateWindDir",
     value: function updateWindDir(uMin, uMax, vMin, vMax) {
@@ -157,11 +137,11 @@ export var Wind = /*#__PURE__*/function () {
       this.windData.vMin = vMin;
       this.windData.vMax = vMax;
     }
+
     /**
      * update rampColors
      * @param rampColors
      */
-
   }, {
     key: "updateColorRampTexture",
     value: function updateColorRampTexture(rampColors) {
@@ -176,23 +156,18 @@ export var Wind = /*#__PURE__*/function () {
     key: "isColorChanged",
     value: function isColorChanged(rampColors) {
       var keys = Object.keys(rampColors);
-
       for (var _i2 = 0, _keys = keys; _i2 < _keys.length; _i2++) {
         var item = _keys[_i2];
-
-        var _key = Number(item); // exist new key -> color need update
-
-
+        var _key = Number(item);
+        // exist new key -> color need update
         if (!this.rampColors[_key]) {
           return true;
-        } // value changed -> color need update
-
-
+        }
+        // value changed -> color need update
         if (this.rampColors[_key] && this.rampColors[_key] !== rampColors[_key]) {
           return true;
         }
       }
-
       return false;
     }
   }, {
@@ -204,8 +179,8 @@ export var Wind = /*#__PURE__*/function () {
         gl.deleteTexture(this.screenTexture);
         this.width = width;
         this.height = height;
-        var emptyPixels = new Uint8Array(width * height * 4); // screen textures to hold the drawn screen for the previous and the current frame
-
+        var emptyPixels = new Uint8Array(width * height * 4);
+        // screen textures to hold the drawn screen for the previous and the current frame
         this.backgroundTexture = glUtils.createTexture(gl, gl.NEAREST, emptyPixels, width, height);
         this.screenTexture = glUtils.createTexture(gl, gl.NEAREST, emptyPixels, width, height);
       }
@@ -214,13 +189,11 @@ export var Wind = /*#__PURE__*/function () {
     key: "draw",
     value: function draw() {
       var _this$windData;
-
       if ((_this$windData = this.windData) !== null && _this$windData !== void 0 && _this$windData.image) {
         var gl = this.gl;
         glUtils.bindTexture(gl, this.windTexture, 0);
         glUtils.bindTexture(gl, this.particleStateTexture0, 1);
         this.drawScreen(); // draw Particles into framebuffer
-
         this.updateParticles();
         return {
           d: this.pixels,
@@ -238,8 +211,9 @@ export var Wind = /*#__PURE__*/function () {
   }, {
     key: "drawScreen",
     value: function drawScreen() {
-      var gl = this.gl; // draw the screen into a temporary framebuffer to retain it as the background on the next frame
+      var gl = this.gl;
 
+      // draw the screen into a temporary framebuffer to retain it as the background on the next frame
       bindFramebuffer(gl, this.framebuffer, this.screenTexture);
       gl.viewport(0, 0, this.width, this.height);
       gl.disable(gl.BLEND);
@@ -248,8 +222,9 @@ export var Wind = /*#__PURE__*/function () {
       this.pixels = new Uint8Array(4 * this.width * this.height);
       gl.readPixels(0, 0, this.width, this.height, gl.RGBA, gl.UNSIGNED_BYTE, this.pixels);
       bindFramebuffer(gl, null, null);
-      gl.viewport(0, 0, this.gl.canvas.width, this.gl.canvas.height); //   save the current screen as the background for the next frame
+      gl.viewport(0, 0, this.gl.canvas.width, this.gl.canvas.height);
 
+      //   save the current screen as the background for the next frame
       var temp = this.backgroundTexture;
       this.backgroundTexture = this.screenTexture;
       this.screenTexture = temp;
@@ -259,7 +234,9 @@ export var Wind = /*#__PURE__*/function () {
     value: function drawFullTexture(texture, opacity) {
       var gl = this.gl;
       var program = this.fullScreenProgram;
-      gl.useProgram(program); // bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
+      gl.useProgram(program);
+
+      // bindAttribute(gl, this.quadBuffer, program.a_pos, 2);
 
       gl.bindBuffer(gl.ARRAY_BUFFER, this.quadBuffer);
       gl.vertexAttribPointer(program.a_pos, 2, gl.FLOAT, false, 0, 0);
@@ -268,7 +245,8 @@ export var Wind = /*#__PURE__*/function () {
       glUtils.bindTexture(gl, texture, 2);
       gl.uniform1i(program.u_screen, 2);
       gl.uniform1f(program.u_opacity, opacity);
-      gl.drawArrays(gl.TRIANGLES, 0, 6); // gl.drawArrays(gl.POINTS, 0, 6);
+      gl.drawArrays(gl.TRIANGLES, 0, 6);
+      // gl.drawArrays(gl.POINTS, 0, 6);
     }
   }, {
     key: "drawParticles",
@@ -304,12 +282,15 @@ export var Wind = /*#__PURE__*/function () {
       gl.uniform1f(program.u_speed_factor, this.speedFactor);
       gl.uniform1f(program.u_drop_rate, this.dropRate);
       gl.uniform1f(program.u_drop_rate_bump, this.dropRateBump);
-      gl.drawArrays(gl.TRIANGLES, 0, 6); // swap the particle state textures so the new one becomes the current one
+      gl.drawArrays(gl.TRIANGLES, 0, 6);
 
+      // swap the particle state textures so the new one becomes the current one
       var temp = this.particleStateTexture0;
       this.particleStateTexture0 = this.particleStateTexture1;
       this.particleStateTexture1 = temp;
-      bindFramebuffer(gl, null, null); // gl.viewport(0, 0, this.gl.canvas.width, this.gl.canvas.height);
+      bindFramebuffer(gl, null, null);
+
+      // gl.viewport(0, 0, this.gl.canvas.width, this.gl.canvas.height);
     }
   }, {
     key: "destroy",
@@ -317,31 +298,38 @@ export var Wind = /*#__PURE__*/function () {
       // private drawProgram: WebGLProgram;
       // private fullScreenProgram: WebGLProgram;
       // private updateProgram: WebGLProgram;
+
       // private quadBuffer: WebGLBuffer | null;
       // private particleIndexBuffer: WebGLBuffer | null;
+
       // private framebuffer: WebGLFramebuffer | null;
+
       // private colorRampTexture: WebGLTexture | null;
       // private backgroundTexture: WebGLTexture | null;
       // private screenTexture: WebGLTexture | null;
       // private particleStateTexture0: WebGLTexture | null;
       // private particleStateTexture1: WebGLTexture | null;
       // private windTexture: WebGLTexture | null;
+
       this.gl.deleteBuffer(this.quadBuffer);
       this.gl.deleteBuffer(this.particleIndexBuffer);
-      this.gl.deleteFramebuffer(this.framebuffer); // @ts-ignore
-
-      this.gl.deleteShader(this.drawProgram.vertexShader); // @ts-ignore
+      this.gl.deleteFramebuffer(this.framebuffer);
 
+      // @ts-ignore
+      this.gl.deleteShader(this.drawProgram.vertexShader);
+      // @ts-ignore
       this.gl.deleteShader(this.drawProgram.fragmentShader);
-      this.gl.deleteProgram(this.drawProgram); // @ts-ignore
-
-      this.gl.deleteShader(this.fullScreenProgram.vertexShader); // @ts-ignore
+      this.gl.deleteProgram(this.drawProgram);
 
+      // @ts-ignore
+      this.gl.deleteShader(this.fullScreenProgram.vertexShader);
+      // @ts-ignore
       this.gl.deleteShader(this.fullScreenProgram.fragmentShader);
-      this.gl.deleteProgram(this.fullScreenProgram); // @ts-ignore
-
-      this.gl.deleteShader(this.updateProgram.vertexShader); // @ts-ignore
+      this.gl.deleteProgram(this.fullScreenProgram);
 
+      // @ts-ignore
+      this.gl.deleteShader(this.updateProgram.vertexShader);
+      // @ts-ignore
       this.gl.deleteShader(this.updateProgram.fragmentShader);
       this.gl.deleteProgram(this.updateProgram);
       this.gl.deleteTexture(this.colorRampTexture);
@@ -352,6 +340,5 @@ export var Wind = /*#__PURE__*/function () {
       this.gl.deleteTexture(this.windTexture);
     }
   }]);
-
   return Wind;
 }();

package/lib/Geometry/index.js

@@ -1,52 +1,32 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _BaseLayer2 = _interopRequireDefault(require("../core/BaseLayer"));
-
 var _models = _interopRequireDefault(require("./models"));
-
 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; } }
-
 var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(GeometryLayer, _BaseLayer);
-
   var _super = _createSuper(GeometryLayer);
-
   function GeometryLayer() {
     var _this;
-
     (0, _classCallCheck2.default)(this, GeometryLayer);
-
     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));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "type", 'GeometryLayer');
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "defaultSourceConfig", {
@@ -64,33 +44,27 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
     });
     return _this;
   }
-
   (0, _createClass2.default)(GeometryLayer, [{
     key: "buildModels",
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var modelType;
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                modelType = this.getModelType();
-                this.layerModel = new _models.default[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 _models.default[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;
     }()
   }, {
@@ -108,10 +82,8 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
     key: "getModelType",
     value: function getModelType() {
       var _shapeAttribute$scale;
-
       var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
       var shape = shapeAttribute === null || shapeAttribute === void 0 ? void 0 : (_shapeAttribute$scale = shapeAttribute.scale) === null || _shapeAttribute$scale === void 0 ? void 0 : _shapeAttribute$scale.field;
-
       if (shape === 'plane') {
         return 'plane';
       } else if (shape === 'sprite') {
@@ -125,5 +97,4 @@ var GeometryLayer = /*#__PURE__*/function (_BaseLayer) {
   }]);
   return GeometryLayer;
 }(_BaseLayer2.default);
-
 exports.default = GeometryLayer;