@thi.ng/geom-tessellate 2.1.131 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/geom-tessellate",
-  "version": "2.1.131",
+  "version": "3.0.0",
   "description": "2D/3D convex polygon tessellators",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/geom-tessellate#readme",
+  "homepage": "https://thi.ng/geom-tessellate",
   "funding": [
     {
       "type": "github",
@@ -33,21 +33,25 @@
     "doc:readme": "bun ../../tools/src/module-stats.ts && bun ../../tools/src/readme.ts",
     "pub": "yarn npm publish --access public",
     "test": "bun test",
-    "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
+    "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts",
+    "tool:viz": "bun tools/visualize.ts"
   },
   "dependencies": {
-    "@thi.ng/checks": "^3.6.3",
-    "@thi.ng/geom-api": "^4.0.9",
-    "@thi.ng/geom-isec": "^3.0.9",
-    "@thi.ng/geom-poly-utils": "^2.3.114",
-    "@thi.ng/transducers": "^9.0.4",
-    "@thi.ng/vectors": "^7.10.30"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/geom-accel": "^4.0.0",
+    "@thi.ng/geom-isec": "^4.0.0",
+    "@thi.ng/geom-poly-utils": "^3.0.0",
+    "@thi.ng/math": "^5.11.0",
+    "@thi.ng/morton": "^3.1.87",
+    "@thi.ng/transducers": "^9.0.6",
+    "@thi.ng/vectors": "^7.11.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.0",
-    "esbuild": "^0.20.2",
-    "typedoc": "^0.25.12",
-    "typescript": "^5.4.3"
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
+    "typedoc": "^0.25.13",
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "2d",
@@ -74,6 +78,12 @@
     ".": {
       "default": "./index.js"
     },
+    "./api": {
+      "default": "./api.js"
+    },
+    "./earcut-complex": {
+      "default": "./earcut-complex.js"
+    },
     "./earcut": {
       "default": "./earcut.js"
     },
@@ -92,6 +102,15 @@
     "./tessellate": {
       "default": "./tessellate.js"
     },
+    "./tessellation": {
+      "default": "./tessellation.js"
+    },
+    "./tri-fan-boundary": {
+      "default": "./tri-fan-boundary.js"
+    },
+    "./tri-fan-split": {
+      "default": "./tri-fan-split.js"
+    },
     "./tri-fan": {
       "default": "./tri-fan.js"
     }
@@ -100,5 +119,5 @@
     "parent": "@thi.ng/geom",
     "year": 2013
   },
-  "gitHead": "aed3421c21044c005fbcb7cc37965ccf85a870d2\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/quad-fan.d.ts

@@ -1,3 +1,3 @@
-import type { Tessellator } from "@thi.ng/geom-api";
+import type { Tessellator } from "./api.js";
 export declare const quadFan: Tessellator;
 //# sourceMappingURL=quad-fan.d.ts.map

package/quad-fan.js

@@ -1,21 +1,17 @@
 import { centroid } from "@thi.ng/geom-poly-utils/centroid";
-import { comp } from "@thi.ng/transducers/comp";
-import { map } from "@thi.ng/transducers/map";
-import { partition } from "@thi.ng/transducers/partition";
-import { push } from "@thi.ng/transducers/push";
-import { transduce } from "@thi.ng/transducers/transduce";
-import { wrapSides } from "@thi.ng/transducers/wrap-sides";
-import { mixN } from "@thi.ng/vectors/mixn";
-const quadFan = (points) => {
-  const p = centroid(points);
-  return transduce(
-    comp(
-      partition(3, 1),
-      map(([a, b, c]) => [mixN([], a, b, 0.5), b, mixN([], b, c, 0.5), p])
-    ),
-    push(),
-    wrapSides(points)
-  );
+import { addmN } from "@thi.ng/vectors";
+const quadFan = (tess, faces, pids) => {
+  const points = tess.pointsForIDs(pids);
+  const c = tess.addPoint(centroid(points));
+  const n = pids.length - 1;
+  let m0 = tess.addPoint(addmN([], points[n], points[0], 0.5));
+  let mprev = m0;
+  for (let i = 0; i <= n; i++) {
+    const m = i < n ? tess.addPoint(addmN([], points[i], points[i + 1], 0.5)) : m0;
+    faces.push([c, mprev, pids[i], m]);
+    mprev = m;
+  }
+  return faces;
 };
 export {
   quadFan

package/rim-tris.d.ts

@@ -1,3 +1,3 @@
-import type { Tessellator } from "@thi.ng/geom-api";
+import type { Tessellator } from "./api.js";
 export declare const rimTris: Tessellator;
 //# sourceMappingURL=rim-tris.d.ts.map

package/rim-tris.js

@@ -1,29 +1,24 @@
-import { comp } from "@thi.ng/transducers/comp";
-import { map } from "@thi.ng/transducers/map";
-import { partition } from "@thi.ng/transducers/partition";
-import { push } from "@thi.ng/transducers/push";
-import { transduce } from "@thi.ng/transducers/transduce";
-import { wrapSides } from "@thi.ng/transducers/wrap-sides";
-import { zip } from "@thi.ng/transducers/zip";
-import { mixN } from "@thi.ng/vectors/mixn";
-const rimTris = (points) => {
-  const edgeCentroids = transduce(
-    comp(
-      partition(2, 1),
-      map((e) => mixN([], e[0], e[1], 0.5))
-    ),
-    push(),
-    wrapSides(points, 0, 1)
-  );
-  return transduce(
-    comp(
-      partition(2, 1),
-      map((t) => [t[0][0], t[1][1], t[1][0]])
-    ),
-    push(),
-    [edgeCentroids],
-    wrapSides([...zip(edgeCentroids, points)], 1, 0)
-  );
+import { addmN } from "@thi.ng/vectors/addmn";
+const rimTris = (tess, faces, pids) => {
+  const points = tess.pointsForIDs(pids);
+  const n = pids.length - 1;
+  const mids = [
+    tess.addPoint(addmN([], points[n], points[0], 0.5))
+  ];
+  let mprev = mids[0];
+  for (let i = 0; i <= n; i++) {
+    let m;
+    if (i < n) {
+      m = tess.addPoint(addmN([], points[i], points[i + 1], 0.5));
+      mids.push(m);
+    } else {
+      m = mids[0];
+    }
+    faces.push([mprev, pids[i], m]);
+    mprev = m;
+  }
+  faces.push(mids);
+  return faces;
 };
 export {
   rimTris

package/tessellate.d.ts

@@ -1,5 +1,8 @@
-import type { Tessellator } from "@thi.ng/geom-api";
-import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
-export declare function tessellate(points: ReadonlyVec[], tessFn: Tessellator, iter?: number): Vec[][];
-export declare function tessellate(points: ReadonlyVec[], tessFns: Iterable<Tessellator>): Vec[][];
+import type { ReadonlyVec } from "@thi.ng/vectors";
+import type { ITessellation, Tessellator } from "./api.js";
+export declare function tessellate(points: ReadonlyVec[], tessellators: Tessellator, iter?: number): ITessellation;
+export declare function tessellate(points: ReadonlyVec[], tessellators: Iterable<Tessellator>): ITessellation;
+export declare function tessellateWith(tessel: ITessellation, points: ReadonlyVec[], tessellators: Tessellator, iter?: number): ITessellation;
+export declare function tessellateWith(tessel: ITessellation, points: ReadonlyVec[], tessellators: Iterable<Tessellator>): ITessellation;
+export declare const tessellateFaces: (tessel: ITessellation, faces: number[][], tessellators: Iterable<Tessellator>) => ITessellation;
 //# sourceMappingURL=tessellate.d.ts.map

package/tessellate.js

@@ -1,23 +1,30 @@
 import { isFunction } from "@thi.ng/checks/is-function";
-import { last } from "@thi.ng/transducers/last";
-import { mapcat } from "@thi.ng/transducers/mapcat";
-import { push } from "@thi.ng/transducers/push";
-import { reducer } from "@thi.ng/transducers/reduce";
 import { repeat } from "@thi.ng/transducers/repeat";
-import { scan } from "@thi.ng/transducers/scan";
-import { transduce } from "@thi.ng/transducers/transduce";
-function tessellate(...args) {
-  return transduce(
-    scan(
-      reducer(
-        () => [args[0]],
-        (acc, fn) => transduce(mapcat(fn), push(), acc)
-      )
-    ),
-    last(),
-    isFunction(args[1]) ? repeat(args[1], args[2] || 1) : args[1]
+import { BasicTessellation } from "./tessellation.js";
+function tessellate(points, ...args) {
+  return tessellateWith(
+    new BasicTessellation(),
+    points,
+    ...args
   );
 }
+function tessellateWith(tessel, points, ...args) {
+  const fns = isFunction(args[0]) ? repeat(args[0], args[1] ?? 1) : args[0];
+  return tessellateFaces(tessel, [tessel.addPoints(points)], fns);
+}
+const tessellateFaces = (tessel, faces, tessellators) => {
+  for (let fn of tessellators) {
+    let newFaces = [];
+    for (let face of faces) {
+      fn(tessel, newFaces, face);
+    }
+    faces = newFaces;
+  }
+  tessel.addFaces(faces);
+  return tessel;
+};
 export {
-  tessellate
+  tessellate,
+  tessellateFaces,
+  tessellateWith
 };

package/tessellation.d.ts

@@ -0,0 +1,26 @@
+import { KdTreeMap } from "@thi.ng/geom-accel/kd-tree-map";
+import type { ReadonlyVec } from "@thi.ng/vectors";
+import type { ITessellation } from "./api.js";
+export declare abstract class ATessellation implements ITessellation {
+    points: ReadonlyVec[];
+    faces: number[][];
+    constructor(points?: ReadonlyVec[], faces?: number[][]);
+    abstract empty(): ITessellation;
+    abstract addPoint(p: ReadonlyVec): number;
+    addPoints(points: ReadonlyVec[]): number[];
+    addFaces(faces: number[][]): this;
+    pointsForIDs(indices: number[]): ReadonlyVec[];
+    pointsForFaces(faces?: number[][]): ReadonlyVec[][];
+}
+export declare class BasicTessellation extends ATessellation {
+    empty(): BasicTessellation;
+    addPoint(p: ReadonlyVec): number;
+}
+export declare class MeshTessellation extends ATessellation {
+    eps: number;
+    tree: KdTreeMap<ReadonlyVec, number>;
+    constructor(dim: 2 | 3, points?: ReadonlyVec[], faces?: number[][], eps?: number);
+    empty(): MeshTessellation;
+    addPoint(p: ReadonlyVec): number;
+}
+//# sourceMappingURL=tessellation.d.ts.map

package/tessellation.js

@@ -0,0 +1,59 @@
+import { KdTreeMap } from "@thi.ng/geom-accel/kd-tree-map";
+import { distSq2, distSq3 } from "@thi.ng/vectors/distsq";
+class ATessellation {
+  constructor(points = [], faces = []) {
+    this.points = points;
+    this.faces = faces;
+  }
+  addPoints(points) {
+    return points.map((p) => this.addPoint(p));
+  }
+  addFaces(faces) {
+    this.faces.push(...faces);
+    return this;
+  }
+  pointsForIDs(indices) {
+    return indices.map((i) => this.points[i]);
+  }
+  pointsForFaces(faces = this.faces) {
+    return faces.map((ids) => this.pointsForIDs(ids));
+  }
+}
+class BasicTessellation extends ATessellation {
+  empty() {
+    return new BasicTessellation();
+  }
+  addPoint(p) {
+    return this.points.push(p) - 1;
+  }
+}
+class MeshTessellation extends ATessellation {
+  constructor(dim, points = [], faces = [], eps = 1e-6) {
+    super(points, faces);
+    this.eps = eps;
+    this.tree = new KdTreeMap(
+      dim,
+      void 0,
+      dim === 2 ? distSq2 : distSq3
+    );
+    this.addPoints(points);
+  }
+  tree;
+  empty() {
+    return new MeshTessellation(this.tree.dim);
+  }
+  addPoint(p) {
+    const tree = this.tree;
+    let id = tree.get(p, this.eps);
+    if (id !== void 0) return id;
+    id = tree.size;
+    tree.set(p, id, this.eps);
+    this.points.push(p);
+    return id;
+  }
+}
+export {
+  ATessellation,
+  BasicTessellation,
+  MeshTessellation
+};

package/tri-fan-boundary.d.ts

@@ -0,0 +1,3 @@
+import type { Tessellator } from "./api.js";
+export declare const triFanBoundary: Tessellator;
+//# sourceMappingURL=tri-fan-boundary.d.ts.map

package/tri-fan-boundary.js

@@ -0,0 +1,11 @@
+const triFanBoundary = (_, faces, pids) => {
+  const c = pids[0];
+  const n = pids.length - 1;
+  for (let i = 1; i < n; i++) {
+    faces.push([c, pids[i], pids[i + 1]]);
+  }
+  return faces;
+};
+export {
+  triFanBoundary
+};

package/tri-fan-split.d.ts

@@ -0,0 +1,9 @@
+import type { Tessellator } from "./api.js";
+/**
+ * Combined tessellator of {@link triFan}, followed by {@link rimTris}, but in a
+ * single pass.
+ *
+ * @param points
+ */
+export declare const triFanSplit: Tessellator;
+//# sourceMappingURL=tri-fan-split.d.ts.map

package/tri-fan-split.js

@@ -0,0 +1,26 @@
+import { centroid } from "@thi.ng/geom-poly-utils/centroid";
+import { addmN } from "@thi.ng/vectors/addmn";
+const triFanSplit = (tess, faces, pids) => {
+  const points = tess.pointsForIDs(pids);
+  const c = centroid(points);
+  const cid = tess.addPoint(c);
+  const n = pids.length - 1;
+  for (let i = 0; i <= n; i++) {
+    const j = i < n ? i + 1 : 0;
+    const a = points[i];
+    const b = points[j];
+    const mab = tess.addPoint(addmN([], a, b, 0.5));
+    const mac = tess.addPoint(addmN([], a, c, 0.5));
+    const mbc = tess.addPoint(addmN([], b, c, 0.5));
+    faces.push(
+      [pids[i], mab, mac],
+      [mab, pids[j], mbc],
+      [mac, mab, mbc],
+      [mac, mbc, cid]
+    );
+  }
+  return faces;
+};
+export {
+  triFanSplit
+};

package/tri-fan.d.ts

@@ -1,3 +1,3 @@
-import type { Tessellator } from "@thi.ng/geom-api";
+import type { Tessellator } from "./api.js";
 export declare const triFan: Tessellator;
 //# sourceMappingURL=tri-fan.d.ts.map

package/tri-fan.js

@@ -1,20 +1,11 @@
 import { centroid } from "@thi.ng/geom-poly-utils/centroid";
-import { comp } from "@thi.ng/transducers/comp";
-import { map } from "@thi.ng/transducers/map";
-import { partition } from "@thi.ng/transducers/partition";
-import { push } from "@thi.ng/transducers/push";
-import { transduce } from "@thi.ng/transducers/transduce";
-import { wrapSides } from "@thi.ng/transducers/wrap-sides";
-const triFan = (points) => {
-  const c = centroid(points);
-  return transduce(
-    comp(
-      partition(2, 1),
-      map(([a, b]) => [a, b, c])
-    ),
-    push(),
-    wrapSides(points, 0, 1)
-  );
+const triFan = (tess, faces, pids) => {
+  const c = tess.addPoint(centroid(tess.pointsForIDs(pids)));
+  const n = pids.length - 1;
+  for (let i = 0; i <= n; i++) {
+    faces.push([c, pids[i], pids[i < n ? i + 1 : 0]]);
+  }
+  return faces;
 };
 export {
   triFan