@antv/l7-layers 2.16.0 → 2.16.1

package/lib/Geometry/models/billboard.js

@@ -1,43 +1,67 @@
 "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 _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 _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/billboard_frag.glsl' */
 var planeFrag = "\nuniform sampler2D u_texture;\nuniform float u_opacity;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"picking\"\nvoid main() {\n  gl_FragColor = texture2D(u_texture, vec2(v_uv.x, 1.0 - v_uv.y));\n  gl_FragColor.a *= u_opacity;\n  gl_FragColor = filterColor(gl_FragColor);\n}\n";
+
 /* babel-plugin-inline-import '../shaders/billboard_vert.glsl' */
 var planeVert = "precision highp float;\nuniform mat4 u_ModelMatrix;\nuniform float u_raisingHeight: 0.0;\nuniform mat4 u_Mvp;\nuniform float u_opacity;\nuniform vec2 u_size: [1.0, 1.0];\nuniform mat2 u_RotateMatrix;\n\nattribute vec3 a_Extrude;\nattribute vec3 a_Position;\nattribute vec2 a_Uv;\nattribute vec3 a_Color;\n\nvarying vec3 v_Color;\nvarying vec2 v_uv;\n\n#pragma include \"projection\"\n#pragma include \"picking\"\nvoid main() {\n   vec3 extrude = a_Extrude;\n   v_Color = a_Color;\n   v_uv = a_Uv;\n\n   float raiseHeight = u_raisingHeight;\n   if(u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT || u_CoordinateSystem == COORDINATE_SYSTEM_LNGLAT_OFFSET) {\n      float mapboxZoomScale = 4.0/pow(2.0, 21.0 - u_Zoom);\n      raiseHeight = u_raisingHeight * mapboxZoomScale;\n   }\n\n   // \u8BA1\u7B97\u7ECF\u7EAC\u5EA6\u70B9\u4F4D\u5750\u6807\n   vec4 project_pos = project_position(vec4(a_Position.xy, 0.0, 1.0));\n\n   // \u8BA1\u7B97\u7ED5 z \u8F74\u65CB\u8F6C\u540E\u7684\u504F\u79FB\n   vec2 offsetXY = project_pixel(u_RotateMatrix * vec2(extrude.x * u_size.x, 0.0));\n   // \u7ED5 z \u8F74\u65CB\u8F6C\n   float x = project_pos.x + offsetXY.x;\n   float y = project_pos.y + offsetXY.y;\n   // z \u8F74\u4E0D\u53C2\u4E0E\u65CB\u8F6C\n   float z = project_pixel(extrude.y * u_size.y + raiseHeight);\n\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      gl_Position = u_Mvp * (vec4(x, y, z, 1.0));\n   } else {\n      gl_Position = project_common_position_to_clipspace(vec4(x , y, z , 1.0));\n   }\n\n   setPickingColor(a_PickingColor);\n}\n";
+
 var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
   (0, _inherits2.default)(BillBoardModel, _BaseModel);
+
   var _super = _createSuper(BillBoardModel);
+
   function BillBoardModel() {
     var _this;
+
     (0, _classCallCheck2.default)(this, BillBoardModel);
+
     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), "radian", 0);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "planeGeometryTriangulation", function () {
       var _ref = _this.layer.getLayerConfig(),
-        _ref$center = _ref.center,
-        center = _ref$center === void 0 ? [120, 30] : _ref$center;
+          _ref$center = _ref.center,
+          center = _ref$center === void 0 ? [120, 30] : _ref$center;
+
       return {
         size: 4,
         indices: [0, 1, 2, 2, 3, 0],
@@ -46,18 +70,18 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     });
     return _this;
   }
