poly-extrude 0.22.0 → 0.22.2

package/dist/index.d.ts

@@ -5,6 +5,6 @@ import { expandPaths } from './path';
 import { expandTubes } from './tube';
 import { plane } from './plane';
 import { extrudePolygonsOnPath } from './polygonpath';
-import { polylineOffset, polylineRound } from './polylineoffset';
+import { polylineOffset, polylineRound } from './polylinehelper';
 import { isClockwise, merge } from './util';
 export { isClockwise, merge, extrudePolygons, extrudePolylines, extrudeSlopes, expandLine, leftOnLine, cylinder, expandPaths, expandTubes, plane, extrudePolygonsOnPath, polygons, polylineOffset, polylineRound };

package/dist/index.js

@@ -5,7 +5,7 @@ import { expandPaths } from './path';
 import { expandTubes } from './tube';
 import { plane } from './plane';
 import { extrudePolygonsOnPath } from './polygonpath';
-import { polylineOffset, polylineRound } from './polylineoffset';
+import { polylineOffset, polylineRound } from './polylinehelper';
 import { isClockwise, merge } from './util';
 export { isClockwise, merge, extrudePolygons, extrudePolylines, extrudeSlopes, expandLine, leftOnLine, cylinder, expandPaths, expandTubes, plane, extrudePolygonsOnPath, polygons, polylineOffset, polylineRound };
 //# sourceMappingURL=index.js.map

package/dist/poly-extrude.js

@@ -1,5 +1,5 @@
 /*!
- * poly-extrude v0.22.0
+ * poly-extrude v0.22.2
   */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -2017,11 +2017,14 @@
       }
       return distance;
   }
-  function pointEqual(p1, p2) {
+  function pointEqual(p1, p2, considerZ) {
+      if (considerZ) {
+          return p1[0] === p2[0] && p1[1] === p2[1] && (p1[2] || 0) === (p2[2] || 0);
+      }
       return p1[0] === p2[0] && p1[1] === p2[1];
   }
-  function pointDistance(p1, p2) {
-      const dx = p2[0] - p1[0], dy = p2[1] - p1[1];
+  function pointDistance(p1, p2, considerZ) {
+      const dx = p2[0] - p1[0], dy = p2[1] - p1[1]; (p2[2] || 0) - (p1[2] || 0);
       return Math.sqrt(dx * dx + dy * dy);
   }
 
@@ -7069,44 +7072,57 @@
       }
       const len = line.length;
       const { roundSize, steps } = options;
-      const pts = [line[0]];
+      const points = [line[0]];
       let pre = line[0];
+      let idx = 0;
       for (let i = 1; i < len; i++) {
           const p1 = line[i - 1], p2 = line[i], p3 = line[i + 1];
-          if (pointEqual(pre, p2)) {
+          if (!p3 || !p1 || !p2) {
               continue;
           }
-          if (!p3) {
+          if (pointEqual(pre, p2, true)) {
               continue;
           }
           const d1 = pointDistance(p2, p1), d2 = pointDistance(p2, p3);
           if (d1 < roundSize || d2 < roundSize) {
               pre = p2;
-              pts.push(p2);
+              points[++idx] = p2;
               continue;
           }
-          const dx1 = p2[0] - p1[0], dy1 = p2[1] - p1[1];
-          const dx2 = p3[0] - p2[0], dy2 = p3[1] - p2[1];
+          const dx1 = p2[0] - p1[0], dy1 = p2[1] - p1[1], dz1 = (p2[2] || 0) - (p1[2] || 0);
+          const dx2 = p3[0] - p2[0], dy2 = p3[1] - p2[1], dz2 = (p3[2] || 0) - (p2[2] || 0);
           const percent1 = (d1 - roundSize) / d1;
           const percent2 = roundSize / d2;
           const c1 = {
               x: p1[0] + percent1 * dx1,
-              y: p1[1] + percent1 * dy1
+              y: p1[1] + percent1 * dy1,
+              z: (p1[2] || 0) + percent1 * dz1
           };
           const c2 = {
               x: p2[0] + percent2 * dx2,
-              y: p2[1] + percent2 * dy2
+              y: p2[1] + percent2 * dy2,
+              z: (p2[2] || 0) + percent2 * dz2
           };
-          const be = new bezier.Bezier([c1, { x: p2[0], y: p2[1] }, c2]);
+          const d3 = pointDistance([c1.x, c1.y, c1.z], [c2.x, c2.y, c2.z]);
+          if (d3 < roundSize / 10) {
+              pre = p2;
+              points[++idx] = p2;
+              continue;
+          }
+          const be = new bezier.Bezier([c1, { x: p2[0], y: p2[1], z: p2[2] || 0 }, c2]);
           const path = be.getLUT(steps);
           for (let j = 0, len1 = path.length; j < len1; j++) {
               const p = path[j];
-              pts.push([p.x, p.y]);
+              points[++idx] = [p.x, p.y, p.z];
           }
           pre = p2;
       }
-      pts.push(line[len - 1]);
-      return pts;
+      points.push(line[len - 1]);
+      for (let i = 0, len = points.length; i < len; i++) {
+          const p = points[i];
+          p[2] = p[2] || 0;
+      }
+      return points;
   }
 
   exports.cylinder = cylinder;