@antv/l7-layers 2.21.1 → 2.21.2

package/lib/earth/utils.d.ts

@@ -0,0 +1,26 @@
+export declare const EARTH_RADIUS = 100;
+export declare const EARTH_SEGMENTS = 36;
+export declare const EARTH_RADIUS_OUTER = 40;
+/**
+ * 经纬度转xyz
+ * @param longitude 经度
+ * @param latitude 纬度
+ * @param radius 半径
+ */
+export declare function lglt2xyz(lnglat: [number, number]): number[];
+/**
+ * 构建地球球体网格
+ * @param radius
+ * @param opt
+ * @returns
+ */
+export declare function primitiveSphere(radius: number, opt: {
+    segments: number;
+}): {
+    cells: number[][];
+    positions: (number[] | Float32Array)[];
+    uvs: number[][];
+    positionsArr: number[];
+    indicesArr: number[];
+    normalArr: number[];
+};

package/lib/earth/utils.js

@@ -1,20 +1,18 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EARTH_SEGMENTS = exports.EARTH_RADIUS_OUTER = exports.EARTH_RADIUS = void 0;
 exports.lglt2xyz = lglt2xyz;
 exports.primitiveSphere = primitiveSphere;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _glMatrix = require("gl-matrix");
 // 该文件专门记录地球模式的数值
 
 // 地球网格半径
-var EARTH_RADIUS = exports.EARTH_RADIUS = 100;
-var EARTH_SEGMENTS = exports.EARTH_SEGMENTS = 36;
-var EARTH_RADIUS_OUTER = exports.EARTH_RADIUS_OUTER = 40;
+const EARTH_RADIUS = exports.EARTH_RADIUS = 100;
+const EARTH_SEGMENTS = exports.EARTH_SEGMENTS = 36;
+const EARTH_RADIUS_OUTER = exports.EARTH_RADIUS_OUTER = 40;
 
 /**
  * 角度转弧度
@@ -32,14 +30,14 @@ function torad(deg) {
  */
 function lglt2xyz(lnglat) {
   // TODO: + Math.PI/2 是为了对齐坐标
-  var lng = torad(lnglat[0]) + Math.PI / 2;
-  var lat = torad(lnglat[1]);
+  const lng = torad(lnglat[0]) + Math.PI / 2;
+  const lat = torad(lnglat[1]);
 
   // TODO: 手动增加一些偏移，减轻面的冲突
-  var radius = EARTH_RADIUS + Math.random() * 0.4;
-  var z = radius * Math.cos(lat) * Math.cos(lng);
-  var x = radius * Math.cos(lat) * Math.sin(lng);
-  var y = radius * Math.sin(lat);
+  const radius = EARTH_RADIUS + Math.random() * 0.4;
+  const z = radius * Math.cos(lat) * Math.cos(lng);
+  const x = radius * Math.cos(lat) * Math.sin(lng);
+  const y = radius * Math.sin(lat);
   return [x, y, z];
 }
 
