@thi.ng/geom 4.1.1 → 4.2.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2022-12-22T21:47:07Z
+- **Last updated**: 2023-01-10T15:20:18Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,16 @@ 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.2.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/geom@4.2.0) (2023-01-10)
+
+#### 🚀 Features
+
+- update vertices() for circle, ellipse, group ([9ff890a](https://github.com/thi-ng/umbrella/commit/9ff890a))
+  - add support for SamplingOpts.start (circle/ellipse)
+  - add SamplingOpts support for groups
+  - migrate internal helpers
+  - update export maps
+
 ## [4.1.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/geom@4.1.0) (2022-12-22)
 
 #### 🚀 Features

package/README.md

@@ -158,6 +158,7 @@ packages (which are more low-level, lightweight and usable by themselves too):
 - [@thi.ng/geom-splines](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-splines) - nD cubic & quadratic curve analysis, conversion, interpolation, splitting
 - [@thi.ng/geom-subdiv-curve](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-subdiv-curve) - Freely customizable, iterative nD subdivision curves for open / closed geometries
 - [@thi.ng/geom-tessellate](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-tessellate) - 2D/3D convex polygon tessellators
+- [@thi.ng/geom-trace-bitmap](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-trace-bitmap) - Bitmap image to hairline vector and point cloud conversions
 - [@thi.ng/geom-voronoi](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-voronoi) - Fast, incremental 2D Delaunay & Voronoi mesh implementation
 
 ## Status
@@ -269,4 +270,4 @@ If this project contributes to an academic publication, please cite it as:
 
 ## License
 
-© 2013 - 2022 Karsten Schmidt // Apache License 2.0
+© 2013 - 2023 Karsten Schmidt // Apache License 2.0

package/internal/vertices.d.ts

@@ -0,0 +1,12 @@
+import type { Attribs } from "@thi.ng/geom-api";
+import { SamplingOpts } from "@thi.ng/geom-api/sample";
+/** @internal */
+export declare const __circleOpts: (opts: number | Partial<SamplingOpts>, r: number) => [number, number, boolean];
+/**
+ * @param opts
+ * @param attribs
+ *
+ * @internal
+ */
+export declare const __sampleAttribs: (opts?: number | Partial<SamplingOpts>, attribs?: Attribs) => number | Partial<SamplingOpts> | undefined;
+//# sourceMappingURL=vertices.d.ts.map

package/internal/vertices.js

@@ -0,0 +1,35 @@
+// thing:export
+import { isNumber } from "@thi.ng/checks/is-number";
+import { DEFAULT_SAMPLES } from "@thi.ng/geom-api/sample";
+import { TAU } from "@thi.ng/math/api";
+/** @internal */
+export const __circleOpts = (opts, r) => isNumber(opts)
+    ? [opts, 0, false]
+    : [
+        opts.theta
+            ? Math.floor(TAU / opts.theta)
+            : opts.dist
+                ? Math.floor(TAU / (opts.dist / r))
+                : opts.num || DEFAULT_SAMPLES,
+        (opts.start || 0) * TAU,
+        opts.last === true,
+    ];
+/**
+ * @param opts
+ * @param attribs
+ *
+ * @internal
+ */
+export const __sampleAttribs = (opts, attribs) => {
+    if (attribs) {
+        const val = attribs.__samples;
+        return isNumber(opts)
+            ? isNumber(val)
+                ? val
+                : { num: opts, ...val }
+            : isNumber(val)
+                ? { ...opts, num: val }
+                : { ...opts, ...val };
+    }
+    return opts;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/geom",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "Functional, polymorphic API for 2D geometry types & SVG generation",
   "type": "module",
   "module": "./index.js",
@@ -35,37 +35,37 @@
     "tool:bpatch": "tools:node-esm tools/bpatch.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.6.2",
-    "@thi.ng/arrays": "^2.5.0",
-    "@thi.ng/associative": "^6.2.22",
-    "@thi.ng/checks": "^3.3.6",
-    "@thi.ng/defmulti": "^2.1.26",
-    "@thi.ng/equiv": "^2.1.16",
-    "@thi.ng/errors": "^2.2.7",
-    "@thi.ng/geom-api": "^3.3.24",
-    "@thi.ng/geom-arc": "^2.1.42",
-    "@thi.ng/geom-clip-line": "^2.2.4",
-    "@thi.ng/geom-clip-poly": "^2.1.41",
-    "@thi.ng/geom-closest-point": "^2.1.38",
-    "@thi.ng/geom-hull": "^2.1.38",
-    "@thi.ng/geom-isec": "^2.1.41",
-    "@thi.ng/geom-poly-utils": "^2.3.25",
-    "@thi.ng/geom-resample": "^2.1.42",
-    "@thi.ng/geom-splines": "^2.2.16",
-    "@thi.ng/geom-subdiv-curve": "^2.1.41",
-    "@thi.ng/geom-tessellate": "^2.1.41",
-    "@thi.ng/hiccup": "^4.2.28",
-    "@thi.ng/hiccup-svg": "^4.3.27",
-    "@thi.ng/math": "^5.3.18",
-    "@thi.ng/matrices": "^2.1.39",
-    "@thi.ng/random": "^3.3.20",
-    "@thi.ng/strings": "^3.3.22",
-    "@thi.ng/transducers": "^8.3.29",
-    "@thi.ng/vectors": "^7.5.30"
+    "@thi.ng/api": "^8.6.3",
+    "@thi.ng/arrays": "^2.5.1",
+    "@thi.ng/associative": "^6.2.23",
+    "@thi.ng/checks": "^3.3.7",
+    "@thi.ng/defmulti": "^2.1.27",
+    "@thi.ng/equiv": "^2.1.17",
+    "@thi.ng/errors": "^2.2.8",
+    "@thi.ng/geom-api": "^3.4.0",
+    "@thi.ng/geom-arc": "^2.1.43",
+    "@thi.ng/geom-clip-line": "^2.3.0",
+    "@thi.ng/geom-clip-poly": "^2.1.42",
+    "@thi.ng/geom-closest-point": "^2.1.39",
+    "@thi.ng/geom-hull": "^2.1.39",
+    "@thi.ng/geom-isec": "^2.1.42",
+    "@thi.ng/geom-poly-utils": "^2.3.26",
+    "@thi.ng/geom-resample": "^2.2.0",
+    "@thi.ng/geom-splines": "^2.2.17",
+    "@thi.ng/geom-subdiv-curve": "^2.1.42",
+    "@thi.ng/geom-tessellate": "^2.1.42",
+    "@thi.ng/hiccup": "^4.2.29",
+    "@thi.ng/hiccup-svg": "^4.3.28",
+    "@thi.ng/math": "^5.4.0",
+    "@thi.ng/matrices": "^2.1.40",
+    "@thi.ng/random": "^3.3.21",
+    "@thi.ng/strings": "^3.3.23",
+    "@thi.ng/transducers": "^8.3.30",
+    "@thi.ng/vectors": "^7.5.31"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.33.7",
-    "@thi.ng/testament": "^0.3.8",
+    "@thi.ng/testament": "^0.3.9",
     "rimraf": "^3.0.2",
     "tools": "^0.0.1",
     "typedoc": "^0.23.22",
@@ -262,6 +262,9 @@
     "./internal/transform": {
       "default": "./internal/transform.js"
     },
+    "./internal/vertices": {
+      "default": "./internal/vertices.js"
+    },
     "./intersects": {
       "default": "./intersects.js"
     },
@@ -383,5 +386,5 @@
   "thi.ng": {
     "year": 2013
   },
-  "gitHead": "28bb74c67217a352d673b6efdab234921d4a370e\n"
+  "gitHead": "3f0b3e2a7c82aefc7e46fb4338369836b5e1b8cf\n"
 }

package/vertices.js

@@ -14,6 +14,7 @@ import { madd2 } from "@thi.ng/vectors/madd";
 import { set2 } from "@thi.ng/vectors/set";
 import { Polygon } from "./api/polygon.js";
 import { __dispatch } from "./internal/dispatch.js";
+import { __circleOpts, __sampleAttribs } from "./internal/vertices.js";
 /**
  * Extracts/samples vertices from given shape's boundary and returns them as
  * array. Some shapes also support
@@ -94,12 +95,12 @@ export const vertices = defmulti(__dispatch, {
         opts = __sampleAttribs(opts, $.attribs);
         const pos = $.pos;
         const r = $.r;
-        let [num, last] = __circleOpts(opts, r);
+        let [num, start, last] = __circleOpts(opts, r);
         const delta = TAU / num;
         last && num++;
         const buf = new Array(num);
         for (let i = 0; i < num; i++) {
-            buf[i] = cartesian2(null, [r, i * delta], pos);
+            buf[i] = cartesian2(null, [r, start + i * delta], pos);
         }
         return buf;
     },
@@ -109,15 +110,18 @@ export const vertices = defmulti(__dispatch, {
         const buf = [];
         const pos = $.pos;
         const r = $.r;
-        let [num, last] = __circleOpts(opts, Math.max($.r[0], $.r[1]));
+        let [num, start, last] = __circleOpts(opts, Math.max($.r[0], $.r[1]));
         const delta = TAU / num;
         last && num++;
         for (let i = 0; i < num; i++) {
-            buf[i] = madd2([], cossin(i * delta), r, pos);
+            buf[i] = madd2([], cossin(start + i * delta), r, pos);
         }
         return buf;
     },
-    group: ({ children }) => children.reduce((acc, $) => acc.concat(vertices($)), []),
+    group: ($, opts) => {
+        opts = __sampleAttribs(opts, $.attribs);
+        return $.children.reduce((acc, $) => acc.concat(vertices($, opts)), []);
+    },
     path: ($, opts) => {
         opts = __sampleAttribs(opts, $.attribs);
         const _opts = isNumber(opts) ? { num: opts } : opts;
@@ -153,27 +157,3 @@ export const vertices = defmulti(__dispatch, {
  * @param shape -
  */
 export const ensureVertices = (shape) => isArray(shape) ? shape : vertices(shape);
-/** @internal */
-const __circleOpts = (opts, r) => isNumber(opts)
-    ? [opts, false]
-    : [
-        opts.theta
-            ? Math.floor(TAU / opts.theta)
-            : opts.dist
-                ? Math.floor(TAU / (opts.dist / r))
-                : opts.num || DEFAULT_SAMPLES,
-        opts.last === true,
-    ];
-const __sampleAttribs = (opts, attribs) => {
-    if (attribs) {
-        const val = attribs.__samples;
-        return isNumber(opts)
-            ? isNumber(val)
-                ? val
-                : { num: opts, ...val }
-            : isNumber(val)
-                ? { ...opts, num: val }
-                : { ...opts, ...val };
-    }
-    return opts;
-};