poly-extrude 0.0.6 → 0.0.9

package/dist/poly-extrude.mjs

@@ -1,5 +1,5 @@
 /*!
- * poly-extrude v0.0.6
+ * poly-extrude v0.0.9
   */
 var earcut$2 = {exports: {}};
 
@@ -32,10 +32,10 @@ function earcut(data, holeIndices, dim) {
 
 
     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
 
@@ -99,9 +99,9 @@ function earcutLinked(ear, triangles, dim, minX, minY, invSize, pass) {
 
     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;
@@ -135,10 +135,21 @@ function isEar(ear) {
   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;
   }
 
@@ -150,34 +161,40 @@ function isEarHashed(ear, minX, minY, invSize) {
       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;
   }
 
@@ -193,9 +210,9 @@ function cureLocalIntersections(start, triangles, dim) {
         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);
@@ -224,8 +241,8 @@ function splitEarcut(start, triangles, dim, minX, minY, invSize) {
         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;
       }
 
@@ -257,7 +274,6 @@ function eliminateHoles(data, holeIndices, outerNode, dim) {
 
   for (i = 0; i < queue.length; i++) {
     outerNode = eliminateHole(queue[i], outerNode);
-    outerNode = filterPoints(outerNode, outerNode.next);
   }
 
   return outerNode;
@@ -277,10 +293,8 @@ function eliminateHole(hole, outerNode) {
 
   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
 
 
@@ -298,22 +312,15 @@ function findHoleBridge(hole, outerNode) {
 
       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
 
@@ -350,7 +357,7 @@ function indexCurve(start, minX, minY, invSize) {
   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;
@@ -422,8 +429,8 @@ function sortLinked(list) {
 
 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;
@@ -450,7 +457,7 @@ function getLeftmost(start) {
 
 
 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)
 
 
@@ -583,7 +590,7 @@ function Node(i, x, y) {
   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
@@ -957,11 +964,11 @@ function generateSides$1(result, options) {
           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);
 
@@ -1169,11 +1176,11 @@ function generateSides(result, options) {
 
   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);
   }
@@ -1217,7 +1224,6 @@ var TEMPV1 = {
   x: 0,
   y: 0
 };
-
 function expandLine(line, options) {
   var preAngle = 0;
   var radius = options.lineWidth / 2;
@@ -1330,4 +1336,4 @@ function leftOnLine(p, p1, p2) {
   return (y1 - y2) * x + (x2 - x1) * y + x1 * y2 - x2 * y1 > 0;
 }
 
-export { extrudePolygons, extrudePolylines };
+export { expandLine, extrudePolygons, extrudePolylines };

package/index.js

@@ -1,3 +1,3 @@
 import { extrudePolygons } from './src/polygon';
-import { extrudePolylines } from './src/polyline';
-export { extrudePolygons, extrudePolylines };
+import { extrudePolylines, expandLine } from './src/polyline';
+export { extrudePolygons, extrudePolylines, expandLine };

package/package.json

@@ -1,47 +1,47 @@
-{
-  "name": "poly-extrude",
-  "version": "0.0.6",
-  "description": "",
-  "main": "dist/poly-extrude.js",
-  "module": "dist/poly-extrude.mjs",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "lint": "eslint src/**/*.js",
-    "build": "npm run lint && cross-env NODE_ENV=dev  rollup -c"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/deyihu/poly-extrude.git"
-  },
-  "author": "",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/deyihu/poly-extrude/issues"
-  },
-  "homepage": "https://github.com/deyihu/poly-extrude#readme",
-  "devDependencies": {
-    "@babel/core": "^7.17.5",
-    "@babel/preset-env": "^7.16.11",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^21.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.1.3",
-    "cross-env": "^5.1.4",
-    "eslint": "^6.2.2",
-    "eslint-config-standard": "^14.1.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-node": "^10.0.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^4.0.1",
-    "rollup": "^2.64.0",
-    "rollup-plugin-terser": "^7.0.2"
-  },
-  "dependencies": {
-    "earcut": "^2.2.3"
-  },
-  "files": [
-    "dist/",
-    "src/",
-    "index.js"
-  ]
-}
+{
+  "name": "poly-extrude",
+  "version": "0.0.9",
+  "description": "",
+  "main": "dist/poly-extrude.js",
+  "module": "dist/poly-extrude.mjs",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "lint": "eslint src/**/*.js",
+    "build": "npm run lint && cross-env NODE_ENV=dev  rollup -c"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/deyihu/poly-extrude.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/deyihu/poly-extrude/issues"
+  },
+  "homepage": "https://github.com/deyihu/poly-extrude#readme",
+  "devDependencies": {
+    "@babel/core": "^7.17.5",
+    "@babel/preset-env": "^7.16.11",
+    "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.1.3",
+    "cross-env": "^5.1.4",
+    "eslint": "^6.2.2",
+    "eslint-config-standard": "^14.1.0",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.1",
+    "rollup": "^2.64.0",
+    "rollup-plugin-terser": "^7.0.2"
+  },
+  "dependencies": {
+    "earcut": "^2.2.4"
+  },
+  "files": [
+    "dist/",
+    "src/",
+    "index.js"
+  ]
+}

package/readme.md

@@ -0,0 +1,100 @@
+# poly-extrude
+
+Extrude polygons/polylines. Born in [maptalks.three](https://github.com/maptalks/maptalks.three) project<br>
+[building](https://deyihu.github.io/poly-extrude/test/building.html)<br>
+![](./gallery/building.png)<br>
+[buildings](https://deyihu.github.io/poly-extrude/test/buildings.html)<br>
+![](./gallery/buildings.png)<br>
+[multi-polygon](https://deyihu.github.io/poly-extrude/test/multi-polygon.html)<br>
+![](./gallery/multi-polygon.png)<br>
+[street](https://deyihu.github.io/poly-extrude/test/street.html)<br>
+![](./gallery/street.png)<br>
+[line-uv](https://deyihu.github.io/poly-extrude/test/line-uv.html)<br>
+![](./gallery/line-uv.png)
+
+## install
+
+```sh
+npm i poly-extrude
+
+#   or
+
+yarn add poly-extrude
+
+# or
+
+pnpm i poly-extrude
+```
+
+## API
+
+### ESM
+
+```js
+  import {extrudePolygons,extrudePolylines} from 'poly-extrude';
+  const polygons=[
+    //polygon
+     [
+        //outring
+        [[x,y],[x,y],...........],
+        //holes
+        [[x,y],[x,y],...........],
+        ........
+
+     ],
+     //other polygons
+     ......
+  ]
+
+  const result = extrudePolygons(polygons,{depth:2});
+  const {positon,normal,uv,indices}=result;
+  //do something
+
+  const polylines=[
+        // polyline
+        [[x,y],[x,y],...........],
+        //polyline
+        [[x,y],[x,y],...........],
+  ];
+
+  const result = extrudePolylines(polylines,{depth:2,lineWidth:2});
+  const {positon,normal,uv,indices}=result;
+  //do something
+```
+
+### CDN
+
+```html
+<script src="https://unpkg.com/poly-extrude/dist/poly-extrude.js"></script>
+
+<script>
+    const polygons=[
+        //polygon
+        [
+            //outring
+            [[x,y],[x,y],...........],
+            //holes
+            [[x,y],[x,y],...........],
+            ........
+
+        ],
+        //other polygons
+        ......
+    ]
+
+    const result =    polyextrude.extrudePolygons(polygons,{depth:2})
+    const {positon,normal,uv,indices}=result;
+    //do something
+
+    const polylines=[
+            // polyline
+            [[x,y],[x,y],...........],
+            //polyline
+            [[x,y],[x,y],...........],
+    ];
+
+    const result = polyextrude.extrudePolylines(polylines,{depth:2,lineWidth:2});
+    const {positon,normal,uv,indices}=result;
+    //do something
+</script>
+```

package/src/polygon.js

@@ -70,8 +70,8 @@ function generateSides(result, options) {
             }
             const idx = points.length / 3;
             const x1 = v1[0], y1 = v1[1], x2 = v2[0], y2 = v2[1];
-            points.push(x1, y1, 0, x2, y2, 0, x1, y1, z, x2, y2, z);
-            const a = idx, b = idx + 1, c = idx + 2, d = idx + 3;
+            points.push(x1, y1, z, x2, y2, z, x1, y1, 0, x2, y2, 0);
+            const 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);

package/src/polyline.js

@@ -88,8 +88,8 @@ function generateSides(result, options) {
 
     function addOneSideIndex(v1, v2) {
         const 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);
-        const 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);
+        const 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);
     }
@@ -121,7 +121,7 @@ function generateSides(result, options) {
 
 const TEMPV1 = { x: 0, y: 0 }, TEMPV2 = { x: 0, y: 0 };
 
-function expandLine(line, options) {
+export function expandLine(line, options) {
     let preAngle = 0;
     const radius = options.lineWidth / 2;
     const points = [], leftPoints = [], rightPoints = [];