poly-extrude 0.20.5 → 0.21.0

package/dist/index.d.ts

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

package/dist/index.js

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

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EACH,WAAW,EAAE,KAAK,EAClB,eAAe,EAAE,gBAAgB,EACjC,aAAa,EAAE,UAAU,EAAE,UAAU,EACrC,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EACzC,qBAAqB,EACrB,QAAQ,EACX,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EACH,WAAW,EAAE,KAAK,EAClB,eAAe,EAAE,gBAAgB,EACjC,aAAa,EAAE,UAAU,EAAE,UAAU,EACrC,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EACzC,qBAAqB,EACrB,QAAQ,EACR,cAAc,EACjB,CAAC"}

package/dist/poly-extrude.js

@@ -1,5 +1,5 @@
 /*!
- * poly-extrude v0.20.5
+ * poly-extrude v0.21.0
   */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -2454,6 +2454,7 @@
               i++;
               continue;
           }
+          let lastRepeat = false;
           // last vertex
           if (i === len - 1) {
               p1 = line[len - 2];
@@ -2478,6 +2479,16 @@
                       }
                   }
               }
+              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);
@@ -2489,7 +2500,7 @@
           let rangle = 0;
           const rad = Math.atan2(dy, dx);
           const angle = radToDeg(rad);
-          if (i === 0 || i === len - 1) {
+          if (i === 0 || i === len - 1 || lastRepeat) {
               rangle = angle - 90;
           }
           else {
@@ -4865,6 +4876,196 @@
       mergeArray(indices, indexs);
   }
 
+  function lineEquation(pt1, pt2) {
+      if (pt1.x === pt2.x) {
+          return pt1.y === pt2.y ? null : { x: pt1.x };
+      }
+      var a = (pt2.y - pt1.y) / (pt2.x - pt1.x);
+      return {
+          a: a,
+          b: pt1.y - a * pt1.x,
+      };
+  }
+  function calZ(p1, p2, p) {
+      const dx = p2.x - p1.x, dy = p2.y - p1.y;
+      const distance = Math.sqrt(dx * dx + dy * dy);
+      const dx1 = p.x - p1.x, dy1 = p.y - p1.y;
+      const dis = Math.sqrt(dx1 * dx1 + dy1 * dy1);
+      const percent = dis / distance;
+      const dz = p2.z - p1.z;
+      return p1.z + dz * percent;
+  }
+  /**
+  Return the intersection point of two lines defined by two points each
+  Return null when there's no unique intersection
+  */
+  function intersection(l1a, l1b, l2a, l2b) {
+      var line1 = lineEquation(l1a, l1b);
+      var line2 = lineEquation(l2a, l2b);
+      if (line1 === null || line2 === null) {
+          return null;
+      }
+      if (line1.hasOwnProperty('x')) {
+          if (line2.hasOwnProperty('x')) {
+              return null;
+          }
+          const p = {
+              x: line1.x,
+              y: line2.a * line1.x + line2.b,
+              z: 0
+          };
+          p.z = calZ(l1a, l1b, p);
+          return p;
+      }
+      if (line2.hasOwnProperty('x')) {
+          const p = {
+              x: line2.x,
+              y: line1.a * line2.x + line1.b,
+              z: 0
+          };
+          p.z = calZ(l1a, l1b, p);
+          return p;
+      }
+      if (line1.a === line2.a) {
+          return null;
+      }
+      var x = (line2.b - line1.b) / (line1.a - line2.a);
+      const p = {
+          x: x,
+          y: line1.a * x + line1.b,
+          z: 0
+      };
+      p.z = calZ(l1a, l1b, p);
+      return p;
+  }
+  function translatePoint(pt, dist, heading) {
+      return {
+          x: pt.x + dist * Math.cos(heading),
+          y: pt.y + dist * Math.sin(heading),
+          z: pt.z || 0
+      };
+  }
+  function offsetPointLine(points, distance) {
+      var offsetSegments = [];
+      for (let i = 1, len = points.length; i < len; i++) {
+          let a = points[i - 1], b = points[i];
+          const [x1, y1, z1] = a;
+          const [x2, y2, z2] = b;
+          if (x1 === x2 && y1 === y2) {
+              continue;
+          }
+          a = {
+              x: x1,
+              y: y1,
+              z: z1 || 0
+          };
+          b = {
+              x: x2,
+              y: y2,
+              z: z2 || 0
+          };
+          var segmentAngle = Math.atan2(a.y - b.y, a.x - b.x);
+          var offsetAngle = segmentAngle - Math.PI / 2;
+          offsetSegments.push({
+              offsetAngle: offsetAngle,
+              original: [a, b],
+              offset: [
+                  translatePoint(a, distance, offsetAngle),
+                  translatePoint(b, distance, offsetAngle)
+              ]
+          });
+      }
+      return offsetSegments;
+  }
+  /**
+  Join 2 line segments defined by 2 points each with a circular arc
+  */
+  function joinSegments(s1, s2, offset) {
+      // TODO: different join styles
+      return circularArc(s1, s2, offset)
+          .filter(function (x) { return x; });
+  }
+  function joinLineSegments(segments, offset) {
+      var joinedPoints = [];
+      var first = segments[0];
+      var last = segments[segments.length - 1];
+      if (first && last) {
+          joinedPoints.push(first.offset[0]);
+          for (let i = 1, len = segments.length; i < len; i++) {
+              let s1 = segments[i - 1], s2 = segments[i];
+              const pts = joinSegments(s1, s2, offset);
+              mergeArray(joinedPoints, pts);
+          }
+          joinedPoints.push(last.offset[1]);
+      }
+      return joinedPoints;
+  }
+  function segmentAsVector(s) {
+      return {
+          x: s[1].x - s[0].x,
+          y: s[1].y - s[0].y,
+      };
+  }
+  function getSignedAngle(s1, s2) {
+      const a = segmentAsVector(s1);
+      const b = segmentAsVector(s2);
+      return Math.atan2(a.x * b.y - a.y * b.x, a.x * b.x + a.y * b.y);
+  }
+  /**
+  Interpolates points between two offset segments in a circular form
+  */
+  function circularArc(s1, s2, distance) {
+      // if the segments are the same angle,
+      // there should be a single join point
+      if (s1.offsetAngle === s2.offsetAngle) {
+          return [s1.offset[1]];
+      }
+      const signedAngle = getSignedAngle(s1.offset, s2.offset);
+      // for inner angles, just find the offset segments intersection
+      if ((signedAngle * distance > 0) &&
+          (signedAngle * getSignedAngle(s1.offset, [s1.offset[0], s2.offset[1]]) > 0)) {
+          return [intersection(s1.offset[0], s1.offset[1], s2.offset[0], s2.offset[1])];
+      }
+      // draws a circular arc with R = offset distance, C = original meeting point
+      var points = [];
+      var center = s1.original[1];
+      // ensure angles go in the anti-clockwise direction
+      var rightOffset = distance > 0;
+      var startAngle = rightOffset ? s2.offsetAngle : s1.offsetAngle;
+      var endAngle = rightOffset ? s1.offsetAngle : s2.offsetAngle;
+      // and that the end angle is bigger than the start angle
+      if (endAngle < startAngle) {
+          endAngle += Math.PI * 2;
+      }
+      var step = Math.PI / 8;
+      for (var alpha = startAngle; alpha < endAngle; alpha += step) {
+          points.push(translatePoint(center, distance, alpha));
+      }
+      points.push(translatePoint(center, distance, endAngle));
+      return rightOffset ? points.reverse() : points;
+  }
+  function offsetPoints(pts, options) {
+      var offsetSegments = offsetPointLine(pts, options.offset);
+      return joinLineSegments(offsetSegments, options.offset);
+  }
+  function polylineOffset(line, options) {
+      options = Object.assign({ offset: 0 }, options);
+      if (options.offset === 0) {
+          return line;
+      }
+      const pts = offsetPoints(line, options);
+      const result = [];
+      for (let i = 0, len = pts.length; i < len; i++) {
+          const pt = pts[i];
+          if (!pt) {
+              continue;
+          }
+          const { x, y, z } = pt;
+          result.push([x, y, z]);
+      }
+      return result;
+  }
+
   exports.cylinder = cylinder;
   exports.expandLine = expandLine;
   exports.expandPaths = expandPaths;
@@ -4878,6 +5079,7 @@
   exports.merge = merge;
   exports.plane = plane;
   exports.polygons = polygons;
+  exports.polylineOffset = polylineOffset;
 
   Object.defineProperty(exports, '__esModule', { value: true });