@antv/l7-layers 2.17.3 → 2.17.4

package/lib/Geometry/models/sprite.js

@@ -1,65 +1,96 @@
 "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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 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 _l7Core = require("@antv/l7-core");
+
 var _l7Maps = require("@antv/l7-maps");
+
 var _BaseModel2 = _interopRequireDefault(require("../../core/BaseModel"));
+
 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/sprite_frag.glsl' */
 var spriteFrag = "\nuniform sampler2D u_texture;\nuniform float u_mapFlag;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying float v_d;\n\nvoid main() {\n\n  if(v_d < 0.0) {\n    discard;\n  }\n\n  if(u_mapFlag > 0.0) {\n    gl_FragColor = texture2D(u_texture, gl_PointCoord);\n    gl_FragColor.a *= u_opacity;\n  } else {\n    gl_FragColor = vec4(v_Color, u_opacity);\n  }\n}\n";
+
 /* babel-plugin-inline-import '../shaders/sprite_vert.glsl' */
 var spriteVert = "precision highp float;\n\nattribute vec3 a_Position;\nattribute vec3 a_Color;\n\nuniform mat4 u_ModelMatrix;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform float u_Scale;\nvarying vec3 v_Color;\nvarying float v_d;\n\n#pragma include \"projection\"\nvoid main() {\n   v_Color = a_Color;\n  \n   vec4 project_pos = project_position(vec4(a_Position, 1.0));\n\n   v_d = a_Position.z;\n\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_P20_2) { // gaode2.x\n      gl_Position = u_Mvp * (vec4(project_pos.xy, a_Position.z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(project_pos.xy, a_Position.z, 1.0));\n   }\n\n   gl_PointSize = pow((u_Zoom - 1.0), 2.0) * u_Scale;\n}\n";
-var SPRITE_ANIMATE_DIR = /*#__PURE__*/function (SPRITE_ANIMATE_DIR) {
+var SPRITE_ANIMATE_DIR;
+
+(function (SPRITE_ANIMATE_DIR) {
   SPRITE_ANIMATE_DIR["UP"] = "up";
   SPRITE_ANIMATE_DIR["DOWN"] = "down";
-  return SPRITE_ANIMATE_DIR;
-}(SPRITE_ANIMATE_DIR || {});
+})(SPRITE_ANIMATE_DIR || (SPRITE_ANIMATE_DIR = {}));
+
 var SpriteModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(SpriteModel, _BaseModel);
+
   var _super = _createSuper(SpriteModel);
+
   function SpriteModel() {
     var _this;
+
     (0, _classCallCheck2.default)(this, SpriteModel);
+
     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), "planeGeometryUpdateTriangulation", function () {
       var _ref = _this.layer.getLayerConfig(),
-        _ref$spriteBottom = _ref.spriteBottom,
-        spriteBottom = _ref$spriteBottom === void 0 ? -100000 : _ref$spriteBottom;
+          _ref$spriteBottom = _ref.spriteBottom,
+          spriteBottom = _ref$spriteBottom === void 0 ? -100000 : _ref$spriteBottom;
+
       var updateZ = _this.spriteUpdate;
       var bottomZ = spriteBottom;
       var topZ = _this.spriteTop;
+
       for (var i = 0; i < _this.positions.length; i += 5) {
         if (_this.spriteAnimate === SPRITE_ANIMATE_DIR.UP) {
           _this.positions[i + 2] += updateZ;
+
           if (_this.positions[i + 2] > topZ) {
             _this.positions[i + 2] = bottomZ;
           }
         } else {
           _this.positions[i + 2] -= updateZ;
+
           if (_this.positions[i + 2] < bottomZ) {
             _this.positions[i + 2] = topZ;
           }
         }
       }
+
       return {
         vertices: _this.positions,
         indices: _this.indices,
@@ -71,24 +102,30 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
       var attributes = _this.layer.createAttributes({
         triangulation: _this.planeGeometryUpdateTriangulation
       });
+
       _this.layer.models.map(function (m) {
         m.updateAttributes(attributes);
       });
+
       _this.layerService.throttleRenderLayers();
+
       _this.timer = requestAnimationFrame(_this.updateModel);
     });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "planeGeometryTriangulation", function () {
       var _this2;
+
       var _ref2 = _this.layer.getLayerConfig(),
-        _ref2$center = _ref2.center,
-        center = _ref2$center === void 0 ? [120, 30] : _ref2$center,
-        _ref2$spriteCount = _ref2.spriteCount,
-        spriteCount = _ref2$spriteCount === void 0 ? 100 : _ref2$spriteCount,
-        _ref2$spriteRadius = _ref2.spriteRadius,
-        spriteRadius = _ref2$spriteRadius === void 0 ? 10 : _ref2$spriteRadius;
+          _ref2$center = _ref2.center,
+          center = _ref2$center === void 0 ? [120, 30] : _ref2$center,
+          _ref2$spriteCount = _ref2.spriteCount,
+          spriteCount = _ref2$spriteCount === void 0 ? 100 : _ref2$spriteCount,
+          _ref2$spriteRadius = _ref2.spriteRadius,
+          spriteRadius = _ref2$spriteRadius === void 0 ? 10 : _ref2$spriteRadius;
+
       var _this$initSprite = (_this2 = _this).initSprite.apply(_this2, [spriteRadius, spriteCount].concat((0, _toConsumableArray2.default)(center))),
-        indices = _this$initSprite.indices,
-        positions = _this$initSprite.positions;
+          indices = _this$initSprite.indices,
+          positions = _this$initSprite.positions;
+
       _this.positions = positions;
       _this.indices = indices;
       return {
@@ -99,6 +136,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     });
     return _this;
   }
