@thi.ng/imgui 2.2.59 → 2.2.60

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-05-08T18:24:32Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,13 @@ 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.
 
+### [2.2.60](https://github.com/thi-ng/umbrella/tree/@thi.ng/imgui@2.2.60) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- update geom deps, update imports ([afd0b8b](https://github.com/thi-ng/umbrella/commit/afd0b8b))
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+
 ### [2.2.55](https://github.com/thi-ng/umbrella/tree/@thi.ng/imgui@2.2.55) (2024-04-20)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -261,16 +261,14 @@ Browser ESM import:
 
 [JSDelivr documentation](https://www.jsdelivr.com/)
 
-Package sizes (brotli'd, pre-treeshake): ESM: 6.65 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 6.67 KB
 
 ## Dependencies
 
 - [@thi.ng/api](https://github.com/thi-ng/umbrella/tree/develop/packages/api)
 - [@thi.ng/checks](https://github.com/thi-ng/umbrella/tree/develop/packages/checks)
 - [@thi.ng/geom](https://github.com/thi-ng/umbrella/tree/develop/packages/geom)
-- [@thi.ng/geom-api](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-api)
 - [@thi.ng/geom-isec](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-isec)
-- [@thi.ng/geom-tessellate](https://github.com/thi-ng/umbrella/tree/develop/packages/geom-tessellate)
 - [@thi.ng/layout](https://github.com/thi-ng/umbrella/tree/develop/packages/layout)
 - [@thi.ng/math](https://github.com/thi-ng/umbrella/tree/develop/packages/math)
 - [@thi.ng/transducers](https://github.com/thi-ng/umbrella/tree/develop/packages/transducers)

package/behaviors/button.d.ts

@@ -1,4 +1,4 @@
-import type { IShape } from "@thi.ng/geom-api";
+import type { IShape } from "@thi.ng/geom";
 import type { IMGUI } from "../gui.js";
 export declare const hoverButton: (gui: IMGUI, id: string, shape: IShape, info?: string) => boolean;
 export declare const handleButtonKeys: (gui: IMGUI) => true | undefined;

package/behaviors/slider.d.ts

@@ -1,5 +1,5 @@
 import type { FnN4 } from "@thi.ng/api";
-import type { IShape } from "@thi.ng/geom-api";
+import type { IShape } from "@thi.ng/geom";
 import type { Vec } from "@thi.ng/vectors";
 import type { IMGUI } from "../gui.js";
 export declare const isHoverSlider: (gui: IMGUI, id: string, shape: IShape, cursor?: string) => boolean;

package/behaviors/text.js

@@ -1,22 +1,22 @@
 import { clamp0 } from "@thi.ng/math/interval";
 import { Key } from "../api.js";
 const WS = /\s/;
-const nextNonAlpha = (src, i) => {
+const __nextNonAlpha = (src, i) => {
   const n = src.length;
   while (i < n && WS.test(src[i])) i++;
   for (; i < n && !WS.test(src[i]); i++) {
   }
   return i;
 };
-const prevNonAlpha = (src, i) => {
+const __prevNonAlpha = (src, i) => {
   while (i > 0 && WS.test(src[i])) i--;
   for (; i > 0 && !WS.test(src[i]); i--) {
   }
   return i;
 };
-const getNext = (gui, txt, cursor, dir) => {
+const __getNext = (gui, txt, cursor, dir) => {
   cursor += dir;
-  return gui.isAltDown() ? (dir < 0 ? prevNonAlpha : nextNonAlpha)(txt, cursor) : cursor;
+  return gui.isAltDown() ? (dir < 0 ? __prevNonAlpha : __nextNonAlpha)(txt, cursor) : cursor;
 };
 const handleTextfieldKeys = (gui, state, filter, txt, cursor, drawCursor, maxLen) => {
   const txtLen = txt.length;
@@ -42,26 +42,26 @@ const handleTextfieldKeys = (gui, state, filter, txt, cursor, drawCursor, maxLen
       return txt;
     case Key.BACKSPACE:
       if (cursor > 0) {
-        const next = getNext(gui, txt, cursor, -1);
+        const next = __getNext(gui, txt, cursor, -1);
         move(next, next - cursor);
         return txt.substring(0, next) + txt.substring(cursor);
       }
       break;
     case Key.DELETE:
       if (cursor < txtLen) {
-        const next = getNext(gui, txt, cursor, 1);
+        const next = __getNext(gui, txt, cursor, 1);
         return txt.substring(0, cursor) + txt.substring(next + 1);
       }
       break;
     case Key.LEFT:
       if (cursor > 0) {
-        const next = getNext(gui, txt, cursor, -1);
+        const next = __getNext(gui, txt, cursor, -1);
         move(next, next - cursor);
       }
       break;
     case Key.RIGHT:
       if (cursor < txtLen) {
-        const next = getNext(gui, txt, cursor, 1);
+        const next = __getNext(gui, txt, cursor, 1);
         move(next, next - cursor);
       }
       break;

package/components/button.d.ts

@@ -1,4 +1,4 @@
-import type { IShape } from "@thi.ng/geom-api";
+import type { IShape } from "@thi.ng/geom";
 import type { IGridLayout, LayoutBox } from "@thi.ng/layout";
 import type { Hash } from "../api.js";
 import type { IMGUI } from "../gui.js";

package/components/button.js

@@ -5,7 +5,7 @@ import { handleButtonKeys, hoverButton } from "../behaviors/button.js";
 import { labelHash } from "../hash.js";
 import { layoutBox } from "../layout.js";
 import { textLabelRaw, textTransformH, textTransformV } from "./textlabel.js";
-const mkLabel = (gui, tx, id, key, x, y, w, h, hover, label) => gui.resource(
+const __mkLabel = (gui, tx, id, key, x, y, w, h, hover, label) => gui.resource(
   id,
   labelHash(key, label, gui.disabled),
   () => textLabelRaw(
@@ -25,10 +25,10 @@ const buttonH = (gui, layout, id, label, labelHover = label, info) => {
     id,
     gui.resource(id, key, () => rect([x, y], [w, h])),
     key,
-    label ? mkLabel(gui, textTransformH, id, key, x, y, w, h, false, label) : void 0,
+    label ? __mkLabel(gui, textTransformH, id, key, x, y, w, h, false, label) : void 0,
     labelHover ? (
       // prettier-ignore
-      mkLabel(gui, textTransformH, id, key, x, y, w, h, true, labelHover)
+      __mkLabel(gui, textTransformH, id, key, x, y, w, h, true, labelHover)
     ) : void 0,
     info
   );
@@ -41,10 +41,10 @@ const buttonV = (gui, layout, id, rows, label, labelHover = label, info) => {
     id,
     gui.resource(id, key, () => rect([x, y], [w, h])),
     key,
-    label ? mkLabel(gui, textTransformV, id, key, x, y, w, h, false, label) : void 0,
+    label ? __mkLabel(gui, textTransformV, id, key, x, y, w, h, false, label) : void 0,
     labelHover ? (
       // prettier-ignore
-      mkLabel(gui, textTransformV, id, key, x, y, w, h, true, labelHover)
+      __mkLabel(gui, textTransformV, id, key, x, y, w, h, true, labelHover)
     ) : void 0,
     info
   );

package/components/dropdown.js

@@ -18,7 +18,7 @@ const dropdown = (gui, layout, id, sel, items, title, info) => {
   if (open) {
     const bt = buttonH(gui, box, `${id}-title`, title);
     draw && gui.add(
-      gui.resource(id, key + 1, () => triangle(gui, tx, ty, true))
+      gui.resource(id, key + 1, () => __triangle(gui, tx, ty, true))
     );
     if (bt) {
       gui.setState(id, false);
@@ -35,9 +35,9 @@ const dropdown = (gui, layout, id, sel, items, title, info) => {
             gui.setState(id, false);
             break;
           case Key.UP:
-            return update(gui, id, clamp0(sel - 1));
+            return __update(gui, id, clamp0(sel - 1));
           case Key.DOWN:
-            return update(
+            return __update(
               gui,
               id,
               Math.min(items.length - 1, sel + 1)
@@ -51,16 +51,16 @@ const dropdown = (gui, layout, id, sel, items, title, info) => {
       gui.setState(id, true);
     }
     draw && gui.add(
-      gui.resource(id, key + 2, () => triangle(gui, tx, ty, false))
+      gui.resource(id, key + 2, () => __triangle(gui, tx, ty, false))
     );
   }
   return res;
 };
-const update = (gui, id, next) => {
+const __update = (gui, id, next) => {
   gui.focusID = `${id}-${next}`;
   return next;
 };
-const triangle = (gui, x, y, open) => {
+const __triangle = (gui, x, y, open) => {
   const s = open ? 2 : -2;
   return polygon(
     [

package/components/radial-menu.js

@@ -1,8 +1,10 @@
-import { triFan } from "@thi.ng/geom-tessellate/tri-fan";
+import {
+  TESSELLATE_TRI_FAN,
+  groupFromTessellation,
+  tessellate
+} from "@thi.ng/geom";
 import { centroid } from "@thi.ng/geom/centroid";
 import { circle } from "@thi.ng/geom/circle";
-import { polygon } from "@thi.ng/geom/polygon";
-import { vertices } from "@thi.ng/geom/vertices";
 import { mod } from "@thi.ng/math/prec";
 import { mapIndexed } from "@thi.ng/transducers/map-indexed";
 import { add2 } from "@thi.ng/vectors/add";
@@ -15,8 +17,7 @@ const radialMenu = (gui, id, x, y, r, items, info) => {
   const key = hash([x, y, r, n, ~~gui.disabled]);
   gui.registerID(id, key);
   const cells = gui.resource(id, key, () => [
-    ...mapIndexed((i, pts) => {
-      const cell = polygon(pts);
+    ...mapIndexed((i, cell) => {
       const p = add2(
         null,
         [-gui.textWidth(items[i]) >> 1, gui.theme.baseLine],
@@ -28,7 +29,7 @@ const radialMenu = (gui, id, x, y, r, items, info) => {
         textLabelRaw(p, gui.textColor(false), items[i]),
         textLabelRaw(p, gui.textColor(true), items[i])
       ];
-    }, triFan(vertices(circle([x, y], r), n)))
+    }, groupFromTessellation(tessellate(circle([x, y], r, { __samples: n }), [TESSELLATE_TRI_FAN])))
   ]);
   let res;
   let sel = -1;

package/components/ring.js

@@ -12,8 +12,8 @@ import { dialVal } from "../behaviors/dial.js";
 import { handleSlider1Keys } from "../behaviors/slider.js";
 import { dialValueLabel } from "./textlabel.js";
 import { tooltipRaw } from "./tooltip.js";
-const ringHeight = (w, thetaGap) => w / 2 * (1 + Math.sin(HALF_PI + thetaGap / 2));
-const arcVerts = (o, r, start, end, thetaRes = 12) => r > 1 ? map(
+const __ringHeight = (w, thetaGap) => w / 2 * (1 + Math.sin(HALF_PI + thetaGap / 2));
+const __arcVerts = (o, r, start, end, thetaRes = 12) => r > 1 ? map(
   (t) => cartesian2(null, [r, mix(start, end, t)], o),
   normRange(
     Math.max(1, Math.abs(end - start) / (PI / thetaRes)) | 0
@@ -23,10 +23,10 @@ const ring = (gui, layout, id, min, max, prec, val, thetaGap, rscale, label, fmt
   let h;
   let box;
   if (isLayout(layout)) {
-    h = ringHeight(layout.cellW, thetaGap);
+    h = __ringHeight(layout.cellW, thetaGap);
     box = layout.next([1, layout.rowsForHeight(h) + 1]);
   } else {
-    h = ringHeight(layout.cw, thetaGap);
+    h = __ringHeight(layout.cw, thetaGap);
     box = layout;
   }
   return ringRaw(
@@ -53,7 +53,7 @@ const ringGroup = (gui, layout, id, min, max, prec, horizontal, thetaGap, rscale
   const n = vals.length;
   const nested = horizontal ? layout.nest(n, [n, 1]) : layout.nest(1, [
     1,
-    (layout.rowsForHeight(ringHeight(layout.cellW, thetaGap)) + 1) * n
+    (layout.rowsForHeight(__ringHeight(layout.cellW, thetaGap)) + 1) * n
   ]);
   let res;
   let idx = -1;
@@ -107,8 +107,8 @@ const ringRaw = (gui, id, x, y, w, h, min, max, prec, val, thetaGap, rscale, lx,
     const numV = fitClamped(r, 15, 80, 12, 30);
     const shape = (max2) => () => polygon(
       [
-        ...arcVerts(pos, r, startTheta, max2, numV),
-        ...arcVerts(pos, r2, max2, startTheta, numV)
+        ...__arcVerts(pos, r, startTheta, max2, numV),
+        ...__arcVerts(pos, r2, max2, startTheta, numV)
       ],
       {}
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/imgui",
-  "version": "2.2.59",
+  "version": "2.2.60",
   "description": "Immediate mode GUI with flexible state handling & data only shape output",
   "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/imgui#readme",
+  "homepage": "https://thi.ng/imgui",
   "funding": [
     {
       "type": "github",
@@ -36,22 +36,20 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.2",
-    "@thi.ng/checks": "^3.6.4",
-    "@thi.ng/geom": "^7.0.1",
-    "@thi.ng/geom-api": "^4.0.10",
-    "@thi.ng/geom-isec": "^3.1.0",
-    "@thi.ng/geom-tessellate": "^2.1.132",
-    "@thi.ng/layout": "^3.0.39",
-    "@thi.ng/math": "^5.10.13",
-    "@thi.ng/transducers": "^9.0.5",
-    "@thi.ng/vectors": "^7.10.31"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/geom": "^8.0.0",
+    "@thi.ng/geom-isec": "^4.0.0",
+    "@thi.ng/layout": "^3.0.40",
+    "@thi.ng/math": "^5.11.0",
+    "@thi.ng/transducers": "^9.0.6",
+    "@thi.ng/vectors": "^7.11.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.2",
-    "esbuild": "^0.21.1",
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
     "typedoc": "^0.25.13",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "browser",
@@ -158,5 +156,5 @@
     ],
     "year": 2019
   },
-  "gitHead": "41bd769068da804eeace622ec7db50e4d48f1dc9\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }