@antv/l7-layers 2.17.3 → 2.17.4

package/lib/core/shape/Path.js

@@ -1,6 +1,7 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -12,60 +13,76 @@ exports.pentagon = pentagon;
 exports.polygonPath = polygonPath;
 exports.square = square;
 exports.triangle = triangle;
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _geometryShape;
-var ShapeType3D = /*#__PURE__*/function (ShapeType3D) {
+
+var ShapeType3D;
+exports.ShapeType3D = ShapeType3D;
+
+(function (ShapeType3D) {
   ShapeType3D["CYLINDER"] = "cylinder";
   ShapeType3D["SQUARECOLUMN"] = "squareColumn";
   ShapeType3D["TRIANGLECOLUMN"] = "triangleColumn";
   ShapeType3D["HEXAGONCOLUMN"] = "hexagonColumn";
   ShapeType3D["PENTAGONCOLUMN"] = "pentagonColumn";
-  return ShapeType3D;
-}({});
-exports.ShapeType3D = ShapeType3D;
-var ShapeType2D = /*#__PURE__*/function (ShapeType2D) {
-  ShapeType2D["CIRCLE"] = "circle";
-  ShapeType2D["SQUARE"] = "square";
-  ShapeType2D["TRIANGLE"] = "triangle";
-  ShapeType2D["HEXAGON"] = "hexagon";
-  ShapeType2D["PENTAGON"] = "pentagon";
-  return ShapeType2D;
-}({});
+})(ShapeType3D || (exports.ShapeType3D = ShapeType3D = {}));
+
+var ShapeType2D;
 /**
  * 生成规则多边形顶点个数
  * @param pointCount  顶点个数 3 => 三角形
  * @param start 顶点起始角度 调整图形的方向
  */
+
 exports.ShapeType2D = ShapeType2D;
+
+(function (ShapeType2D) {
+  ShapeType2D["CIRCLE"] = "circle";
+  ShapeType2D["SQUARE"] = "square";
+  ShapeType2D["TRIANGLE"] = "triangle";
+  ShapeType2D["HEXAGON"] = "hexagon";
+  ShapeType2D["PENTAGON"] = "pentagon";
+})(ShapeType2D || (exports.ShapeType2D = ShapeType2D = {}));
+
 function polygonPath(pointCount) {
   var start = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var step = Math.PI * 2 / pointCount;
   var line = [];
+
   for (var i = 0; i < pointCount; i++) {
     line.push(step * i + start * Math.PI / 12);
   }
+
   var path = line.map(function (t) {
     var x = Math.sin(t + Math.PI / 4);
     var y = Math.cos(t + Math.PI / 4);
     return [x, y, 0];
-  });
-  // path.push(path[0]);
+  }); // path.push(path[0]);
+
   return path;
 }
+
 function circle() {
   return polygonPath(30);
 }
+
 function square() {
   return polygonPath(4);
 }
+
 function triangle() {
   return polygonPath(3);
 }
+
 function hexagon() {
   return polygonPath(6, 1);
 }
+
 function pentagon() {
   return polygonPath(5);
 }
+
 var geometryShape = (_geometryShape = {}, (0, _defineProperty2.default)(_geometryShape, ShapeType2D.CIRCLE, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.HEXAGON, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.TRIANGLE, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.SQUARE, square), (0, _defineProperty2.default)(_geometryShape, ShapeType2D.PENTAGON, pentagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.CYLINDER, circle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.HEXAGONCOLUMN, hexagon), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.TRIANGLECOLUMN, triangle), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.SQUARECOLUMN, square), (0, _defineProperty2.default)(_geometryShape, ShapeType3D.PENTAGONCOLUMN, pentagon), _geometryShape);
 exports.geometryShape = geometryShape;

package/lib/core/shape/extrude.js

@@ -1,16 +1,22 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = extrudePolygon;
 exports.extrude_PolygonNormal = extrude_PolygonNormal;
 exports.fillPolygon = fillPolygon;
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
 var _l7Utils = require("@antv/l7-utils");
+
 var _earcut = _interopRequireDefault(require("earcut"));
+
 var _glMatrix = require("gl-matrix");