+
   (0, _createClass2.default)(SpriteModel, [{
     key: "initSprite",
     value: function initSprite() {
@@ -110,29 +148,35 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
       var positions = [];
       var mapService = this.mapService;
       var heightLimit = this.spriteAnimate === SPRITE_ANIMATE_DIR.UP ? -this.spriteTop : this.spriteTop;
+
       for (var i = 0; i < spriteCount; i++) {
         var height = Math.random() * heightLimit;
         positions.push.apply(positions, (0, _toConsumableArray2.default)(getPos(height)));
       }
+
       for (var _i = 0; _i < spriteCount; _i++) {
         indices.push(_i);
       }
+
       function getPos(z) {
         var randomX = radius * Math.random();
         var randomY = radius * Math.random();
         var x = -radius / 2 + randomX;
         var y = -radius / 2 + randomY;
+
         if (mapService.version === _l7Maps.Version['GAODE2.x']) {
           // @ts-ignore
           var _ref3 = mapService.lngLatToCoord([x + lng, -y + lat]),
-            _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
-            a = _ref4[0],
-            b = _ref4[1];
+              _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+              a = _ref4[0],
+              b = _ref4[1];
+
           return [a, b, z, 0, 0];
         } else {
           return [x + lng, -y + lat, z, 0, 0];
         }
       }
+
       return {
         indices: indices,
         positions: positions
@@ -142,16 +186,19 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     key: "getUninforms",
     value: function getUninforms() {
       var _ref5 = this.layer.getLayerConfig(),
-        opacity = _ref5.opacity,
-        mapTexture = _ref5.mapTexture,
-        _ref5$spriteScale = _ref5.spriteScale,
-        spriteScale = _ref5$spriteScale === void 0 ? 1 : _ref5$spriteScale;
+          opacity = _ref5.opacity,
+          mapTexture = _ref5.mapTexture,
+          _ref5$spriteScale = _ref5.spriteScale,
+          spriteScale = _ref5$spriteScale === void 0 ? 1 : _ref5$spriteScale;
+
       if (this.mapTexture !== mapTexture) {
         var _this$texture;
+
         this.mapTexture = mapTexture;
         (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
         this.updateTexture(mapTexture);
       }
+
       return {
         u_opacity: opacity || 1,
         u_mapFlag: mapTexture ? 1 : 0,
@@ -163,6 +210,7 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture2;
+
       cancelAnimationFrame(this.timer);
       (_this$texture2 = this.texture) === null || _this$texture2 === void 0 ? void 0 : _this$texture2.destroy();
     }
@@ -171,48 +219,56 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _this3 = this;
+
         var _ref6, mapTexture, _ref6$spriteTop, spriteTop, _ref6$spriteUpdate, spriteUpdate, _ref6$spriteAnimate, spriteAnimate, createTexture2D, model;
+
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _ref6 = this.layer.getLayerConfig(), mapTexture = _ref6.mapTexture, _ref6$spriteTop = _ref6.spriteTop, spriteTop = _ref6$spriteTop === void 0 ? 5000000 : _ref6$spriteTop, _ref6$spriteUpdate = _ref6.spriteUpdate, spriteUpdate = _ref6$spriteUpdate === void 0 ? 10000 : _ref6$spriteUpdate, _ref6$spriteAnimate = _ref6.spriteAnimate, spriteAnimate = _ref6$spriteAnimate === void 0 ? SPRITE_ANIMATE_DIR.DOWN : _ref6$spriteAnimate;
-              this.mapTexture = mapTexture;
-              this.spriteTop = spriteTop;
-              this.spriteUpdate = spriteUpdate;
-              spriteAnimate === 'up' ? this.spriteAnimate = SPRITE_ANIMATE_DIR.UP : this.spriteAnimate = SPRITE_ANIMATE_DIR.DOWN;
-              createTexture2D = this.rendererService.createTexture2D;
-              this.texture = createTexture2D({
-                height: 0,
-                width: 0
-              });
-              this.updateTexture(mapTexture);
-              setTimeout(function () {
-                _this3.updateModel();
-              }, 100);
-              _context.next = 11;
-              return this.layer.buildLayerModel({
-                moduleName: 'geometrySprite',
-                vertexShader: spriteVert,
-                fragmentShader: spriteFrag,
-                triangulation: this.planeGeometryTriangulation,
-                primitive: _l7Core.gl.POINTS,
-                depth: {
-                  enable: false
-                },
-                blend: this.getBlend()
-              });
-            case 11:
-              model = _context.sent;
-              return _context.abrupt("return", [model]);
-            case 13:
-            case "end":
-              return _context.stop();
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref6 = this.layer.getLayerConfig(), mapTexture = _ref6.mapTexture, _ref6$spriteTop = _ref6.spriteTop, spriteTop = _ref6$spriteTop === void 0 ? 5000000 : _ref6$spriteTop, _ref6$spriteUpdate = _ref6.spriteUpdate, spriteUpdate = _ref6$spriteUpdate === void 0 ? 10000 : _ref6$spriteUpdate, _ref6$spriteAnimate = _ref6.spriteAnimate, spriteAnimate = _ref6$spriteAnimate === void 0 ? SPRITE_ANIMATE_DIR.DOWN : _ref6$spriteAnimate;
+                this.mapTexture = mapTexture;
+                this.spriteTop = spriteTop;
+                this.spriteUpdate = spriteUpdate;
+                spriteAnimate === 'up' ? this.spriteAnimate = SPRITE_ANIMATE_DIR.UP : this.spriteAnimate = SPRITE_ANIMATE_DIR.DOWN;
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+                this.updateTexture(mapTexture);
+                setTimeout(function () {
+                  _this3.updateModel();
+                }, 100);
+                _context.next = 11;
+                return this.layer.buildLayerModel({
+                  moduleName: 'geometrySprite',
+                  vertexShader: spriteVert,
+                  fragmentShader: spriteFrag,
+                  triangulation: this.planeGeometryTriangulation,
+                  primitive: _l7Core.gl.POINTS,
+                  depth: {
+                    enable: false
+                  },
+                  blend: this.getBlend()
+                });
+
+              case 11:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 13:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -220,28 +276,36 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _buildModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              return _context2.abrupt("return", this.initModels());
-            case 1:
-            case "end":
-              return _context2.stop();
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                return _context2.abrupt("return", this.initModels());
+
+              case 1:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function buildModels() {
         return _buildModels.apply(this, arguments);
       }
+
       return buildModels;
     }()
   }, {
     key: "updateTexture",
     value: function updateTexture(mapTexture) {
       var _this4 = this;
+
       var createTexture2D = this.rendererService.createTexture2D;
+
       if (mapTexture) {
         var img = new Image();
         img.crossOrigin = 'anonymous';
+
         img.onload = function () {
           _this4.texture = createTexture2D({
             data: img,
@@ -250,8 +314,10 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
             wrapS: _l7Core.gl.CLAMP_TO_EDGE,
             wrapT: _l7Core.gl.CLAMP_TO_EDGE
           });
+
           _this4.layerService.reRender();
         };
+
         img.src = mapTexture;
       } else {
         this.texture = createTexture2D({
@@ -268,4 +334,5 @@ var SpriteModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return SpriteModel;
 }(_BaseModel2.default);
+
 exports.default = SpriteModel;

package/lib/canvas/index.js

@@ -1,58 +1,84 @@
 "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 _index = _interopRequireDefault(require("./models/index"));
+
 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 CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
   (0, _inherits2.default)(CanvasLayer, _BaseLayer);
+
   var _super = _createSuper(CanvasLayer);
+
   function CanvasLayer() {
     var _this;
+
     (0, _classCallCheck2.default)(this, CanvasLayer);
+
     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", 'CanvasLayer');
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "forceRender", true);
     return _this;
   }
+
   (0, _createClass2.default)(CanvasLayer, [{
     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 _index.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 _index.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;
     }()
   }, {
@@ -62,6 +88,7 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
       if (this.layerModel.clearCanvas) {
         this.layerModel.clearCanvas();
       }
+
       this.updateLayerConfig({
         visible: false
       });
@@ -72,10 +99,12 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
     key: "renderModels",
     value: function renderModels() {
       var _this$layerModel,
-        _this2 = this;
+          _this2 = this;
+
       if (this !== null && this !== void 0 && (_this$layerModel = this.layerModel) !== null && _this$layerModel !== void 0 && _this$layerModel.renderUpdate) {
         this.layerModel.renderUpdate();
       }
+
       this.models.forEach(function (model) {
         model.draw({
           uniforms: _this2.layerModel.getUninforms()
@@ -100,4 +129,5 @@ var CanvasLayer = /*#__PURE__*/function (_BaseLayer) {
   }]);
   return CanvasLayer;
 }(_BaseLayer2.default);
+
 exports.default = CanvasLayer;