@thi.ng/grid-iterators 2.0.4 → 2.1.2

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.0.4](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@2.0.3...@thi.ng/grid-iterators@2.0.4) (2021-10-25)
+## [2.1.2](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@2.1.1...@thi.ng/grid-iterators@2.1.2) (2021-11-10)
 
 **Note:** Version bump only for package @thi.ng/grid-iterators
 
@@ -11,7 +11,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [2.0.3](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@2.0.2...@thi.ng/grid-iterators@2.0.3) (2021-10-15)
+## [2.1.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@2.1.0...@thi.ng/grid-iterators@2.1.1) (2021-11-04)
 
 **Note:** Version bump only for package @thi.ng/grid-iterators
 
@@ -19,17 +19,19 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [2.0.2](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@2.0.1...@thi.ng/grid-iterators@2.0.2) (2021-10-15)
-
-**Note:** Version bump only for package @thi.ng/grid-iterators
+# [2.1.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@2.0.6...@thi.ng/grid-iterators@2.1.0) (2021-11-03)
 
 
+### Bug Fixes
 
+* **grid-iterators:** fix imports, readme ([adff976](https://github.com/thi-ng/umbrella/commit/adff976f8b370108fbc29796a39f243513bc5504))
 
 
-## [2.0.1](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@2.0.0...@thi.ng/grid-iterators@2.0.1) (2021-10-13)
+### Features
 
-**Note:** Version bump only for package @thi.ng/grid-iterators
+* **grid-iterators:** add clipped shape iterators ([611f0da](https://github.com/thi-ng/umbrella/commit/611f0da940ab05e1e88b3daafb6cacb8297580a5))
+* **grid-iterators:** add floodFill(), update deps ([4634cf1](https://github.com/thi-ng/umbrella/commit/4634cf14aed00837068ffa6a77735f5ab04faf73))
+* **pixel:** add flood fill functions ([65796b9](https://github.com/thi-ng/umbrella/commit/65796b96fe77d5c4b999dd8cedfd142ea243a200))
 
 
 
@@ -64,39 +66,39 @@ Also:
 
 
 
-##  [1.0.5](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@1.0.4...@thi.ng/grid-iterators@1.0.5) (2021-09-03) 
+##  [1.0.5](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@1.0.4...@thi.ng/grid-iterators@1.0.5) (2021-09-03)
 
-**Note:** Version bump only for package @thi.ng/grid-iterators 
+**Note:** Version bump only for package @thi.ng/grid-iterators
 
-##  [0.4.24](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.4.23...@thi.ng/grid-iterators@0.4.24) (2021-03-03) 
+##  [0.4.24](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.4.23...@thi.ng/grid-iterators@0.4.24) (2021-03-03)
 
-###  Bug Fixes 
+###  Bug Fixes
 
-- **grid-iterators:** enforce int coords ([e8e570f](https://github.com/thi-ng/umbrella/commit/e8e570fa57640569554084a846cbde54966c0b06)) 
+- **grid-iterators:** enforce int coords ([e8e570f](https://github.com/thi-ng/umbrella/commit/e8e570fa57640569554084a846cbde54966c0b06))
 
-#  [0.4.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.3.17...@thi.ng/grid-iterators@0.4.0) (2020-06-20) 
+#  [0.4.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.3.17...@thi.ng/grid-iterators@0.4.0) (2020-06-20)
 
-###  Features 
+###  Features
 
-- **grid-iterators:** add new iterators ([e08985e](https://github.com/thi-ng/umbrella/commit/e08985ee07a2bc449e4f2126191a96261ef6dfb0)) 
+- **grid-iterators:** add new iterators ([e08985e](https://github.com/thi-ng/umbrella/commit/e08985ee07a2bc449e4f2126191a96261ef6dfb0))
 
-#  [0.3.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.2.3...@thi.ng/grid-iterators@0.3.0) (2020-02-25) 
+#  [0.3.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.2.3...@thi.ng/grid-iterators@0.3.0) (2020-02-25)
 
-###  Features 
+###  Features
 
-- **grid-iterators:** add line & circle iterators ([a6b757d](https://github.com/thi-ng/umbrella/commit/a6b757dd350e46404bfd2f82e58d8a3bc2c5b133)) 
+- **grid-iterators:** add line & circle iterators ([a6b757d](https://github.com/thi-ng/umbrella/commit/a6b757dd350e46404bfd2f82e58d8a3bc2c5b133))
 
-#  [0.2.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.1.0...@thi.ng/grid-iterators@0.2.0) (2019-11-09) 
+#  [0.2.0](https://github.com/thi-ng/umbrella/compare/@thi.ng/grid-iterators@0.1.0...@thi.ng/grid-iterators@0.2.0) (2019-11-09)
 
-###  Features 
+###  Features
 
-- **grid-iterators:** add interleave fns ([c883ea0](https://github.com/thi-ng/umbrella/commit/c883ea03d9a37698533d981a96f7122828731364)) 
-- **grid-iterators:** add z-curve & random iterators, add deps ([ba8ed18](https://github.com/thi-ng/umbrella/commit/ba8ed18cd84db77ccb35ed95586c66151cf1d690)) 
-- **grid-iterators:** add zigzagDiagonal(), update readme, rename files ([5630055](https://github.com/thi-ng/umbrella/commit/56300557f395698f82b453c79956ada72726444a)) 
-- **grid-iterators:** make row args optional ([60dccfc](https://github.com/thi-ng/umbrella/commit/60dccfcb0ba1d731eeecd4c12433d44b5491e7a7)) 
+- **grid-iterators:** add interleave fns ([c883ea0](https://github.com/thi-ng/umbrella/commit/c883ea03d9a37698533d981a96f7122828731364))
+- **grid-iterators:** add z-curve & random iterators, add deps ([ba8ed18](https://github.com/thi-ng/umbrella/commit/ba8ed18cd84db77ccb35ed95586c66151cf1d690))
+- **grid-iterators:** add zigzagDiagonal(), update readme, rename files ([5630055](https://github.com/thi-ng/umbrella/commit/56300557f395698f82b453c79956ada72726444a))
+- **grid-iterators:** make row args optional ([60dccfc](https://github.com/thi-ng/umbrella/commit/60dccfcb0ba1d731eeecd4c12433d44b5491e7a7))
 
-#  0.1.0 (2019-09-21) 
+#  0.1.0 (2019-09-21)
 
-###  Features 
+###  Features
 
 - **grid-iterators:** import as new package, incl. assets ([fe4ee00](https://github.com/thi-ng/umbrella/commit/fe4ee00))

package/README.md

@@ -22,6 +22,7 @@ This project is part of the
   - [Zigzag columns](#zigzag-columns)
   - [Zigzag diagonal](#zigzag-diagonal)
   - [Zigzag rows](#zigzag-rows)
+  - [Flood filling](#flood-filling)
   - [Miscellaneous](#miscellaneous)
   - [Status](#status)
   - [Related packages](#related-packages)
@@ -34,10 +35,11 @@ This project is part of the
 
 ## About
 
-2D grid iterators w/ multiple orderings.
+2D grid and shape iterators w/ multiple orderings.
 
-Provides the 15 following orderings to generate grid coordinates and
-additional iterators for shape rasterization:
+Provides the altogether 25 following orderings to generate grid coordinates,
+including iterators for shape rasterization, drawing, clipping, filling,
+processing in general:
 
 ### Columns
 
@@ -138,9 +140,50 @@ For more basic 2D/3D grid iteration, also see `range2d()` & `range3d()`
 in
 [@thi.ng/transducers](https://github.com/thi-ng/umbrella/tree/develop/packages/transducers).
 
+### Flood filling
+
+The `floodFill()` iterator can be used to iterate arbitrary 2D grids using an
+user-provided predicate function. The function recursively explores (in a
+row-major manner) the space in the `[0,0]..(width,height)` interval, starting at
+given `x,y` and continues as long given predicate function returns a truthy
+value. Any eligible 90-degree connected regions will be found and iterated
+recursively. The predicate function is used to select eligible grid cells
+(e.g. "pixels" of sorts).
+
+```ts
+// source "image"
+const img = [
+    "█", " ", " ", " ", "█",
+    "█", " ", "█", " ", " ",
+    " ", " ", "█", " ", "█",
+    " ", "█", "█", " ", " ",
+    " ", " ", " ", "█", "█",
+];
+
+// flood fill iterator from point (1,0)
+// only accept " " as source pixel value
+// image size is 5x5
+const region = floodFill((x, y) => img[x + y * 5] === " ", 1, 0, 5, 5);
+
+// label filled pixels using increasing ASCII values
+let ascii = 65; // "A"
+for(let [x,y] of region) img[x + y * 5] = String.fromCharCode(ascii++);
+
+// result image showing fill order
+img
+// [
+//   "█", "A", "B", "C", "█",
+//   "█", "I", "█", "D", "E",
+//   "K", "J", "█", "F", "█",
+//   "L", "█", "█", "G", "H",
+//   "M", "N", "O", "█", "█"
+// ]
+```
+
 ### Miscellaneous
 
-Additionally, the following shape iterators are available:
+Additionally, the following shape iterators are available, all also with
+optional clipping:
 
 - [circle](https://github.com/thi-ng/umbrella/tree/develop/packages/grid-iterators/src/circle.ts) (Bresenham)
 - [hline](https://github.com/thi-ng/umbrella/tree/develop/packages/grid-iterators/src/hvline.ts)
@@ -156,6 +199,7 @@ Additionally, the following shape iterators are available:
 ### Related packages
 
 - [@thi.ng/morton](https://github.com/thi-ng/umbrella/tree/develop/packages/morton) - Z-order curve / Morton encoding, decoding & range extraction for arbitrary dimensions
+- [@thi.ng/rasterize](https://github.com/thi-ng/umbrella/tree/develop/packages/rasterize) - 2D shape drawing & rasterization
 - [@thi.ng/transducers](https://github.com/thi-ng/umbrella/tree/develop/packages/transducers) - Lightweight transducer implementations for ES6 / TypeScript
 
 ## Installation
@@ -181,12 +225,14 @@ node --experimental-repl-await
 > const gridIterators = await import("@thi.ng/grid-iterators");
 ```
 
-Package sizes (gzipped, pre-treeshake): ESM: 1.50 KB
+Package sizes (gzipped, pre-treeshake): ESM: 2.22 KB
 
 ## Dependencies
 
+- [@thi.ng/api](https://github.com/thi-ng/umbrella/tree/develop/packages/api)
 - [@thi.ng/arrays](https://github.com/thi-ng/umbrella/tree/develop/packages/arrays)
 - [@thi.ng/binary](https://github.com/thi-ng/umbrella/tree/develop/packages/binary)
+- [@thi.ng/bitfield](https://github.com/thi-ng/umbrella/tree/develop/packages/bitfield)
 - [@thi.ng/morton](https://github.com/thi-ng/umbrella/tree/develop/packages/morton)
 - [@thi.ng/random](https://github.com/thi-ng/umbrella/tree/develop/packages/random)
 - [@thi.ng/transducers](https://github.com/thi-ng/umbrella/tree/develop/packages/transducers)

package/circle.d.ts

@@ -1,2 +1,17 @@
 export declare function circle(cx: number, cy: number, r: number, fill?: boolean): Generator<number[], void, unknown>;
+/**
+ * Version of {@link circle} yielding only coordinates in rect defined by
+ * `left,top`..`right,bottom`. Returns undefined if circle lies completely
+ * outside given clip rectangle.
+ *
+ * @param cx
+ * @param cy
+ * @param r
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ * @param fill
+ */
+export declare const circleClipped: (cx: number, cy: number, r: number, left: number, top: number, right: number, bottom: number, fill?: boolean) => Generator<number[], void, unknown> | undefined;
 //# sourceMappingURL=circle.d.ts.map

package/circle.js

@@ -1,5 +1,6 @@
+import { asInt } from "@thi.ng/api/typedarray";
+import { clipped, intersectRectCircle } from "./clipping.js";
 import { hline } from "./hvline.js";
-import { asInt } from "./utils.js";
 export function* circle(cx, cy, r, fill = true) {
     [cx, cy, r] = asInt(cx, cy, r);
     if (r < 1)
@@ -51,3 +52,22 @@ export function* circle(cx, cy, r, fill = true) {
         dx2 += 2;
     }
 }
+/**
+ * Version of {@link circle} yielding only coordinates in rect defined by
+ * `left,top`..`right,bottom`. Returns undefined if circle lies completely
+ * outside given clip rectangle.
+ *
+ * @param cx
+ * @param cy
+ * @param r
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ * @param fill
+ */
+export const circleClipped = (cx, cy, r, left, top, right, bottom, fill = true) => {
+    return intersectRectCircle(left, top, right, bottom, cx, cy, r)
+        ? clipped(circle(cx, cy, r, fill), left, top, right, bottom)
+        : undefined;
+};

package/clipping.d.ts

@@ -0,0 +1,42 @@
+import type { FnU7, FnU8, Tuple } from "@thi.ng/api";
+/**
+ * Filters points from `src` iterable to remove any falling outside the rect
+ * defined by `left,top`..`right,bottom`.
+ *
+ * @param src
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ */
+export declare function clipped(src: Iterable<number[]>, left: number, top: number, right: number, bottom: number): Generator<number[], void, unknown>;
+/**
+ * Based on {@link @thi.ng/geom-isec}, but inlined to avoid dependency.
+ *
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @param cx
+ * @param cy
+ * @param r
+ *
+ * @internal
+ */
+export declare const intersectRectCircle: FnU7<number, boolean>;
+/**
+ * Based on {@link @thi.ng/geom-clip-line#liangBarsky2Raw}, but with diff return type.
+ *
+ * @param ax
+ * @param ay
+ * @param bx
+ * @param by
+ * @param minx
+ * @param miny
+ * @param maxx
+ * @param maxy
+ *
+ * @internal
+ */
+export declare const liangBarsky: FnU8<number, Tuple<number, 4> | undefined>;
+//# sourceMappingURL=clipping.d.ts.map

package/clipping.js

@@ -0,0 +1,76 @@
+/**
+ * Filters points from `src` iterable to remove any falling outside the rect
+ * defined by `left,top`..`right,bottom`.
+ *
+ * @param src
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ */
+export function* clipped(src, left, top, right, bottom) {
+    for (let p of src) {
+        if (p[0] >= left && p[0] < right && p[1] >= top && p[1] < bottom)
+            yield p;
+    }
+}
+/** @internal */
+const axis = (a, b, c) => (a < b ? a - b : a > b + c ? a - b - c : 0) ** 2;
+/**
+ * Based on {@link @thi.ng/geom-isec}, but inlined to avoid dependency.
+ *
+ * @param x
+ * @param y
+ * @param w
+ * @param h
+ * @param cx
+ * @param cy
+ * @param r
+ *
+ * @internal
+ */
+export const intersectRectCircle = (x, y, w, h, cx, cy, r) => axis(cx, x, w) + axis(cy, y, h) <= r * r;
+/**
+ * Based on {@link @thi.ng/geom-clip-line#liangBarsky2Raw}, but with diff return type.
+ *
+ * @param ax
+ * @param ay
+ * @param bx
+ * @param by
+ * @param minx
+ * @param miny
+ * @param maxx
+ * @param maxy
+ *
+ * @internal
+ */
+export const liangBarsky = (ax, ay, bx, by, minx, miny, maxx, maxy) => {
+    const dx = bx - ax;
+    const dy = by - ay;
+    let alpha = 0;
+    let beta = 1;
+    const clip = (p, q) => {
+        if (p < 0) {
+            const r = q / p;
+            if (r > beta)
+                return false;
+            r > alpha && (alpha = r);
+        }
+        else if (p > 0) {
+            const r = q / p;
+            if (r < alpha)
+                return false;
+            r < beta && (beta = r);
+        }
+        else if (q < 0) {
+            return false;
+        }
+        return true;
+    };
+    return clip(-dx, ax - minx) &&
+        clip(dx, maxx - ax) &&
+        clip(-dy, ay - miny) &&
+        clip(dy, maxy - ay)
+        ? [alpha * dx + ax, alpha * dy + ay, beta * dx + ax, beta * dy + ay]
+        : undefined;
+};

package/column-ends.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Filtered version of {@link columns2d}, only including end points of
  * each column.

package/diagonal-ends.js

@@ -1,5 +1,5 @@
+import { asInt } from "@thi.ng/api/typedarray";
 import { diagonal2d } from "./diagonal.js";
-import { asInt } from "./utils.js";
 /**
  * Filtered version of {@link diagonal2d}, only including end points of
  * the diagonals, apart from the very first and last points: `[0,0]` and

package/diagonal.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Yields sequence of 2D grid coordinates in diagonal order starting at
  * [0,0] and using given `cols` and `rows`. Each diagonal starts at y=0

package/flood-fill.d.ts

@@ -0,0 +1,37 @@
+import type { Predicate2 } from "@thi.ng/api";
+/**
+ * Yields an iterator of 2D coordinates of the connected region around `x,y` for
+ * which the given predicate succeeds. I.e. The function recursively explores
+ * (in a row-major manner) the space in the `[0,0]..(width,height)` interval,
+ * starting at given `x,y` and continues as long given predicate function
+ * returns a truthy value.
+ *
+ * @remarks
+ * Only the behavior is recursive, not the actual implementation (stack based).
+ * Grid cells are visited max. once. A bit field is used to mark visited cells.
+ *
+ * @example
+ * ```ts
+ * const img = [
+ *   1,0,1,0,
+ *   0,0,0,0,
+ *   0,1,1,0,
+ *   0,1,1,1,
+ * ];
+ *
+ * // flood fill connected region from point (2,1)
+ * [...floodFill((x, y) => img[y * 4 + x] === 0, 2, 1, 4, 4)]
+ * // [
+ * //   [2, 1], [1, 1], [0, 1], [3, 1], [3, 2],
+ * //   [3, 0], [0, 2], [0, 3], [1, 0]
+ * // ]
+ * ```
+ *
+ * @param pred
+ * @param x
+ * @param y
+ * @param width
+ * @param height
+ */
+export declare function floodFill(pred: Predicate2<number>, x: number, y: number, width: number, height: number): Generator<number[], void, unknown>;
+//# sourceMappingURL=flood-fill.d.ts.map

package/flood-fill.js

@@ -0,0 +1,81 @@
+import { defBitField } from "@thi.ng/bitfield/bitfield";
+/**
+ * Yields an iterator of 2D coordinates of the connected region around `x,y` for
+ * which the given predicate succeeds. I.e. The function recursively explores
+ * (in a row-major manner) the space in the `[0,0]..(width,height)` interval,
+ * starting at given `x,y` and continues as long given predicate function
+ * returns a truthy value.
+ *
+ * @remarks
+ * Only the behavior is recursive, not the actual implementation (stack based).
+ * Grid cells are visited max. once. A bit field is used to mark visited cells.
+ *
+ * @example
+ * ```ts
+ * const img = [
+ *   1,0,1,0,
+ *   0,0,0,0,
+ *   0,1,1,0,
+ *   0,1,1,1,
+ * ];
+ *
+ * // flood fill connected region from point (2,1)
+ * [...floodFill((x, y) => img[y * 4 + x] === 0, 2, 1, 4, 4)]
+ * // [
+ * //   [2, 1], [1, 1], [0, 1], [3, 1], [3, 2],
+ * //   [3, 0], [0, 2], [0, 3], [1, 0]
+ * // ]
+ * ```
+ *
+ * @param pred
+ * @param x
+ * @param y
+ * @param width
+ * @param height
+ */
+export function* floodFill(pred, x, y, width, height) {
+    x |= 0;
+    y |= 0;
+    if (!pred(x, y))
+        return;
+    const queue = [[x, y]];
+    const visited = defBitField(width * height);
+    height--;
+    while (queue.length) {
+        [x, y] = queue.pop();
+        yield* partialRow(pred, queue, visited, x, y, width, height, -1);
+        yield* partialRow(pred, queue, visited, x + 1, y, width, height, 1);
+    }
+}
+/** @internal */
+function* partialRow(pred, queue, visited, x, y, width, height1, step) {
+    let idx = y * width + x;
+    if (visited.at(idx))
+        return;
+    let scanUp = false;
+    let scanDown = false;
+    while (x >= 0 && x < width && pred(x, y)) {
+        visited.setAt(idx);
+        yield [x, y];
+        if (y > 0) {
+            if (pred(x, y - 1) && !scanUp) {
+                queue.push([x, y - 1]);
+                scanUp = true;
+            }
+            else {
+                scanUp = false;
+            }
+        }
+        if (y < height1) {
+            if (pred(x, y + 1) && !scanDown) {
+                queue.push([x, y + 1]);
+                scanDown = true;
+            }
+            else {
+                scanDown = false;
+            }
+        }
+        x += step;
+        idx += step;
+    }
+}

package/hilbert.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Yields sequence of 2D grid coordinates along 2D Hilbert curve using
  * given `cols` and `rows` (each max. 32768 (2^15)).

package/hvline.d.ts

@@ -1,3 +1,5 @@
 export declare function hline(x: number, y: number, len: number): Generator<number[], void, unknown>;
 export declare function vline(x: number, y: number, len: number): Generator<number[], void, unknown>;
+export declare function hlineClipped(x: number, y: number, len: number, left: number, top: number, right: number, bottom: number): Generator<number[], void, unknown>;
+export declare function vlineClipped(x: number, y: number, len: number, left: number, top: number, right: number, bottom: number): Generator<number[], void, unknown>;
 //# sourceMappingURL=hvline.d.ts.map

package/hvline.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 export function* hline(x, y, len) {
     [x, y, len] = asInt(x, y, len);
     for (const xmax = x + len; x < xmax; x++) {
@@ -11,3 +11,23 @@ export function* vline(x, y, len) {
         yield [x, y];
     }
 }
+export function* hlineClipped(x, y, len, left, top, right, bottom) {
+    [x, y, len] = asInt(x, y, len);
+    if (x >= right || y < top || y >= bottom)
+        return;
+    if (x < left) {
+        len += x - left;
+        x = left;
+    }
+    yield* hline(x, y, Math.min(len, right - x));
+}
+export function* vlineClipped(x, y, len, left, top, right, bottom) {
+    [x, y, len] = asInt(x, y, len);
+    if (x < left || x >= right || y >= bottom)
+        return;
+    if (y < top) {
+        len += y - top;
+        y = top;
+    }
+    yield* vline(x, y, Math.min(len, bottom - y));
+}

package/index.d.ts

@@ -1,8 +1,10 @@
 export * from "./circle.js";
+export * from "./clipping.js";
 export * from "./column-ends.js";
 export * from "./columns.js";
 export * from "./diagonal.js";
 export * from "./diagonal-ends.js";
+export * from "./flood-fill.js";
 export * from "./hilbert.js";
 export * from "./hvline.js";
 export * from "./interleave.js";

package/index.js

@@ -1,8 +1,10 @@
 export * from "./circle.js";
+export * from "./clipping.js";
 export * from "./column-ends.js";
 export * from "./columns.js";
 export * from "./diagonal.js";
 export * from "./diagonal-ends.js";
+export * from "./flood-fill.js";
 export * from "./hilbert.js";
 export * from "./hvline.js";
 export * from "./interleave.js";

package/line.d.ts

@@ -1,2 +1,17 @@
 export declare function line(ax: number, ay: number, bx: number, by: number): Generator<number[], void, unknown>;
+/**
+ * Version of {@link line} yielding only coordinates in rect defined by
+ * `left,top`..`right,bottom`. Returns undefined if circle lies completely
+ * outside given clip rectangle.
+ *
+ * @param x1
+ * @param y1
+ * @param x2
+ * @param y2
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ */
+export declare const lineClipped: (x1: number, y1: number, x2: number, y2: number, left: number, top: number, right: number, bottom: number) => Generator<number[], void, unknown> | undefined;
 //# sourceMappingURL=line.d.ts.map

package/line.js

@@ -1,4 +1,5 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
+import { liangBarsky } from "./clipping.js";
 export function* line(ax, ay, bx, by) {
     [ax, ay, bx, by] = asInt(ax, ay, bx, by);
     const dx = Math.abs(bx - ax);
@@ -21,3 +22,21 @@ export function* line(ax, ay, bx, by) {
         }
     }
 }
+/**
+ * Version of {@link line} yielding only coordinates in rect defined by
+ * `left,top`..`right,bottom`. Returns undefined if circle lies completely
+ * outside given clip rectangle.
+ *
+ * @param x1
+ * @param y1
+ * @param x2
+ * @param y2
+ * @param left
+ * @param top
+ * @param right
+ * @param bottom
+ */
+export const lineClipped = (x1, y1, x2, y2, left, top, right, bottom) => {
+    const res = liangBarsky(x1, y1, x2, y2, left, top, right, bottom);
+    return res ? line(res[0], res[1], res[2], res[3]) : undefined;
+};

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@thi.ng/grid-iterators",
-    "version": "2.0.4",
-    "description": "2D grid iterators w/ multiple orderings",
+    "version": "2.1.2",
+    "description": "2D grid and shape iterators w/ multiple orderings",
     "type": "module",
     "module": "./index.js",
     "typings": "./index.d.ts",
@@ -35,23 +35,28 @@
         "test": "testament test"
     },
     "dependencies": {
-        "@thi.ng/arrays": "^2.0.4",
-        "@thi.ng/binary": "^3.0.4",
-        "@thi.ng/morton": "^3.0.4",
-        "@thi.ng/random": "^3.1.0",
-        "@thi.ng/transducers": "^8.0.4"
+        "@thi.ng/api": "^8.2.0",
+        "@thi.ng/arrays": "^2.0.8",
+        "@thi.ng/binary": "^3.0.8",
+        "@thi.ng/bitfield": "^2.0.8",
+        "@thi.ng/morton": "^3.0.8",
+        "@thi.ng/random": "^3.1.4",
+        "@thi.ng/transducers": "^8.0.8"
     },
     "devDependencies": {
-        "@thi.ng/testament": "^0.1.4"
+        "@thi.ng/testament": "^0.1.6"
     },
     "keywords": [
         "2d",
         "binary",
         "circle",
+        "clipping",
         "diagonal",
+        "floodfill",
         "grid",
         "hilbert",
         "iterator",
+        "line",
         "morton",
         "random",
         "spiral",
@@ -76,6 +81,9 @@
         "./circle": {
             "import": "./circle.js"
         },
+        "./clipping": {
+            "import": "./clipping.js"
+        },
         "./column-ends": {
             "import": "./column-ends.js"
         },
@@ -88,6 +96,9 @@
         "./diagonal": {
             "import": "./diagonal.js"
         },
+        "./flood-fill": {
+            "import": "./flood-fill.js"
+        },
         "./hilbert": {
             "import": "./hilbert.js"
         },
@@ -128,9 +139,10 @@
     "thi.ng": {
         "related": [
             "morton",
+            "rasterize",
             "transducers"
         ],
         "year": 2019
     },
-    "gitHead": "9ff00a103f76cc4917ef3f244132e218f2300a05"
+    "gitHead": "5fe52419af63984ebe53032201b2a6174b9cb159"
 }

package/random.js

@@ -1,7 +1,7 @@
+import { asInt } from "@thi.ng/api/typedarray";
 import { shuffle } from "@thi.ng/arrays/shuffle";
 import { SYSTEM } from "@thi.ng/random/system";
 import { range } from "@thi.ng/transducers/range";
-import { asInt } from "./utils.js";
 /**
  * Yields 2D grid coordinates in random order w/ support for optional
  * {@link @thi.ng/random#IRandom} implementation (default:

package/row-ends.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Filtered version of {@link rows2d}, only including end points of
  * each row.

package/spiral.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Yields sequence of 2D grid coordinates in outward spiral order
  * starting from the center, given `cols` and `rows`.

package/utils.d.ts

@@ -6,6 +6,4 @@
  * @internal
  */
 export declare const swapxy: (p: number[]) => number[];
-/** @internal */
-export declare const asInt: (...args: number[]) => number[];
 //# sourceMappingURL=utils.d.ts.map

package/utils.js

@@ -12,5 +12,3 @@ export const swapxy = (p) => {
     p[1] = t;
     return p;
 };
-/** @internal */
-export const asInt = (...args) => args.map((x) => x | 0);

package/zcurve.js

@@ -1,6 +1,6 @@
+import { asInt } from "@thi.ng/api/typedarray";
 import { ceilPow2 } from "@thi.ng/binary/pow";
 import { demux2 } from "@thi.ng/morton/mux";
-import { asInt } from "./utils.js";
 /**
  * Yields 2D grid coordinates in Z-curve (Morton) order. A perfect
  * Z-curve is only generated if `cols` AND `rows` are equal and a power

package/zigzag-columns.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Yields sequence of 2D grid coordinates in zigzag column order
  * starting from [0,0], given `cols` and `rows`.

package/zigzag-diagonal.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Similar to {@link diagonal2d}, but yields 2D grid coordinates in zigzag
  * diagonal order starting at [0,0] and using given `cols` and `rows`.

package/zigzag-rows.js

@@ -1,4 +1,4 @@
-import { asInt } from "./utils.js";
+import { asInt } from "@thi.ng/api/typedarray";
 /**
  * Yields sequence of 2D grid coordinates in zigzag row order starting
  * from [0,0], given `cols` and `rows`.