+
 /**
  * 拉伸多边形顶点，返回拉伸后的顶点信息
  * @param paths 路径数据组
@@ -19,16 +25,20 @@ var _glMatrix = require("gl-matrix");
 function extrudePolygon(path) {
   var p1 = path[0][0];
   var p2 = path[0][path[0].length - 1];
+
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
+
   var n = path[0].length;
+
   var flattengeo = _earcut.default.flatten(path);
+
   var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
+      dimensions = flattengeo.dimensions;
   var positions = [];
-  var indexArray = [];
-  // 设置顶部z值
+  var indexArray = []; // 设置顶部z值
+
   for (var j = 0; j < vertices.length / dimensions; j++) {
     if (dimensions === 2) {
       positions.push(vertices[j * 2], vertices[j * 2 + 1], 1);
@@ -36,80 +46,89 @@ function extrudePolygon(path) {
       positions.push(vertices[j * 3], vertices[j * 3 + 1], 1);
     }
   }
+
   var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
-  var _loop = function _loop() {
+
+  var _loop = function _loop(i) {
     var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
     var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
+
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
+
     var indexOffset = positions.length / 3;
     positions.push(prePoint[0], prePoint[1], 1, nextPoint[0], nextPoint[1], 1, prePoint[0], prePoint[1], 0, nextPoint[0], nextPoint[1], 0);
     indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)([0, 2, 1, 2, 3, 1].map(function (v) {
       return v + indexOffset;
     })));
   };
+
   for (var i = 0; i < n; i++) {
-    _loop();
+    _loop(i);
   }
+
   return {
     positions: positions,
     index: indexArray
   };
 }
+
 function fillPolygon(points) {
   var flattengeo = _earcut.default.flatten(points);
+
   var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   return {
     positions: flattengeo.vertices,
     index: triangles
   };
 }
+
 function extrude_PolygonNormal(path) {
   var needFlat = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   var p1 = path[0][0];
   var p2 = path[0][path[0].length - 1];
+
   if (p1[0] === p2[0] && p1[1] === p2[1]) {
     path[0] = path[0].slice(0, path[0].length - 1);
   }
+
   var n = path[0].length;
+
   var flattengeo = _earcut.default.flatten(path);
+
   var vertices = flattengeo.vertices,
-    dimensions = flattengeo.dimensions;
+      dimensions = flattengeo.dimensions;
   var positions = [];
   var indexArray = [];
-  var normals = [];
-  // 设置顶部z值 position uv
+  var normals = []; // 设置顶部z值 position uv
+
   for (var j = 0; j < vertices.length / dimensions; j++) {
-    positions.push(vertices[j * dimensions],
-    // x
-    vertices[j * dimensions + 1],
-    // y
-    1,
-    // z
-    -1,
-    // 顶部uv
+    positions.push(vertices[j * dimensions], // x
+    vertices[j * dimensions + 1], // y
+    1, // z
+    -1, // 顶部uv
     -1 // 顶部uv
     );
-
     normals.push(0, 0, 1);
   }
+
   var triangles = (0, _earcut.default)(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles));
-  // 设置侧面
-  var _loop2 = function _loop2() {
+  indexArray.push.apply(indexArray, (0, _toConsumableArray2.default)(triangles)); // 设置侧面
+
+  var _loop2 = function _loop2(i) {
     var prePoint = flattengeo.vertices.slice(i * dimensions, (i + 1) * dimensions);
     var nextPoint = flattengeo.vertices.slice((i + 1) * dimensions, (i + 2) * dimensions);
+
     if (nextPoint.length === 0) {
       nextPoint = flattengeo.vertices.slice(0, dimensions);
     }
-    var indexOffset = positions.length / 5;
-    // 侧面四顶点
-    positions.push(prePoint[0], prePoint[1], 1, 0, 0, nextPoint[0], nextPoint[1], 1, 0.1,
-    // 侧面 低uv
-    0,
-    // 侧面低 uv
+
+    var indexOffset = positions.length / 5; // 侧面四顶点
+
+    positions.push(prePoint[0], prePoint[1], 1, 0, 0, nextPoint[0], nextPoint[1], 1, 0.1, // 侧面 低uv
+    0, // 侧面低 uv
     prePoint[0], prePoint[1], 0, 0, 0.8, nextPoint[0], nextPoint[1], 0, 0.1, 0.8);
     var normal = computeVertexNormals([nextPoint[0], nextPoint[1], 1], [prePoint[0], prePoint[1], 0], [prePoint[0], prePoint[1], 1], needFlat);
     normals.push.apply(normals, (0, _toConsumableArray2.default)(normal).concat((0, _toConsumableArray2.default)(normal), (0, _toConsumableArray2.default)(normal), (0, _toConsumableArray2.default)(normal)));
@@ -117,32 +136,48 @@ function extrude_PolygonNormal(path) {
       return v + indexOffset;
     })));
   };
+
   for (var i = 0; i < n; i++) {
-    _loop2();
+    _loop2(i);
   }
+
   return {
     positions: positions,
     index: indexArray,
     normals: normals
   };
 }
+
 function computeVertexNormals(p1, p2, p3) {
   var needFlat = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+
   var cb = _glMatrix.vec3.create();
+
   var ab = _glMatrix.vec3.create();
+
   var normal = _glMatrix.vec3.create();
+
   if (needFlat) {
     p1 = (0, _l7Utils.lngLatToMeters)(p1);
     p2 = (0, _l7Utils.lngLatToMeters)(p2);
     p3 = (0, _l7Utils.lngLatToMeters)(p3);
   }
+
   var pA = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p1));
+
   var pB = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p2));
+
   var pC = _glMatrix.vec3.fromValues.apply(_glMatrix.vec3, (0, _toConsumableArray2.default)(p3));
+
   _glMatrix.vec3.sub(cb, pC, pB);
+
   _glMatrix.vec3.sub(ab, pA, pB);
+
   _glMatrix.vec3.cross(normal, cb, ab);
+
   var newNormal = _glMatrix.vec3.create();
+
   _glMatrix.vec3.normalize(newNormal, normal);
+
   return newNormal;
 }