poly-extrude 0.20.4 → 0.20.6

package/dist/poly-extrude.js

@@ -1,5 +1,5 @@
 /*!
- * poly-extrude v0.20.4
+ * poly-extrude v0.20.6
   */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -2443,15 +2443,18 @@
               points.push(points[len2 - 2], points[len2 - 1]);
           }
       };
-      const equal = (p1, p2) => {
-          return p1[0] === p2[0] && p1[1] === p2[1];
-      };
       let i = 0;
-      let preleftline, prerightline;
+      let pre, preleftline, prerightline;
       while (i < len) {
           let p0;
           let p1 = line[i], p2 = line[i + 1];
           const current = p1;
+          if (pre && equal(pre, current)) {
+              repeatVertex();
+              i++;
+              continue;
+          }
+          let lastRepeat = false;
           // last vertex
           if (i === len - 1) {
               p1 = line[len - 2];
@@ -2476,18 +2479,29 @@
                       }
                   }
               }
+              if (equal(p1, p2)) {
+                  lastRepeat = true;
+                  for (let j = line.indexOf(p1); j >= 0; j--) {
+                      const p = line[j];
+                      if (!equal(p, current)) {
+                          p1 = p;
+                          break;
+                      }
+                  }
+              }
           }
           if (equal(p1, p2)) {
+              console.error('not find next vertex:index:', i, line);
               repeatVertex();
               i++;
               continue;
           }
           let dy = p2[1] - p1[1], dx = p2[0] - p1[0];
-          let rAngle = 0;
+          let rangle = 0;
           const rad = Math.atan2(dy, dx);
           const angle = radToDeg(rad);
-          if (i === 0 || i === len - 1) {
-              rAngle = angle - 90;
+          if (i === 0 || i === len - 1 || lastRepeat) {
+              rangle = angle - 90;
           }
           else {
               // 至少3个顶点才会触发
@@ -2502,6 +2516,7 @@
                   }
               }
               if (equal(p0, p2) || equal(p0, p1) || equal(p1, p2)) {
+                  console.error('not find pre vertex:index:', i, line);
                   repeatVertex();
                   i++;
                   continue;
@@ -2511,7 +2526,7 @@
               const angle1 = radToDeg(rad1);
               // 平行，回头路
               if (Math.abs(Math.abs(angle1 - angle) - 180) <= 0.0001) {
-                  rAngle = angle - 90;
+                  rangle = angle - 90;
               }
               else {
                   TEMPV1.x = p0[0] - p1[0];
@@ -2522,10 +2537,15 @@
                       console.error('has repeat vertex,the index:', i);
                   }
                   const vAngle = getAngle$1(TEMPV1, TEMPV2);
-                  rAngle = angle - vAngle / 2;
+                  if (Math.abs(vAngle) <= 1) {
+                      rangle = angle - 90;
+                  }
+                  else {
+                      rangle = angle - vAngle / 2;
+                  }
               }
           }
-          const rRad = degToRad(rAngle);
+          const rRad = degToRad(rangle);
           const p3 = current;
           const x = Math.cos(rRad) + p3[0], y = Math.sin(rRad) + p3[1];
           const p4 = [x, y];
@@ -2608,10 +2628,14 @@
           }
           preleftline = leftline;
           prerightline = rightline;
+          pre = current;
           i++;
       }
       return { offsetPoints: points, leftPoints, rightPoints, line };
   }
+  function equal(p1, p2) {
+      return p1[0] === p2[0] && p1[1] === p2[1];
+  }
   const getAngle$1 = ({ x: x1, y: y1 }, { x: x2, y: y2 }) => {
       const dot = x1 * x2 + y1 * y2;
       const det = x1 * y2 - y1 * x2;