@@ -50,27 +48,27 @@ function lglt2xyz(lnglat) {
  * @returns
  */
 function primitiveSphere(radius, opt) {
-  var matRotY = _glMatrix.mat4.create();
-  var matRotZ = _glMatrix.mat4.create();
-  var up = _glMatrix.vec3.fromValues(0, 1, 0);
-  var tmpVec3 = _glMatrix.vec3.fromValues(0, 0, 0);
+  const matRotY = _glMatrix.mat4.create();
+  const matRotZ = _glMatrix.mat4.create();
+  const up = _glMatrix.vec3.fromValues(0, 1, 0);
+  const tmpVec3 = _glMatrix.vec3.fromValues(0, 0, 0);
   opt = opt || {};
   radius = typeof radius !== 'undefined' ? radius : 1;
-  var segments = typeof opt.segments !== 'undefined' ? opt.segments : 32;
-  var totalZRotationSteps = 2 + segments;
-  var totalYRotationSteps = 2 * totalZRotationSteps;
-  var indices = [];
-  var indicesArr = [];
-  var positions = [];
-  var positionsArr = [];
-  var normalArr = [];
-  var uvs = [];
-  for (var zRotationStep = 0; zRotationStep <= totalZRotationSteps; zRotationStep++) {
-    var normalizedZ = zRotationStep / totalZRotationSteps;
-    var angleZ = normalizedZ * Math.PI;
-    for (var yRotationStep = 0; yRotationStep <= totalYRotationSteps; yRotationStep++) {
-      var normalizedY = yRotationStep / totalYRotationSteps;
-      var angleY = normalizedY * Math.PI * 2;
+  const segments = typeof opt.segments !== 'undefined' ? opt.segments : 32;
+  const totalZRotationSteps = 2 + segments;
+  const totalYRotationSteps = 2 * totalZRotationSteps;
+  const indices = [];
+  const indicesArr = [];
+  const positions = [];
+  const positionsArr = [];
+  const normalArr = [];
+  const uvs = [];
+  for (let zRotationStep = 0; zRotationStep <= totalZRotationSteps; zRotationStep++) {
+    const normalizedZ = zRotationStep / totalZRotationSteps;
+    const angleZ = normalizedZ * Math.PI;
+    for (let yRotationStep = 0; yRotationStep <= totalYRotationSteps; yRotationStep++) {
+      const normalizedY = yRotationStep / totalYRotationSteps;
+      const angleY = normalizedY * Math.PI * 2;
       _glMatrix.mat4.identity(matRotZ);
       _glMatrix.mat4.rotateZ(matRotZ, matRotZ, -angleZ);
       _glMatrix.mat4.identity(matRotY);
@@ -79,17 +77,17 @@ function primitiveSphere(radius, opt) {
       _glMatrix.vec3.transformMat4(tmpVec3, tmpVec3, matRotY);
       _glMatrix.vec3.scale(tmpVec3, tmpVec3, -radius);
       positions.push(tmpVec3.slice());
-      positionsArr.push.apply(positionsArr, (0, _toConsumableArray2.default)(tmpVec3.slice()));
+      positionsArr.push(...tmpVec3.slice());
       _glMatrix.vec3.normalize(tmpVec3, tmpVec3);
-      normalArr.push.apply(normalArr, (0, _toConsumableArray2.default)(tmpVec3.slice()));
+      normalArr.push(...tmpVec3.slice());
       uvs.push([normalizedY, 1 - normalizedZ]);
 
       // position 和 uv 一起存储
       positionsArr.push(normalizedY, 1 - normalizedZ);
     }
     if (zRotationStep > 0) {
-      var verticesCount = positions.length;
-      var firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
+      const verticesCount = positions.length;
+      let firstIndex = verticesCount - 2 * (totalYRotationSteps + 1);
       for (; firstIndex + totalYRotationSteps + 2 < verticesCount; firstIndex++) {
         indices.push([firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1]);
         indicesArr.push(firstIndex, firstIndex + 1, firstIndex + totalYRotationSteps + 1);
@@ -100,10 +98,10 @@ function primitiveSphere(radius, opt) {
   }
   return {
     cells: indices,
-    positions: positions,
-    uvs: uvs,
-    positionsArr: positionsArr,
-    indicesArr: indicesArr,
-    normalArr: normalArr
+    positions,
+    uvs,
+    positionsArr,
+    indicesArr,
+    normalArr
   };
 }

package/lib/geometry/index.d.ts

@@ -0,0 +1,22 @@
+import BaseLayer from '../core/BaseLayer';
+import type { IGeometryLayerStyleOptions } from '../core/interface';
+import type { GeometryModelType } from './models';
+export default class GeometryLayer extends BaseLayer<IGeometryLayerStyleOptions> {
+    type: string;
+    defaultSourceConfig: {
+        data: {
+            x: number;
+            y: number;
+        }[];
+        options: {
+            parser: {
+                type: string;
+                x: string;
+                y: string;
+            };
+        };
+    };
+    buildModels(): Promise<void>;
+    protected getDefaultConfig(): {} | {} | {};
+    getModelType(): GeometryModelType;
+}

package/lib/geometry/index.js

@@ -5,31 +5,15 @@ 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 _BaseLayer = _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 = exports.default = /*#__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", {
+class GeometryLayer extends _BaseLayer.default {
+  constructor(...args) {
+    super(...args);
+    (0, _defineProperty2.default)(this, "type", 'GeometryLayer');
+    (0, _defineProperty2.default)(this, "defaultSourceConfig", {
       data: [{
         x: 0,
         y: 0
@@ -42,58 +26,37 @@ var GeometryLayer = exports.default = /*#__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();
-          }
-        }, _callee, this);
-      }));
-      function buildModels() {
-        return _buildModels.apply(this, arguments);
-      }
-      return buildModels;
-    }()
-  }, {
-    key: "getDefaultConfig",
-    value: function getDefaultConfig() {
-      var type = this.getModelType();
-      var defaultConfig = {
-        plane: {},
-        sprite: {},
-        billboard: {}
-      };
-      return defaultConfig[type];
-    }
-  }, {
-    key: "getModelType",
-    value: function getModelType() {
-      var _shapeAttribute$scale;
-      var shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
-      var shape = shapeAttribute === null || shapeAttribute === 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') {
-        return 'sprite';
-      } else if (shape === 'billboard') {
-        return 'billboard';
-      } else {
-        return 'plane';
-      }
+  buildModels() {
+    var _this = this;
+    return (0, _asyncToGenerator2.default)(function* () {
+      const modelType = _this.getModelType();
+      _this.layerModel = new _models.default[modelType](_this);
+      yield _this.initLayerModels();
+    })();
+  }
+  getDefaultConfig() {
+    const type = this.getModelType();
+    const defaultConfig = {
+      plane: {},
+      sprite: {},
+      billboard: {}
+    };
+    return defaultConfig[type];
+  }
+  getModelType() {
+    var _shapeAttribute$scale;
+    const shapeAttribute = this.styleAttributeService.getLayerStyleAttribute('shape');
+    const shape = shapeAttribute === null || shapeAttribute === 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') {
+      return 'sprite';
+    } else if (shape === 'billboard') {
+      return 'billboard';
+    } else {
+      return 'plane';
     }
-  }]);
-  return GeometryLayer;
-}(_BaseLayer2.default);
+  }
+}
+exports.default = GeometryLayer;

package/lib/geometry/models/billboard.d.ts

@@ -0,0 +1,24 @@
+import type { IModel, IModelUniform, ITexture2D } from '@antv/l7-core';
+import BaseModel from '../../core/BaseModel';
+export default class BillBoardModel extends BaseModel {
+    protected texture: ITexture2D;
+    private radian;
+    planeGeometryTriangulation: () => {
+        size: number;
+        indices: number[];
+        vertices: number[];
+    };
+    getUninforms(): IModelUniform;
+    protected getCommonUniformsInfo(): {
+        uniformsArray: number[];
+        uniformsLength: number;
+        uniformsOption: {
+            [key: string]: any;
+        };
+    };
+    clearModels(): void;
+    initModels(): Promise<IModel[]>;
+    buildModels(): Promise<IModel[]>;
+    updateTexture(drawCanvas: (canvas: HTMLCanvasElement) => void): void;
+    protected registerBuiltinAttributes(): void;
+}