@antv/l7-layers 2.17.2 → 2.17.4

package/es/core/shape/extrude.js

@@ -2,6 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { lngLatToMeters } from '@antv/l7-utils';
 import earcut from 'earcut';
 import { vec3 } from 'gl-matrix';
+
 /**
  * 拉伸多边形顶点，返回拉伸后的顶点信息
  * @param paths 路径数据组
@@ -10,16 +11,18 @@ import { vec3 } from 'gl-matrix';
 export default 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.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);
@@ -27,23 +30,29 @@ export default function extrudePolygon(path) {
       positions.push(vertices[j * 3], vertices[j * 3 + 1], 1);
     }
   }
+
   var triangles = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
   indexArray.push.apply(indexArray, _toConsumableArray(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, _toConsumableArray([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
@@ -61,46 +70,44 @@ export 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.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 = earcut(flattengeo.vertices, flattengeo.holes, flattengeo.dimensions);
-  indexArray.push.apply(indexArray, _toConsumableArray(triangles));
-  // 设置侧面
-  var _loop2 = function _loop2() {
+  indexArray.push.apply(indexArray, _toConsumableArray(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, _toConsumableArray(normal).concat(_toConsumableArray(normal), _toConsumableArray(normal), _toConsumableArray(normal)));
@@ -108,25 +115,30 @@ export 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 = vec3.create();
   var ab = vec3.create();
   var normal = vec3.create();
+
   if (needFlat) {
     p1 = lngLatToMeters(p1);
     p2 = lngLatToMeters(p2);
     p3 = lngLatToMeters(p3);
   }
+
   var pA = vec3.fromValues.apply(vec3, _toConsumableArray(p1));
   var pB = vec3.fromValues.apply(vec3, _toConsumableArray(p2));
   var pC = vec3.fromValues.apply(vec3, _toConsumableArray(p3));