@thi.ng/geom 4.3.0 → 4.4.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-03-22T22:24:21Z
+- **Last updated**: 2023-03-24T19:50:18Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,23 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+## [4.4.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/geom@4.4.0) (2023-03-24)
+
+#### 🚀 Features
+
+- avoid recursive application of __samples attrib ([189446d](https://github.com/thi-ng/umbrella/commit/189446d))
+  - add internal __copyAttribsNoSamples() helper
+  - update implementations for:
+    - asPolygon()
+    - asPolyline()
+    - edges()
+    - resample()
+    - splitArcLength()
+  - update Group ctor to make attribs optional
+- add/expose subdiv & tessellation presets ([0f79c6d](https://github.com/thi-ng/umbrella/commit/0f79c6d))
+  - re-export aliases for subdivCurve() from [@thi.ng/geom-subdiv-curve](https://github.com/thi-ng/umbrella/tree/main/packages/geom-subdiv-curve) (as `SUBDIV_XXX`...)
+  - re-export aliases for tessellate() from [@thi.ng/geom-tessellate](https://github.com/thi-ng/umbrella/tree/main/packages/geom-tessellate) (as `TESSELLATE_XXX`...)
+
 ## [4.3.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/geom@4.3.0) (2023-03-22)
 
 #### 🚀 Features

package/README.md

@@ -57,7 +57,7 @@ create them, please check linked sources and/or docs.
 | [Quad](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/quad.ts)                     | 2D/3D quad (4-gon)           | ✅<sup>(1)</sup> |
 | [Quadratic](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/quadratic.ts)           | nD quadratic bezier          | ✅<sup>(1)</sup> |
 | [Ray](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/ray.ts)                       | nD ray                       | ✅<sup>(1)</sup> |
-| [Rectangle](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/ray.ts)                 | 2D rectangle                 | ✅               |
+| [Rectangle](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/rect.ts)                | 2D rectangle                 | ✅               |
 | [Sphere](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/sphere.ts)                 | 3D sphere                    | ✅<sup>(2)</sup> |
 | [Text](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/text.ts)                     | Basic stub for text labels   | ✅<sup>(3)</sup> |
 | [Triangle](https://github.com/thi-ng/umbrella/blob/develop/packages/geom/src/triangle.ts)             | 2D triangle                  | ✅               |
@@ -122,6 +122,7 @@ directly and/or perform automatic resampling/conversion if needed).
 | [`scale()`](https://docs.thi.ng/umbrella/geom/functions/scale.html)                         | scale shape (uniformly/non-uniformly)                        |
 | [`scatter()`](https://docs.thi.ng/umbrella/geom/functions/scatter.html)                     | create random points inside a shape boundary                 |
 | [`simplify()`](https://docs.thi.ng/umbrella/geom/functions/simplify.html)                   | simplify shape/boundary (Douglas-Peucker)                    |
+| [`splitArcLength()`](https://docs.thi.ng/umbrella/geom/functions/splitArcLength.html)       | split shapes based on max. arc length                        |
 | [`splitAt()`](https://docs.thi.ng/umbrella/geom/functions/splitAt.html)                     | split shape/boundary at parametric position                  |
 | [`splitNear()`](https://docs.thi.ng/umbrella/geom/functions/splitNear.html)                 | split shape/boundary near world position                     |
 | [`subdivCurve()`](https://docs.thi.ng/umbrella/geom/functions/subdivCurve.html)             | recursively apply curve subdivision kernel                   |
@@ -198,7 +199,7 @@ For Node.js REPL:
 const geom = await import("@thi.ng/geom");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 12.29 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 12.62 KB
 
 ## Dependencies
 

package/api/group.d.ts

@@ -1,9 +1,9 @@
 import type { Fn } from "@thi.ng/api";
 import type { Attribs, IHiccupShape } from "@thi.ng/geom-api";
 export declare class Group implements IHiccupShape {
-    attribs: Attribs;
+    attribs?: Attribs | undefined;
     children: IHiccupShape[];
-    constructor(attribs: Attribs, children?: IHiccupShape[]);
+    constructor(attribs?: Attribs | undefined, children?: IHiccupShape[]);
     get type(): string;
     [Symbol.iterator](): Generator<IHiccupShape, void, undefined>;
     copy(): Group;

package/as-polygon.d.ts

@@ -7,6 +7,9 @@ import { Polygon } from "./api/polygon.js";
  * or number of target vertices.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link Circle}

package/as-polygon.js

@@ -1,6 +1,6 @@
 import { defmulti } from "@thi.ng/defmulti/defmulti";
 import { Polygon } from "./api/polygon.js";
-import { __copyAttribs } from "./internal/copy.js";
+import { __copyAttribsNoSamples as __attribs } from "./internal/copy.js";
 import { __dispatch } from "./internal/dispatch.js";
 import { vertices } from "./vertices.js";
 /**
@@ -9,6 +9,9 @@ import { vertices } from "./vertices.js";
  * or number of target vertices.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link Circle}
@@ -35,5 +38,5 @@ export const asPolygon = defmulti(__dispatch, {
     rect: "points",
     tri: "points",
 }, {
-    points: ($, opts) => new Polygon(vertices($, opts), __copyAttribs($)),
+    points: ($, opts) => new Polygon(vertices($, opts), __attribs($)),
 });

package/as-polyline.d.ts

@@ -7,6 +7,9 @@ import { Polyline } from "./api/polyline.js";
  * or number of target vertices.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link Arc}

package/as-polyline.js

@@ -1,7 +1,7 @@
 import { defmulti } from "@thi.ng/defmulti/defmulti";
 import { set } from "@thi.ng/vectors/set";
 import { Polyline } from "./api/polyline.js";
-import { __copyAttribs } from "./internal/copy.js";
+import { __copyAttribsNoSamples as __attribs } from "./internal/copy.js";
 import { __dispatch } from "./internal/dispatch.js";
 import { vertices } from "./vertices.js";
 /**
@@ -10,6 +10,9 @@ import { vertices } from "./vertices.js";
  * or number of target vertices.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link Arc}
@@ -40,15 +43,15 @@ export const asPolyline = defmulti(__dispatch, {
     rect: "poly",
     tri: "poly",
 }, {
-    points: ($, opts) => new Polyline(vertices($, opts), __copyAttribs($)),
+    points: ($, opts) => new Polyline(vertices($, opts), __attribs($)),
     path: ($, opts) => {
         const pts = vertices($, opts);
         $.closed && pts.push(set([], pts[0]));
-        return new Polyline(pts, __copyAttribs($));
+        return new Polyline(pts, __attribs($));
     },
     poly: ($, opts) => {
         const pts = vertices($, opts);
         pts.push(set([], pts[0]));
-        return new Polyline(pts, __copyAttribs($));
+        return new Polyline(pts, __attribs($));
     },
 });

package/edges.d.ts

@@ -3,10 +3,12 @@ import type { IShape, SamplingOpts } from "@thi.ng/geom-api";
 import type { VecPair } from "@thi.ng/vectors";
 /**
  * Extracts the edges of given shape's boundary and returns them as an iterable
- * of vector pairs. Some shapes also support
- * [`SamplingOpts`](https://docs.thi.ng/umbrella/geom-api/interfaces/SamplingOpts.html).
+ * of vector pairs.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link AABB}
@@ -15,6 +17,7 @@ import type { VecPair } from "@thi.ng/vectors";
  * - {@link Circle}
  * - {@link Cubic}
  * - {@link Ellipse}
+ * - {@link Group}
  * - {@link Line}
  * - {@link Path}
  * - {@link Polygon}
@@ -24,6 +27,17 @@ import type { VecPair } from "@thi.ng/vectors";
  * - {@link Rect}
  * - {@link Triangle}
  *
+ * The implementations for the following shapes **do not** support
+ * [`SamplingOpts`](https://docs.thi.ng/umbrella/geom-api/interfaces/SamplingOpts.html)
+ * (all others do):
+ *
+ * - {@link Line}
+ * - {@link Polygon}
+ * - {@link Polyline}
+ * - {@link Quad}
+ * - {@link Rect}
+ * - {@link Triangle}
+ *
  * @param shape
  * @param opts
  */

package/edges.js

@@ -1,4 +1,5 @@
 import { defmulti } from "@thi.ng/defmulti/defmulti";
+import { mapcat } from "@thi.ng/transducers/mapcat";
 import { asPolygon } from "./as-polygon.js";
 import { asPolyline } from "./as-polyline.js";
 import { __dispatch } from "./internal/dispatch.js";
@@ -6,10 +7,12 @@ import { __edges } from "./internal/edges.js";
 import { vertices } from "./vertices.js";
 /**
  * Extracts the edges of given shape's boundary and returns them as an iterable
- * of vector pairs. Some shapes also support
- * [`SamplingOpts`](https://docs.thi.ng/umbrella/geom-api/interfaces/SamplingOpts.html).
+ * of vector pairs.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link AABB}
@@ -18,6 +21,7 @@ import { vertices } from "./vertices.js";
  * - {@link Circle}
  * - {@link Cubic}
  * - {@link Ellipse}
+ * - {@link Group}
  * - {@link Line}
  * - {@link Path}
  * - {@link Polygon}
@@ -27,6 +31,17 @@ import { vertices } from "./vertices.js";
  * - {@link Rect}
  * - {@link Triangle}
  *
+ * The implementations for the following shapes **do not** support
+ * [`SamplingOpts`](https://docs.thi.ng/umbrella/geom-api/interfaces/SamplingOpts.html)
+ * (all others do):
+ *
+ * - {@link Line}
+ * - {@link Polygon}
+ * - {@link Polyline}
+ * - {@link Quad}
+ * - {@link Rect}
+ * - {@link Triangle}
+ *
  * @param shape
  * @param opts
  */
@@ -58,6 +73,7 @@ export const edges = defmulti(__dispatch, {
     arc: ($, opts) => __edges(asPolyline($, opts).points, false),
     bpatch: ($) => $.edges(),
     circle: ($, opts) => __edges(asPolygon($, opts).points, true),
+    group: ($, opts) => mapcat((c) => edges(c, opts), $.children),
     path: ($, opts) => __edges(asPolygon($, opts).points, $.closed),
     poly: ($) => __edges($.points, true),
     polyline: ($) => __edges($.points),

package/internal/copy.d.ts

@@ -1,6 +1,20 @@
 import type { Attribs, IShape, PCLike, PCLikeConstructor } from "@thi.ng/geom-api";
-/** @internal */
-export declare const __copyAttribs: ($: IShape) => Attribs;
+/**
+ * Creates a shallow copy of shape's attribs. Any `exclude` keys will be removed
+ * from result attribs.
+ *
+ * @internal
+ */
+export declare const __copyAttribs: ($: IShape, ...exclude: string[]) => Attribs | undefined;
+/**
+ * Syntax sugar for {@link __copyAttribs}, also removing `__samples` key from
+ * result.
+ *
+ * @param x
+ *
+ * @internal
+ */
+export declare const __copyAttribsNoSamples: (x: IShape) => Attribs | undefined;
 /** @internal */
 export declare const __copyShape: <T extends PCLike>(ctor: PCLikeConstructor, inst: T) => T;
 //# sourceMappingURL=copy.d.ts.map

package/internal/copy.js

@@ -1,6 +1,26 @@
 // thing:export
+import { withoutKeysObj } from "@thi.ng/associative/without-keys";
 import { copyVectors } from "@thi.ng/vectors/copy";
-/** @internal */
-export const __copyAttribs = ($) => ({ ...$.attribs });
+/**
+ * Creates a shallow copy of shape's attribs. Any `exclude` keys will be removed
+ * from result attribs.
+ *
+ * @internal
+ */
+export const __copyAttribs = ($, ...exclude) => {
+    if (!$.attribs)
+        return;
+    const attribs = { ...$.attribs };
+    return exclude.length ? withoutKeysObj(attribs, exclude) : attribs;
+};
+/**
+ * Syntax sugar for {@link __copyAttribs}, also removing `__samples` key from
+ * result.
+ *
+ * @param x
+ *
+ * @internal
+ */
+export const __copyAttribsNoSamples = (x) => __copyAttribs(x, "__samples");
 /** @internal */
 export const __copyShape = (ctor, inst) => new ctor(copyVectors(inst.points), __copyAttribs(inst));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/geom",
-  "version": "4.3.0",
+  "version": "4.4.0",
   "description": "Functional, polymorphic API for 2D geometry types & SVG generation",
   "type": "module",
   "module": "./index.js",
@@ -42,18 +42,18 @@
     "@thi.ng/defmulti": "^2.1.33",
     "@thi.ng/equiv": "^2.1.20",
     "@thi.ng/errors": "^2.2.13",
-    "@thi.ng/geom-api": "^3.4.10",
-    "@thi.ng/geom-arc": "^2.1.53",
-    "@thi.ng/geom-clip-line": "^2.3.10",
-    "@thi.ng/geom-clip-poly": "^2.1.52",
+    "@thi.ng/geom-api": "^3.4.11",
+    "@thi.ng/geom-arc": "^2.1.54",
+    "@thi.ng/geom-clip-line": "^2.3.11",
+    "@thi.ng/geom-clip-poly": "^2.1.53",
     "@thi.ng/geom-closest-point": "^2.1.49",
     "@thi.ng/geom-hull": "^2.1.49",
-    "@thi.ng/geom-isec": "^2.1.52",
-    "@thi.ng/geom-poly-utils": "^2.3.36",
-    "@thi.ng/geom-resample": "^2.2.10",
-    "@thi.ng/geom-splines": "^2.2.27",
-    "@thi.ng/geom-subdiv-curve": "^2.1.52",
-    "@thi.ng/geom-tessellate": "^2.1.52",
+    "@thi.ng/geom-isec": "^2.1.53",
+    "@thi.ng/geom-poly-utils": "^2.3.37",
+    "@thi.ng/geom-resample": "^2.2.11",
+    "@thi.ng/geom-splines": "^2.2.28",
+    "@thi.ng/geom-subdiv-curve": "^2.1.53",
+    "@thi.ng/geom-tessellate": "^2.1.53",
     "@thi.ng/hiccup": "^4.2.37",
     "@thi.ng/hiccup-svg": "^4.3.39",
     "@thi.ng/math": "^5.4.5",
@@ -398,5 +398,5 @@
     ],
     "year": 2013
   },
-  "gitHead": "5b3d731c0e192c53f65efb4baed97be0e4029a33\n"
+  "gitHead": "51a3361eb4b4e906ff6dfc114049f1ea9cd97d0e\n"
 }

package/resample.d.ts

@@ -5,6 +5,9 @@ import type { IShape, SamplingOpts } from "@thi.ng/geom-api";
  * closed) or polyline (if open).
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link Circle}

package/resample.js

@@ -3,13 +3,16 @@ import { resample as _resample } from "@thi.ng/geom-resample/resample";
 import { Polygon } from "./api/polygon.js";
 import { Polyline } from "./api/polyline.js";
 import { asPolygon } from "./as-polygon.js";
-import { __copyAttribs } from "./internal/copy.js";
+import { __copyAttribsNoSamples as __attribs } from "./internal/copy.js";
 import { __dispatch } from "./internal/dispatch.js";
 /**
  * Resamples given 2D shape with given options and returns result as polygon (if
  * closed) or polyline (if open).
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently implemented for:
  *
  * - {@link Circle}
@@ -32,6 +35,6 @@ export const resample = defmulti(__dispatch, {
     rect: "circle",
 }, {
     circle: ($, opts) => asPolygon($, opts),
-    poly: ($, opts) => new Polygon(_resample($.points, opts, true, true), __copyAttribs($)),
-    polyline: ($, opts) => new Polyline(_resample($.points, opts, false, true), __copyAttribs($)),
+    poly: ($, opts) => new Polygon(_resample($.points, opts, true, true), __attribs($)),
+    polyline: ($, opts) => new Polyline(_resample($.points, opts, false, true), __attribs($)),
 });

package/split-arclength.d.ts

@@ -5,6 +5,9 @@ import type { IShape } from "@thi.ng/geom-api";
  * Returns array of new shapes/polylines.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently only implemented for:
  *
  * - {@link Group}
@@ -13,8 +16,13 @@ import type { IShape } from "@thi.ng/geom-api";
  * Other shape types will be attempted to be auto-converted via
  * {@link asPolyline} first.
  *
+ * Groups will be recursively processed (i.e. by calling {@link splitArcLength}
+ * for each child). Any nested groups will be retained, but each group might
+ * have a greater resulting number of children (depending on number of splits
+ * performed).
+ *
  * @param shape
  * @param dist
  */
-export declare const splitArclength: MultiFn2<IShape, number, IShape[]>;
+export declare const splitArcLength: MultiFn2<IShape, number, IShape[]>;
 //# sourceMappingURL=split-arclength.d.ts.map

package/split-arclength.js

@@ -4,7 +4,7 @@ import { mapcat } from "@thi.ng/transducers/mapcat";
 import { Group } from "./api/group.js";
 import { Polyline } from "./api/polyline.js";
 import { asPolyline } from "./as-polyline.js";
-import { __copyAttribs } from "./internal/copy.js";
+import { __copyAttribsNoSamples as __attribs } from "./internal/copy.js";
 import { __dispatch } from "./internal/dispatch.js";
 import { __pointArraysAsShapes } from "./internal/points-as-shape.js";
 /**
@@ -12,6 +12,9 @@ import { __pointArraysAsShapes } from "./internal/points-as-shape.js";
  * Returns array of new shapes/polylines.
  *
  * @remarks
+ * If the shape has a `__samples` attribute, it will be removed in the result to
+ * avoid recursive application.
+ *
  * Currently only implemented for:
  *
  * - {@link Group}
@@ -20,14 +23,19 @@ import { __pointArraysAsShapes } from "./internal/points-as-shape.js";
  * Other shape types will be attempted to be auto-converted via
  * {@link asPolyline} first.
  *
+ * Groups will be recursively processed (i.e. by calling {@link splitArcLength}
+ * for each child). Any nested groups will be retained, but each group might
+ * have a greater resulting number of children (depending on number of splits
+ * performed).
+ *
  * @param shape
  * @param dist
  */
-export const splitArclength = defmulti(__dispatch, {}, {
-    [DEFAULT]: ($, d) => splitArclength(asPolyline($), d),
+export const splitArcLength = defmulti(__dispatch, {}, {
+    [DEFAULT]: ($, d) => splitArcLength(asPolyline($), d),
     group: ($, d) => [
-        new Group(__copyAttribs($.attribs), [
-            ...mapcat((c) => splitArclength(c, d), $.children),
+        new Group(__attribs($), [
+            ...mapcat((c) => splitArcLength(c, d), $.children),
         ]),
     ],
     polyline: ($, d) => {
@@ -48,6 +56,6 @@ export const splitArclength = defmulti(__dispatch, {}, {
                 break;
             }
         }
-        return __pointArraysAsShapes(Polyline, chunks, $.attribs);
+        return __pointArraysAsShapes(Polyline, chunks, __attribs($));
     },
 });

package/subdiv-curve.d.ts

@@ -12,12 +12,59 @@ import type { IShape, SubdivKernel } from "@thi.ng/geom-api";
  *
  * Currently only implemented for:
  *
+ * - {@link Arc}
+ * - {@link Circle}
+ * - {@link Ellipse}
+ * - {@link Line}
  * - {@link Polygon}
  * - {@link Polyline}
+ * - {@link Quad}
+ * - {@link Rect}
+ * - {@link Triangle}
+ *
+ * @example
+ * ```ts
+ *
+ * ```
  *
  * @param shape
  * @param kernel
  * @param iter
  */
 export declare const subdivCurve: MultiFn2O<IShape, SubdivKernel, number, IShape>;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_MID_OPEN`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_MID_OPEN.html)
+ */
+export declare const SUBDIV_MID_OPEN: SubdivKernel;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_MID_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_MID_CLOSED.html)
+ */
+export declare const SUBDIV_MID_CLOSED: SubdivKernel;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_THIRDS_OPEN`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_THIRDS_OPEN.html)
+ */
+export declare const SUBDIV_THIRDS_OPEN: SubdivKernel;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_THIRDS_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_THIRDS_CLOSED.html)
+ */
+export declare const SUBDIV_THIRDS_CLOSED: SubdivKernel;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_CHAIKIN_OPEN`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_CHAIKIN_OPEN.html)
+ */
+export declare const SUBDIV_CHAIKIN_OPEN: SubdivKernel;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_CHAIKIN_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_CHAIKIN_CLOSED.html)
+ */
+export declare const SUBDIV_CHAIKIN_CLOSED: SubdivKernel;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_CUBIC_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_CUBIC_CLOSED.html)
+ */
+export declare const SUBDIV_CUBIC_CLOSED: SubdivKernel;
 //# sourceMappingURL=subdiv-curve.d.ts.map

package/subdiv-curve.js

@@ -1,7 +1,10 @@
 import { defmulti } from "@thi.ng/defmulti/defmulti";
+import * as sdc from "@thi.ng/geom-subdiv-curve/api";
 import { subdivide } from "@thi.ng/geom-subdiv-curve/subdivide";
 import { Polygon } from "./api/polygon.js";
 import { Polyline } from "./api/polyline.js";
+import { asPolygon } from "./as-polygon.js";
+import { asPolyline } from "./as-polyline.js";
 import { __copyAttribs } from "./internal/copy.js";
 import { __dispatch } from "./internal/dispatch.js";
 /**
@@ -16,14 +19,69 @@ import { __dispatch } from "./internal/dispatch.js";
  *
  * Currently only implemented for:
  *
+ * - {@link Arc}
+ * - {@link Circle}
+ * - {@link Ellipse}
+ * - {@link Line}
  * - {@link Polygon}
  * - {@link Polyline}
+ * - {@link Quad}
+ * - {@link Rect}
+ * - {@link Triangle}
+ *
+ * @example
+ * ```ts
+ *
+ * ```
  *
  * @param shape
  * @param kernel
  * @param iter
  */
-export const subdivCurve = defmulti(__dispatch, {}, {
+export const subdivCurve = defmulti(__dispatch, {
+    ellipse: "circle",
+    line: "polyline",
+    quad: "poly",
+    rect: "circle",
+    tri: "poly",
+}, {
+    arc: ($, kernel, iter = 1) => subdivCurve(asPolyline($), kernel, iter),
+    circle: ($, kernel, iter = 1) => subdivCurve(asPolygon($), kernel, iter),
     poly: ($, kernel, iter = 1) => new Polygon(subdivide($.points, kernel, iter), __copyAttribs($)),
     polyline: ($, kernel, iter = 1) => new Polyline(subdivide($.points, kernel, iter), __copyAttribs($)),
 });
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_MID_OPEN`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_MID_OPEN.html)
+ */
+export const SUBDIV_MID_OPEN = sdc.SUBDIV_MID_OPEN;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_MID_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_MID_CLOSED.html)
+ */
+export const SUBDIV_MID_CLOSED = sdc.SUBDIV_MID_CLOSED;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_THIRDS_OPEN`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_THIRDS_OPEN.html)
+ */
+export const SUBDIV_THIRDS_OPEN = sdc.SUBDIV_THIRDS_OPEN;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_THIRDS_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_THIRDS_CLOSED.html)
+ */
+export const SUBDIV_THIRDS_CLOSED = sdc.SUBDIV_THIRDS_CLOSED;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_CHAIKIN_OPEN`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_CHAIKIN_OPEN.html)
+ */
+export const SUBDIV_CHAIKIN_OPEN = sdc.SUBDIV_CHAIKIN_OPEN;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_CHAIKIN_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_CHAIKIN_CLOSED.html)
+ */
+export const SUBDIV_CHAIKIN_CLOSED = sdc.SUBDIV_CHAIKIN_CLOSED;
+/**
+ * Re-export of thi.ng/geom-subdiv-curve
+ * [`SUBDIV_CUBIC_CLOSED`](https://docs.thi.ng/umbrella/geom-subdiv-curve/variables/SUBDIV_CUBIC_CLOSED.html)
+ */
+export const SUBDIV_CUBIC_CLOSED = sdc.SUBDIV_CUBIC_CLOSED;

package/tessellate.d.ts

@@ -14,4 +14,34 @@ import type { Vec } from "@thi.ng/vectors";
  * @param tessellators
  */
 export declare const tessellate: import("@thi.ng/defmulti").MultiFn2<IShape<IShape<any>>, Tessellator[], Vec[][]>;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`earCut2`](https://docs.thi.ng/umbrella/geom-tessellate/functions/earCut2.html)
+ */
+export declare const TESSELLATE_EARCUT: Tessellator;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`edgeSplit`](https://docs.thi.ng/umbrella/geom-tessellate/functions/edgeSplit.html)
+ */
+export declare const TESSELLATE_EDGE_SPLIT: Tessellator;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`tesselInset`](https://docs.thi.ng/umbrella/geom-tessellate/functions/tesselInset.html)
+ */
+export declare const TESSELLATE_INSET: (inset?: number | undefined, keepInterior?: boolean | undefined) => Tessellator;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`quadFan`](https://docs.thi.ng/umbrella/geom-tessellate/functions/quadFan.html)
+ */
+export declare const TESSELLATE_QUAD_FAN: Tessellator;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`rimTris`](https://docs.thi.ng/umbrella/geom-tessellate/functions/rimTris.html)
+ */
+export declare const TESSELLATE_RIM_TRIS: Tessellator;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`triFan`](https://docs.thi.ng/umbrella/geom-tessellate/functions/triFan.html)
+ */
+export declare const TESSELLATE_TRI_FAN: Tessellator;
 //# sourceMappingURL=tessellate.d.ts.map

package/tessellate.js

@@ -1,5 +1,11 @@
 import { DEFAULT, defmulti } from "@thi.ng/defmulti/defmulti";
+import { earCut2 } from "@thi.ng/geom-tessellate/earcut";
+import { edgeSplit } from "@thi.ng/geom-tessellate/edge-split";
+import { tesselInset } from "@thi.ng/geom-tessellate/inset";
+import { quadFan } from "@thi.ng/geom-tessellate/quad-fan";
+import { rimTris } from "@thi.ng/geom-tessellate/rim-tris";
 import { tessellate as _tessellate } from "@thi.ng/geom-tessellate/tessellate";
+import { triFan } from "@thi.ng/geom-tessellate/tri-fan";
 import { __dispatch } from "./internal/dispatch.js";
 import { vertices } from "./vertices.js";
 /**
@@ -18,3 +24,33 @@ import { vertices } from "./vertices.js";
 export const tessellate = defmulti(__dispatch, {}, {
     [DEFAULT]: ($, fns) => _tessellate(vertices($), fns),
 });
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`earCut2`](https://docs.thi.ng/umbrella/geom-tessellate/functions/earCut2.html)
+ */
+export const TESSELLATE_EARCUT = earCut2;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`edgeSplit`](https://docs.thi.ng/umbrella/geom-tessellate/functions/edgeSplit.html)
+ */
+export const TESSELLATE_EDGE_SPLIT = edgeSplit;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`tesselInset`](https://docs.thi.ng/umbrella/geom-tessellate/functions/tesselInset.html)
+ */
+export const TESSELLATE_INSET = tesselInset;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`quadFan`](https://docs.thi.ng/umbrella/geom-tessellate/functions/quadFan.html)
+ */
+export const TESSELLATE_QUAD_FAN = quadFan;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`rimTris`](https://docs.thi.ng/umbrella/geom-tessellate/functions/rimTris.html)
+ */
+export const TESSELLATE_RIM_TRIS = rimTris;
+/**
+ * Alias for thi.ng/geom-tessellate
+ * [`triFan`](https://docs.thi.ng/umbrella/geom-tessellate/functions/triFan.html)
+ */
+export const TESSELLATE_TRI_FAN = triFan;