+
   (0, _createClass2.default)(BillBoardModel, [{
     key: "getUninforms",
     value: function getUninforms() {
       var _ref2 = this.layer.getLayerConfig(),
-        opacity = _ref2.opacity,
-        _ref2$width = _ref2.width,
-        width = _ref2$width === void 0 ? 1 : _ref2$width,
-        _ref2$height = _ref2.height,
-        height = _ref2$height === void 0 ? 1 : _ref2$height,
-        _ref2$raisingHeight = _ref2.raisingHeight,
-        raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
-
+          opacity = _ref2.opacity,
+          _ref2$width = _ref2.width,
+          width = _ref2$width === void 0 ? 1 : _ref2$width,
+          _ref2$height = _ref2.height,
+          height = _ref2$height === void 0 ? 1 : _ref2$height,
+          _ref2$raisingHeight = _ref2.raisingHeight,
+          raisingHeight = _ref2$raisingHeight === void 0 ? 0 : _ref2$raisingHeight;
       /**
        *               rotateFlag
        * DEFAULT            1
@@ -65,16 +89,19 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
        * GAODE2.x         -1
        * GAODE1.x         -1
        */
+
+
       var rotateFlag = 1;
+
       if (this.mapService.version === 'GAODE2.x' || this.mapService.version === 'GAODE1.x') {
         rotateFlag = -1;
-      }
-      // 控制图标的旋转角度（绕 Z 轴旋转）
+      } // 控制图标的旋转角度（绕 Z 轴旋转）
+
+
       this.radian = rotateFlag * Math.PI * (this.mapService.getRotation() % 360) / 180;
       return {
         u_raisingHeight: Number(raisingHeight),
-        u_RotateMatrix: new Float32Array([
-        // z
+        u_RotateMatrix: new Float32Array([// z
         Math.cos(this.radian), Math.sin(this.radian), -Math.sin(this.radian), Math.cos(this.radian)]),
         u_opacity: opacity || 1,
         u_texture: this.texture,
@@ -85,6 +112,7 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     key: "clearModels",
     value: function clearModels() {
       var _this$texture;
+
       (_this$texture = this.texture) === null || _this$texture === void 0 ? void 0 : _this$texture.destroy();
     }
   }, {
@@ -92,41 +120,50 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
     value: function () {
       var _initModels = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _ref3, drawCanvas, createTexture2D, model;
+
         return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _ref3 = this.layer.getLayerConfig(), drawCanvas = _ref3.drawCanvas;
-              createTexture2D = this.rendererService.createTexture2D;
-              this.texture = createTexture2D({
-                height: 0,
-                width: 0
-              });
-              if (drawCanvas) {
-                this.updateTexture(drawCanvas);
-              }
-              _context.next = 6;
-              return this.layer.buildLayerModel({
-                moduleName: 'geometryBillboard',
-                vertexShader: planeVert,
-                fragmentShader: planeFrag,
-                triangulation: this.planeGeometryTriangulation,
-                primitive: _l7Core.gl.TRIANGLES,
-                depth: {
-                  enable: true
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _ref3 = this.layer.getLayerConfig(), drawCanvas = _ref3.drawCanvas;
+                createTexture2D = this.rendererService.createTexture2D;
+                this.texture = createTexture2D({
+                  height: 0,
+                  width: 0
+                });
+
+                if (drawCanvas) {
+                  this.updateTexture(drawCanvas);
                 }
-              });
-            case 6:
-              model = _context.sent;
-              return _context.abrupt("return", [model]);
-            case 8:
-            case "end":
-              return _context.stop();
+
+                _context.next = 6;
+                return this.layer.buildLayerModel({
+                  moduleName: 'geometryBillboard',
+                  vertexShader: planeVert,
+                  fragmentShader: planeFrag,
+                  triangulation: this.planeGeometryTriangulation,
+                  primitive: _l7Core.gl.TRIANGLES,
+                  depth: {
+                    enable: true
+                  }
+                });
+
+              case 6:
+                model = _context.sent;
+                return _context.abrupt("return", [model]);
+
+              case 8:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function initModels() {
         return _initModels.apply(this, arguments);
       }
+
       return initModels;
     }()
   }, {
@@ -134,33 +171,41 @@ var BillBoardModel = /*#__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(drawCanvas) {
       var createTexture2D = this.rendererService.createTexture2D;
+
       var _ref4 = this.layer.getLayerConfig(),
-        _ref4$canvasWidth = _ref4.canvasWidth,
-        canvasWidth = _ref4$canvasWidth === void 0 ? 1 : _ref4$canvasWidth,
-        _ref4$canvasHeight = _ref4.canvasHeight,
-        canvasHeight = _ref4$canvasHeight === void 0 ? 1 : _ref4$canvasHeight;
+          _ref4$canvasWidth = _ref4.canvasWidth,
+          canvasWidth = _ref4$canvasWidth === void 0 ? 1 : _ref4$canvasWidth,
+          _ref4$canvasHeight = _ref4.canvasHeight,
+          canvasHeight = _ref4$canvasHeight === void 0 ? 1 : _ref4$canvasHeight;
+
       var canvas = document.createElement('canvas');
       canvas.width = canvasWidth;
       canvas.height = canvasHeight;
       var ctx = canvas.getContext('2d');
+
       if (ctx) {
         drawCanvas(canvas);
         this.texture = createTexture2D({
@@ -214,4 +259,5 @@ var BillBoardModel = /*#__PURE__*/function (_BaseModel) {
   }]);
   return BillBoardModel;
 }(_BaseModel2.default);
+
 exports.default = BillBoardModel;

package/lib/Geometry/models/index.js

@@ -1,13 +1,18 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _billboard = _interopRequireDefault(require("./billboard"));
+
 var _plane = _interopRequireDefault(require("./plane"));
+
 var _sprite = _interopRequireDefault(require("./sprite"));
+
 var GeometryModels = {
   plane: _plane.default,
   sprite: _sprite.default,