poly-extrude 0.0.6 → 0.0.9

package/dist/poly-extrude.js

@@ -1,5 +1,5 @@
 /*!
- * poly-extrude v0.0.6
+ * poly-extrude v0.0.9
   */
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
@@ -38,10 +38,10 @@
 
 
         invSize = Math.max(maxX - minX, maxY - minY);
-        invSize = invSize !== 0 ? 1 / invSize : 0;
+        invSize = invSize !== 0 ? 32767 / invSize : 0;
       }
 
-      earcutLinked(outerNode, triangles, dim, minX, minY, invSize);
+      earcutLinked(outerNode, triangles, dim, minX, minY, invSize, 0);
       return triangles;
     } // create a circular doubly linked list from polygon points in the specified winding order
 
@@ -105,9 +105,9 @@
 
         if (invSize ? isEarHashed(ear, minX, minY, invSize) : isEar(ear)) {
           // cut off the triangle
-          triangles.push(prev.i / dim);
-          triangles.push(ear.i / dim);
-          triangles.push(next.i / dim);
+          triangles.push(prev.i / dim | 0);
+          triangles.push(ear.i / dim | 0);
+          triangles.push(next.i / dim | 0);
           removeNode(ear); // skipping the next vertex leads to less sliver triangles
 
           ear = next.next;
@@ -141,10 +141,21 @@
       if (area(a, b, c) >= 0) return false; // reflex, can't be an ear
       // now make sure we don't have other points inside the potential ear
 
-      var p = ear.next.next;
-
-      while (p !== ear.prev) {
-        if (pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
+      var ax = a.x,
+          bx = b.x,
+          cx = c.x,
+          ay = a.y,
+          by = b.y,
+          cy = c.y; // triangle bbox; min & max are calculated like this for speed
+
+      var x0 = ax < bx ? ax < cx ? ax : cx : bx < cx ? bx : cx,
+          y0 = ay < by ? ay < cy ? ay : cy : by < cy ? by : cy,
+          x1 = ax > bx ? ax > cx ? ax : cx : bx > cx ? bx : cx,
+          y1 = ay > by ? ay > cy ? ay : cy : by > cy ? by : cy;
+      var p = c.next;
+
+      while (p !== a) {
+        if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
         p = p.next;
       }
 
@@ -156,34 +167,40 @@
           b = ear,
           c = ear.next;
       if (area(a, b, c) >= 0) return false; // reflex, can't be an ear
-      // triangle bbox; min & max are calculated like this for speed
 
-      var minTX = a.x < b.x ? a.x < c.x ? a.x : c.x : b.x < c.x ? b.x : c.x,
-          minTY = a.y < b.y ? a.y < c.y ? a.y : c.y : b.y < c.y ? b.y : c.y,
-          maxTX = a.x > b.x ? a.x > c.x ? a.x : c.x : b.x > c.x ? b.x : c.x,
-          maxTY = a.y > b.y ? a.y > c.y ? a.y : c.y : b.y > c.y ? b.y : c.y; // z-order range for the current triangle bbox;
+      var ax = a.x,
+          bx = b.x,
+          cx = c.x,
+          ay = a.y,
+          by = b.y,
+          cy = c.y; // triangle bbox; min & max are calculated like this for speed
+
+      var x0 = ax < bx ? ax < cx ? ax : cx : bx < cx ? bx : cx,
+          y0 = ay < by ? ay < cy ? ay : cy : by < cy ? by : cy,
+          x1 = ax > bx ? ax > cx ? ax : cx : bx > cx ? bx : cx,
+          y1 = ay > by ? ay > cy ? ay : cy : by > cy ? by : cy; // z-order range for the current triangle bbox;
 
-      var minZ = zOrder(minTX, minTY, minX, minY, invSize),
-          maxZ = zOrder(maxTX, maxTY, minX, minY, invSize);
+      var minZ = zOrder(x0, y0, minX, minY, invSize),
+          maxZ = zOrder(x1, y1, minX, minY, invSize);
       var p = ear.prevZ,
           n = ear.nextZ; // look for points inside the triangle in both directions
 
       while (p && p.z >= minZ && n && n.z <= maxZ) {
-        if (p !== ear.prev && p !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
+        if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
         p = p.prevZ;
-        if (n !== ear.prev && n !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
+        if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangle(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
         n = n.nextZ;
       } // look for remaining points in decreasing z-order
 
 
       while (p && p.z >= minZ) {
-        if (p !== ear.prev && p !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
+        if (p.x >= x0 && p.x <= x1 && p.y >= y0 && p.y <= y1 && p !== a && p !== c && pointInTriangle(ax, ay, bx, by, cx, cy, p.x, p.y) && area(p.prev, p, p.next) >= 0) return false;
         p = p.prevZ;
       } // look for remaining points in increasing z-order
 
 
       while (n && n.z <= maxZ) {
-        if (n !== ear.prev && n !== ear.next && pointInTriangle(a.x, a.y, b.x, b.y, c.x, c.y, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
+        if (n.x >= x0 && n.x <= x1 && n.y >= y0 && n.y <= y1 && n !== a && n !== c && pointInTriangle(ax, ay, bx, by, cx, cy, n.x, n.y) && area(n.prev, n, n.next) >= 0) return false;
         n = n.nextZ;
       }
 
@@ -199,9 +216,9 @@
             b = p.next.next;
 
         if (!equals(a, b) && intersects(a, p, p.next, b) && locallyInside(a, b) && locallyInside(b, a)) {
-          triangles.push(a.i / dim);
-          triangles.push(p.i / dim);
-          triangles.push(b.i / dim); // remove two nodes involved
+          triangles.push(a.i / dim | 0);
+          triangles.push(p.i / dim | 0);
+          triangles.push(b.i / dim | 0); // remove two nodes involved
 
           removeNode(p);
           removeNode(p.next);
@@ -230,8 +247,8 @@
             a = filterPoints(a, a.next);
             c = filterPoints(c, c.next); // run earcut on each half
 
-            earcutLinked(a, triangles, dim, minX, minY, invSize);
-            earcutLinked(c, triangles, dim, minX, minY, invSize);
+            earcutLinked(a, triangles, dim, minX, minY, invSize, 0);
+            earcutLinked(c, triangles, dim, minX, minY, invSize, 0);
             return;
           }
 
@@ -263,7 +280,6 @@
 
       for (i = 0; i < queue.length; i++) {
         outerNode = eliminateHole(queue[i], outerNode);
-        outerNode = filterPoints(outerNode, outerNode.next);
       }
 
       return outerNode;
@@ -283,10 +299,8 @@
 
       var bridgeReverse = splitPolygon(bridge, hole); // filter collinear points around the cuts
 
-      var filteredBridge = filterPoints(bridge, bridge.next);
-      filterPoints(bridgeReverse, bridgeReverse.next); // Check if input node was removed by the filtering
-
-      return outerNode === bridge ? filteredBridge : outerNode;
+      filterPoints(bridgeReverse, bridgeReverse.next);
+      return filterPoints(bridge, bridge.next);
     } // David Eberly's algorithm for finding a bridge between hole and outer polygon
 
 
@@ -304,22 +318,15 @@
 
           if (x <= hx && x > qx) {
             qx = x;
-
-            if (x === hx) {
-              if (hy === p.y) return p;
-              if (hy === p.next.y) return p.next;
-            }
-
             m = p.x < p.next.x ? p : p.next;
+            if (x === hx) return m; // hole touches outer segment; pick leftmost endpoint
           }
         }
 
         p = p.next;
       } while (p !== outerNode);
 
-      if (!m) return null;
-      if (hx === qx) return m; // hole touches outer segment; pick leftmost endpoint
-      // look for points inside the triangle of hole point, segment intersection and endpoint;
+      if (!m) return null; // look for points inside the triangle of hole point, segment intersection and endpoint;
       // if there are no points found, we have a valid connection;
       // otherwise choose the point of the minimum angle with the ray as connection point
 
@@ -356,7 +363,7 @@
       var p = start;
 
       do {
-        if (p.z === null) p.z = zOrder(p.x, p.y, minX, minY, invSize);
+        if (p.z === 0) p.z = zOrder(p.x, p.y, minX, minY, invSize);
         p.prevZ = p.prev;
         p.nextZ = p.next;
         p = p.next;
@@ -428,8 +435,8 @@
 
     function zOrder(x, y, minX, minY, invSize) {
       // coords are transformed into non-negative 15-bit integer range
-      x = 32767 * (x - minX) * invSize;
-      y = 32767 * (y - minY) * invSize;
+      x = (x - minX) * invSize | 0;
+      y = (y - minY) * invSize | 0;
       x = (x | x << 8) & 0x00FF00FF;
       x = (x | x << 4) & 0x0F0F0F0F;
       x = (x | x << 2) & 0x33333333;
@@ -456,7 +463,7 @@
 
 
     function pointInTriangle(ax, ay, bx, by, cx, cy, px, py) {
-      return (cx - px) * (ay - py) - (ax - px) * (cy - py) >= 0 && (ax - px) * (by - py) - (bx - px) * (ay - py) >= 0 && (bx - px) * (cy - py) - (cx - px) * (by - py) >= 0;
+      return (cx - px) * (ay - py) >= (ax - px) * (cy - py) && (ax - px) * (by - py) >= (bx - px) * (ay - py) && (bx - px) * (cy - py) >= (cx - px) * (by - py);
     } // check if a diagonal between two polygon nodes is valid (lies in polygon interior)
 
 
@@ -589,7 +596,7 @@
       this.prev = null;
       this.next = null; // z-order curve value
 
-      this.z = null; // previous and next nodes in z-order
+      this.z = 0; // previous and next nodes in z-order
 
       this.prevZ = null;
       this.nextZ = null; // indicates whether this is a steiner point
@@ -963,11 +970,11 @@
               y1 = v1[1],
               x2 = v2[0],
               y2 = v2[1];
-          points.push(x1, y1, 0, x2, y2, 0, x1, y1, z, x2, y2, z);
-          var a = idx,
-              b = idx + 1,
-              c = idx + 2,
-              d = idx + 3; // points.push(p3, p4, p1, p2);
+          points.push(x1, y1, z, x2, y2, z, x1, y1, 0, x2, y2, 0);
+          var a = idx + 2,
+              b = idx + 3,
+              c = idx,
+              d = idx + 1; // points.push(p3, p4, p1, p2);
 
           index.push(a, c, b, c, d, b); // index.push(c, d, b);
 
@@ -1175,11 +1182,11 @@
 
       function addOneSideIndex(v1, v2) {
         var idx = points.length / 3;
-        points.push(v1[0], v1[1], 0, v2[0], v2[1], 0, v1[0], v1[1], z, v2[0], v2[1], z);
-        var a = idx,
-            b = idx + 1,
-            c = idx + 2,
-            d = idx + 3;
+        points.push(v1[0], v1[1], z, v2[0], v2[1], z, v1[0], v1[1], 0, v2[0], v2[1], 0);
+        var a = idx + 2,
+            b = idx + 3,
+            c = idx,
+            d = idx + 1;
         index.push(a, c, b, c, d, b);
         generateSideWallUV(uvs, points, a, b, c, d);
       }
@@ -1223,7 +1230,6 @@
       x: 0,
       y: 0
     };
-
     function expandLine(line, options) {
       var preAngle = 0;
       var radius = options.lineWidth / 2;
@@ -1336,6 +1342,7 @@
       return (y1 - y2) * x + (x2 - x1) * y + x1 * y2 - x2 * y1 > 0;
     }
 
+    exports.expandLine = expandLine;
     exports.extrudePolygons = extrudePolygons;
     exports.extrudePolylines = extrudePolylines;