@johnmorrisdotca/dougu-sports 0.27.0 → 0.28.0

package/dist/emblems/lathe.extras.js

@@ -9,7 +9,7 @@ const pt = (x, y) => `${f(x)} ${f(y)}`;
 export function LATHE_EXTRAS(c, d) {
     const { p, solid, yaw, where, at } = c;
     if (d[0] === "mesh") {
-        const [, y0, y1, n, rows] = d;
+        const [, y0, y1, n, rows, name, width = 0.55] = d;
         let m = "";
         for (let i = 0; i < n; i++) {
             for (const way of [1, -1]) {
@@ -27,7 +27,13 @@ export function LATHE_EXTRAS(c, d) {
                 }
             }
         }
-        return m === "" ? "" : `<path d="${m}" stroke="${mix(c.base.rgb, 0.55)}" stroke-width=".55" stroke-opacity=".9"/>`;
+        if (m === "")
+            return "";
+        if (name === undefined)
+            return `<path d="${m}" stroke="${mix(c.base.rgb, 0.55)}" stroke-width=".55" stroke-opacity=".9"/>`;
+        // An etched net in a tone of its own: a dark line, then the tone laid on it a little to the side.
+        const t = c.tone(name);
+        return `<path d="${m}" transform="translate(.2 .25)" stroke="${mix(c.base.rgb, -0.6)}" stroke-width="${width}" stroke-opacity=".4"/><path d="${m}" stroke="${mix(t.rgb, 0.05)}" stroke-width="${width}"/>`;
     }
     if (d[0] === "patch") {
         const [, y0, y1, deg0, deg1, name] = d;
@@ -57,3 +63,72 @@ export function LATHE_EXTRAS(c, d) {
     };
     return `<path d="M${lerp(y0, u0)}L${lerp(y0, u1)}L${lerp(y1, u1)}L${lerp(y1, u0)}z" fill="${t.fill}" stroke="${t.edge}" stroke-width=".5"/>`;
 }
+const rotate = (v, lz, lx, yaw) => {
+    const [x0, y0, z0] = v;
+    const x1 = x0 * Math.cos(lz) - y0 * Math.sin(lz);
+    const y1 = x0 * Math.sin(lz) + y0 * Math.cos(lz);
+    const y2 = y1 * Math.cos(lx) - z0 * Math.sin(lx);
+    const z2 = y1 * Math.sin(lx) + z0 * Math.cos(lx);
+    return [x1 * Math.cos(yaw) + z2 * Math.sin(yaw), y2, -x1 * Math.sin(yaw) + z2 * Math.cos(yaw)];
+};
+/** The great circles of a basketball's seams, by their normals: the equator, the meridian, and the two curved seams that run from pole to pole at 60 degrees either side of it. */
+const SEAMS = [[0, 1, 0], [1, 0, 0], [Math.cos(Math.PI / 3), 0, -Math.sin(Math.PI / 3)], [Math.cos(Math.PI / 3), 0, Math.sin(Math.PI / 3)]];
+/** Draws the seams of a basketball as grooves (each the front half of a great circle: one elliptical arc), and the specks of a grained finish. */
+export function LATHE_BALL(c) {
+    const { ball, cx, cy } = c;
+    const r = ball.r;
+    const lz = ((ball.lean?.[0] ?? 0) * Math.PI) / 180;
+    const lx = ((ball.lean?.[1] ?? 0) * Math.PI) / 180;
+    const yaw = (c.yaw * Math.PI) / 180;
+    const e = (c.elevation * Math.PI) / 180;
+    const se = Math.sin(e);
+    const ce = Math.cos(e);
+    const view = [0, se, ce];
+    const screen = (v) => [v[0], -v[1] * ce + v[2] * se];
+    const t = c.tone(ball.tone);
+    let m = "";
+    for (const n0 of SEAMS) {
+        const n = rotate(n0, lz, lx, yaw);
+        const facing = n[0] * view[0] + n[1] * view[1] + n[2] * view[2];
+        const limb = [n[1] * view[2] - n[2] * view[1], n[2] * view[0] - n[0] * view[2], n[0] * view[1] - n[1] * view[0]];
+        const size = Math.hypot(...limb);
+        if (size < 0.02)
+            continue;
+        const a = screen([limb[0] / size, limb[1] / size, limb[2] / size]);
+        const near = [view[0] - facing * n[0], view[1] - facing * n[1], view[2] - facing * n[2]];
+        const k = Math.hypot(...near);
+        const mid = screen([near[0] / k, near[1] / k, near[2] / k]);
+        const sweep = a[0] * mid[1] - a[1] * mid[0] > 0 ? 1 : 0;
+        const angle = (Math.atan2(a[1], a[0]) * 180) / Math.PI;
+        m += `M${pt(cx + r * a[0], cy + r * a[1])}A${f(r)} ${f(Math.max(0.05, r * Math.abs(facing)))} ${f(angle)} 0 ${sweep} ${pt(cx - r * a[0], cy - r * a[1])}`;
+    }
+    let out = "";
+    if (m !== "") {
+        if (c.line)
+            out += `<path d="${m}" stroke-width="1.4"/>`;
+        else if (c.flat)
+            out += `<path d="${m}" stroke="${mix(t.rgb, -0.4)}" stroke-width="1"/>`;
+        else {
+            const inlay = ball.seam === undefined ? undefined : c.tone(ball.seam);
+            out += `<path d="${m}" stroke="${mix(t.rgb, -0.5)}" stroke-width="${inlay === undefined ? 0.75 : 0.85}"/>`;
+            out += inlay === undefined ? `<path d="${m}" transform="translate(.35 .4)" stroke="${mix(t.rgb, 0.55)}" stroke-width=".3" stroke-opacity=".8"/>` : `<path d="${m}" stroke="${mix(inlay.rgb, 0.1)}" stroke-width=".42"/>`;
+        }
+    }
+    const grain = ball.grain ?? 0;
+    if (grain > 0 && !c.line) {
+        let dots = "";
+        for (let i = 0; i < grain; i++) {
+            const y = 1 - (2 * (i + 0.5)) / grain;
+            const ring = Math.sqrt(1 - y * y);
+            const theta = i * 2.39996;
+            const p = rotate([ring * Math.cos(theta), y, ring * Math.sin(theta)], lz, lx, yaw);
+            if (p[0] * view[0] + p[1] * view[1] + p[2] * view[2] < 0.12)
+                continue;
+            const [sx, sy] = screen(p);
+            dots += `M${pt(cx + r * sx, cy + r * sy)}h0`;
+        }
+        if (dots !== "")
+            out += `<path d="${dots}" stroke="${mix(t.rgb, -0.5)}" stroke-width=".36" stroke-opacity=".6"/>`;
+    }
+    return out;
+}

package/dist/emblems/lathe.framed.d.ts

@@ -0,0 +1,30 @@
+import { type Rgb } from "./emblem.core.ts";
+import type { FramedCtx } from "./emblem.lathe.ts";
+/** A point or a direction: x to the right, y down, z toward the eye at rest, in the lathe's units about the axis x = 0 (drawn at x = 32). */
+export type V3 = readonly [x: number, y: number, z: number];
+/** The turn and the eye of a drawing: rotate a point about the axis, place it on the page, and say how near the eye it is and whether a direction faces the eye. */
+export declare function viewOf(c: Pick<FramedCtx, "yaw" | "s">): {
+    rot: (v: V3) => V3;
+    at: (r: V3) => readonly [number, number];
+    depth: (r: V3) => number;
+    facing: (n: V3) => number;
+};
+export declare const sub: (a: V3, b: V3) => V3;
+export declare const cross: (a: V3, b: V3) => V3;
+export declare const unit: (a: V3) => V3;
+/** The normal of a facet from its first, middle and last points (a quadrilateral's diagonals). */
+export declare const normalOf: (p: readonly V3[]) => V3;
+/**
+ * How light polished metal is where a facet faces some way: -1 (black) to 1 (white), for a rotated, unit normal and the elevation of the eye `s`. Two sided, because a thin sheet is seen from either side. A polished
+ * surface shows what it mirrors, so the shade is read off a small room: a bright sky above, a dark band at the horizon, a mid floor and a bright window to the upper left. A facet that turns from the sky to the floor
+ * as a band twists runs from white through black to grey, the way chrome does.
+ */
+export declare function chrome(n: V3, s: number): number;
+/** A colour for a shade from `chrome`, kept to a few steps so that neighbouring facets that differ by a hair are one colour. */
+export declare const shadeOf: (rgb: Rgb, v: number, steps?: number) => string;
+/** A smooth curve through a table of `[x, y]` points that never overshoots them (monotone cubic), as a function of x; outside the table it holds the end values. */
+export declare function curve(table: readonly (readonly [number, number])[]): (x: number) => number;
+/** A straight-line table: the value at x between the two points either side of it. */
+export declare function lin(table: readonly (readonly [number, number])[]): (x: number) => number;
+/** The points as a path: a closed polygon, or an open line. */
+export declare const line: (pts: readonly (readonly [number, number])[], closed: boolean, digits?: 1 | 2) => string;

package/dist/emblems/lathe.framed.js

@@ -0,0 +1,98 @@
+// The small 3D that a body of revolution's own `framed` drawer use (`FramedCtx` in emblem.lathe.ts): a point turned by the yaw and placed the way the body's surface is placed, a polished-metal shade for a facet from the way it
+// faces, a smooth curve through a table of measurements, and the paths of polygons. Nothing here knows any one emblem; a body with no framed parts does not take this module. Imports only the core.
+import { mix } from "./emblem.core.js";
+const RAD = Math.PI / 180;
+const one = (n) => String(Math.round(n * 10) / 10 + 0);
+const two = (n) => String(Math.round(n * 100) / 100 + 0);
+/** The turn and the eye of a drawing: rotate a point about the axis, place it on the page, and say how near the eye it is and whether a direction faces the eye. */
+export function viewOf(c) {
+    const cy = Math.cos(c.yaw * RAD);
+    const sy = Math.sin(c.yaw * RAD);
+    const ce = Math.sqrt(1 - c.s * c.s);
+    return {
+        rot: (v) => [v[0] * cy + v[2] * sy, v[1], v[2] * cy - v[0] * sy],
+        at: (r) => [32 + r[0], r[1] + c.s * r[2]],
+        depth: (r) => r[2] * ce - r[1] * c.s,
+        facing: (n) => n[2] * ce - n[1] * c.s,
+    };
+}
+export const sub = (a, b) => [a[0] - b[0], a[1] - b[1], a[2] - b[2]];
+export const cross = (a, b) => [a[1] * b[2] - a[2] * b[1], a[2] * b[0] - a[0] * b[2], a[0] * b[1] - a[1] * b[0]];
+export const unit = (a) => {
+    const m = Math.hypot(a[0], a[1], a[2]) || 1;
+    return [a[0] / m, a[1] / m, a[2] / m];
+};
+/** The normal of a facet from its first, middle and last points (a quadrilateral's diagonals). */
+export const normalOf = (p) => unit(cross(sub(p[2], p[0]), sub(p[p.length - 1], p[1])));
+const smooth = (x, a, b) => {
+    const t = Math.max(0, Math.min(1, (x - a) / (b - a)));
+    return t * t * (3 - 2 * t);
+};
+/**
+ * How light polished metal is where a facet faces some way: -1 (black) to 1 (white), for a rotated, unit normal and the elevation of the eye `s`. Two sided, because a thin sheet is seen from either side. A polished
+ * surface shows what it mirrors, so the shade is read off a small room: a bright sky above, a dark band at the horizon, a mid floor and a bright window to the upper left. A facet that turns from the sky to the floor
+ * as a band twists runs from white through black to grey, the way chrome does.
+ */
+export function chrome(n, s) {
+    const ce = Math.sqrt(1 - s * s);
+    const eye = [0, -s, ce];
+    let m = n;
+    let d = m[0] * eye[0] + m[1] * eye[1] + m[2] * eye[2];
+    if (d < 0) {
+        m = [-m[0], -m[1], -m[2]];
+        d = -d;
+    }
+    const r = [2 * d * m[0] - eye[0], 2 * d * m[1] - eye[1], 2 * d * m[2] - eye[2]];
+    const up = -r[1];
+    const window = r[2] > 0 ? Math.exp(-(((r[0] + 0.5) / 0.34) ** 2 + ((up - 0.4) / 0.3) ** 2)) : 0;
+    const v = -0.12 + 0.95 * smooth(up, -0.12, 0.4) - 0.6 * Math.exp(-(((up + 0.02) / 0.14) ** 2)) + 0.75 * window;
+    return Math.max(-0.72, Math.min(0.9, v));
+}
+/** A colour for a shade from `chrome`, kept to a few steps so that neighbouring facets that differ by a hair are one colour. */
+export const shadeOf = (rgb, v, steps = 24) => mix(rgb, Math.round(v * steps) / steps);
+/** A smooth curve through a table of `[x, y]` points that never overshoots them (monotone cubic), as a function of x; outside the table it holds the end values. */
+export function curve(table) {
+    const n = table.length;
+    const dx = table.slice(1).map((p, i) => p[0] - table[i][0]);
+    const dy = table.slice(1).map((p, i) => p[1] - table[i][1]);
+    const m = dy.map((d, i) => d / dx[i]);
+    const t = table.map((_, i) => (i === 0 ? m[0] : i === n - 1 ? m[n - 2] : m[i - 1] * m[i] <= 0 ? 0 : (2 * m[i - 1] * m[i]) / (m[i - 1] + m[i])));
+    return (x) => {
+        const first = table[0];
+        const last = table[n - 1];
+        if (x <= first[0])
+            return first[1];
+        if (x >= last[0])
+            return last[1];
+        let i = 0;
+        while (x > table[i + 1][0])
+            i++;
+        const a = table[i];
+        const w = dx[i];
+        const u = (x - a[0]) / w;
+        const u2 = u * u;
+        const u3 = u2 * u;
+        return (2 * u3 - 3 * u2 + 1) * a[1] + (u3 - 2 * u2 + u) * w * t[i] + (-2 * u3 + 3 * u2) * table[i + 1][1] + (u3 - u2) * w * t[i + 1];
+    };
+}
+/** A straight-line table: the value at x between the two points either side of it. */
+export function lin(table) {
+    return (x) => {
+        const first = table[0];
+        if (x <= first[0])
+            return first[1];
+        for (let i = 1; i < table.length; i++) {
+            const b = table[i];
+            if (x <= b[0]) {
+                const a = table[i - 1];
+                return a[1] + ((b[1] - a[1]) * (x - a[0])) / (b[0] - a[0]);
+            }
+        }
+        return table[table.length - 1][1];
+    };
+}
+/** The points as a path: a closed polygon, or an open line. */
+export const line = (pts, closed, digits = 1) => {
+    const w = digits === 1 ? one : two;
+    return `M${pts.map((p) => `${w(p[0])} ${w(p[1])}`).join("L")}${closed ? "z" : ""}`;
+};

package/dist/emblems/lathe.sculpt.js

@@ -3,6 +3,7 @@
 // as a solid edge, widest when it is edge on. A ribbon is a centre line with a width that turns about it, drawn as a strip of shaded quadrilaterals. A model that wants them sets `sculptor: LATHE_SCULPT`;
 // one that does not never imports this file, so its bundle carries none of the code. Plain SVG.
 import { mix } from "./emblem.core.js";
+import { engravingInk, sideText } from "./emblem.engrave.js";
 const CX = 32;
 const RAD = Math.PI / 180;
 const f = (n) => String(Math.round(n * 10) / 10 + 0);
@@ -55,8 +56,9 @@ function polys(d) {
         }
         else if (cmd === "Q") {
             const [x1, y1, x2, y2] = [num(), num(), num(), num()];
-            for (let k = 1; k <= 4; k++) {
-                const u = k / 4;
+            const qn = Math.max(2, Math.min(5, Math.ceil(Math.hypot(x2 - x, y2 - y) / 3.4)));
+            for (let k = 1; k <= qn; k++) {
+                const u = k / qn;
                 cur.push([(1 - u) ** 2 * x + 2 * (1 - u) * u * x1 + u * u * x2, (1 - u) ** 2 * y + 2 * (1 - u) * u * y1 + u * u * y2]);
             }
             x = x2;
@@ -64,8 +66,9 @@ function polys(d) {
         }
         else if (cmd === "C") {
             const [x1, y1, x2, y2, x3, y3] = [num(), num(), num(), num(), num(), num()];
-            for (let k = 1; k <= 5; k++) {
-                const u = k / 5;
+            const cn = Math.max(2, Math.min(6, Math.ceil(Math.hypot(x3 - x, y3 - y) / 3.3)));
+            for (let k = 1; k <= cn; k++) {
+                const u = k / cn;
                 const a = (1 - u) ** 3;
                 const b = 3 * (1 - u) ** 2 * u;
                 const c = 3 * (1 - u) * u * u;
@@ -84,8 +87,8 @@ function polys(d) {
     CACHE.set(d, out);
     return out;
 }
-function drawCut(c, stand) {
-    const { cut, ax, az, dy } = stand;
+function drawCut(c, stands) {
+    const { cut, ax, az, dy } = stands[0];
     const { yaw, s, tone, line, flat } = c;
     const th = yaw * RAD;
     const phi = ((cut.rot ?? 0) + yaw) * RAD;
@@ -93,24 +96,30 @@ function drawCut(c, stand) {
     const sinP = Math.sin(phi);
     const A = ax * Math.cos(th) + az * Math.sin(th);
     const B = az * Math.cos(th) - ax * Math.sin(th);
-    if (cut.decal === true && cosP <= 0.03)
+    if ((cut.decal === true && cosP <= 0.03) || (line && cut.fine === true))
         return undefined;
     const t = cut.t ?? 1;
     const sign = cosP >= 0 ? 1 : -1;
-    const at = (px, py, d) => `${f(CX + A + (px - CX) * cosP + d * sinP)} ${f(py + dy + s * (B - (px - CX) * sinP + d * cosP))}`;
     const path = (d, depth) => {
         let out = "";
-        for (const poly of polys(d))
-            out += `M${poly.map(([px, py]) => at(px, py, depth)).join("L")}Z`;
+        for (const st of stands) {
+            const sa = st.ax * Math.cos(th) + st.az * Math.sin(th);
+            const sb = st.az * Math.cos(th) - st.ax * Math.sin(th);
+            for (const poly of polys(d))
+                out += `M${poly.map(([px, py]) => `${f(CX + sa + (px - CX) * cosP + depth * sinP)} ${f(py + st.dy + s * (sb - (px - CX) * sinP + depth * cosP))}`).join("L")}Z`;
+        }
         return out;
     };
     const near = (sign * t) / 2;
-    const first = cut.layers[0];
+    const first = cut.layers[0] ?? ["main", ""];
     const base = tone(first[0]);
     let svg = "";
     const reach = t * Math.hypot(sinP, s * cosP);
     const glass = first[2] === "gl";
-    if (line) {
+    if (first[1] === "") {
+        // A text only: nothing is drawn but the engraving.
+    }
+    else if (line) {
         if (reach > 1.3 && Math.abs(sinP) > 0.3)
             svg += `<path d="${path(first[1], -near)}" stroke-opacity=".6"/>`;
     }
@@ -131,7 +140,7 @@ function drawCut(c, stand) {
     for (const [name, d, mode] of cut.layers) {
         const q = tone(name);
         if (line) {
-            if (mode === undefined || mode === "gl" || mode === "rf")
+            if (mode === undefined || mode === "gl" || mode === "rf" || mode === "fl")
                 svg += `<path d="${path(d, near)}"/>`;
             else if (mode === "ln")
                 svg += `<path d="${path(d, near)}" stroke-width="1.1"/>`;
@@ -139,7 +148,7 @@ function drawCut(c, stand) {
         }
         const p = path(d, near);
         if (mode === undefined)
-            svg += `<path d="${p}" fill="${q.fill}" stroke="${q.edge}"/>`;
+            svg += `<path d="${p}" fill="${q.fill}" stroke="${q.edge}" stroke-width=".3"/>`;
         else if (mode === "dk")
             svg += `<path d="${p}" fill="${mix(q.rgb, -0.55)}" fill-opacity=".5" stroke="none"/>`;
         else if (mode === "lt")
@@ -148,13 +157,21 @@ function drawCut(c, stand) {
             svg += `<path d="${p}" stroke="${q.edge}" stroke-width=".5"/>`;
         else if (mode === "gl")
             svg += `<path d="${p}" fill="${mix(q.rgb, 0.35)}" fill-opacity=".3" stroke="${q.edge}" stroke-width=".45"/>`;
+        else if (mode === "fl")
+            svg += `<path d="${p}" fill="${mix(q.rgb, 0.08)}" stroke="${q.edge}" stroke-width=".3"/>`;
         else if (mode === "rf")
-            svg += `<path d="${p}" fill="${q.fill}" fill-opacity=".8" stroke="${q.edge}" stroke-width=".4"/>`;
+            svg += `<path d="${p}" fill="${q.fill}" fill-opacity=".8" stroke="${q.edge}" stroke-width=".3"/>`;
         else
             svg += `<path d="${p}" fill="#fff" fill-opacity=".6" stroke="none"/>`;
     }
-    if (sign < 0 && !line)
+    if (sign < 0 && !line && first[1] !== "")
         svg += `<path d="${path(first[1], near)}" fill="#000" fill-opacity=".22" stroke="none"/>`;
+    if (cut.plate !== undefined && c.words !== "") {
+        const [x0, x1, y0, y1] = cut.plate;
+        const y = (y0 + y1) / 2;
+        const end = (px) => [CX + A + (px - CX) * cosP + near * sinP, y + dy + s * (B - (px - CX) * sinP + near * cosP)];
+        svg += sideText(c.words, x1 - x0, y1 - y0, engravingInk(line ? "line" : flat ? "color" : "metal", base.rgb), end(x0), end(x1), cosP);
+    }
     return { z: B, svg };
 }
 /** The convex hull of some points (Andrew's monotone chain), counter-clockwise. */
@@ -225,7 +242,7 @@ function drawRibbon(c, r) {
         const nz = -ty * wx;
         const nl = Math.hypot(nx, ny, nz) || 1;
         const lambert = Math.abs((nx * L[0] + ny * L[1] + nz * L[2]) / (nl * len));
-        const bucket = Math.round(Math.max(-0.5, Math.min(0.6, (lambert - 0.42) * 1.5)) * 8) / 8;
+        const bucket = Math.round(Math.max(-0.45, Math.min(0.5, (lambert - 0.45) * 1.1)) * 10) / 10;
         const colour = mix(base.rgb, bucket);
         quads.push({ z: (p.pz + q.pz) / 2, d: `M${pt(p.px - p.wx, p.py, p.pz - p.wz)}L${pt(p.px + p.wx, p.py, p.pz + p.wz)}L${pt(q.px + q.wx, q.py, q.pz + q.wz)}L${pt(q.px - q.wx, q.py, q.pz - q.wz)}Z`, colour });
     }
@@ -245,23 +262,59 @@ function drawRibbon(c, r) {
         svg += `<path d="${run}" fill="${colour}" stroke="${colour}" stroke-width=".3"/>`;
     return { z: turned.reduce((m, p) => m + p.pz, 0) / turned.length, svg };
 }
+function drawBlock(c, b) {
+    const { yaw, s, tone, line } = c;
+    const th = yaw * RAD;
+    const cos = Math.cos(th);
+    const sin = Math.sin(th);
+    const t = tone(b.tone);
+    const up = tone(b.top ?? b.tone);
+    const [x0, x1] = b.x;
+    const [y0, y1] = b.y;
+    const [z0, z1] = b.z;
+    const at = (x, y, z) => `${f(CX + x * cos + z * sin)} ${f(y + s * (z * cos - x * sin))}`;
+    let svg = "";
+    // The four sides, each by the way it faces: the ones that look toward the eye, lit from the left.
+    const faces = [
+        [0, 1, [x0, z1], [x1, z1]],
+        [1, 0, [x1, z1], [x1, z0]],
+        [0, -1, [x1, z0], [x0, z0]],
+        [-1, 0, [x0, z0], [x0, z1]],
+    ];
+    for (const [nx, nz, a, e] of faces) {
+        const facing = nz * cos - nx * sin;
+        if (facing <= 0.01)
+            continue;
+        const lit = -(nx * cos + nz * sin);
+        svg += `<path d="M${at(a[0], y0, a[1])}L${at(e[0], y0, e[1])}L${at(e[0], y1, e[1])}L${at(a[0], y1, a[1])}Z" fill="${line ? "none" : mix(t.rgb, 0.05 + 0.27 * lit)}" stroke="${line ? "currentColor" : t.edge}"/>`;
+    }
+    if (s > 0.02)
+        svg += `<path d="M${at(x0, y0, z0)}L${at(x1, y0, z0)}L${at(x1, y0, z1)}L${at(x0, y0, z1)}Z" fill="${line ? "none" : mix(up.rgb, 0.3)}" stroke="${line ? "currentColor" : b.rim === undefined ? up.edge : mix(tone(b.rim).rgb, 0.2)}"${b.rim === undefined || line ? "" : ' stroke-width=".8"'}/>`;
+    return svg;
+}
 /** Draws the parts of a model: the ones that are `under` the bodies, and the rest, each group from far to near. */
 export function LATHE_SCULPT(c, parts) {
     const under = [];
     const over = [];
+    const boxes = [];
     for (const part of parts) {
+        if (part.kind === "box") {
+            boxes.push(drawBlock(c, part));
+            continue;
+        }
         if (part.kind === "ribbon") {
             (part.under === true ? under : over).push(drawRibbon(c, part));
             continue;
         }
         const [x, z] = part.at ?? [0, 0];
         const stands = [{ cut: part, ax: x, az: z, dy: part.y ?? 0 }, ...(part.copies ?? []).map(([cx, cz, cy]) => ({ cut: part, ax: x + cx, az: z + cz, dy: (part.y ?? 0) + (cy ?? 0) }))];
-        for (const stand of stands) {
-            const made = drawCut(c, stand);
+        // The copies of a decal are one path (they lie on one face and cannot hide each other); those of a cut-out are drawn one by one, far to near.
+        for (const group of part.decal === true ? [stands] : stands.map((st) => [st])) {
+            const made = drawCut(c, group);
             if (made !== undefined)
                 (part.under === true ? under : over).push(made);
         }
     }
     const join = (list) => list.sort((a, b) => a.z - b.z).map((p) => p.svg).join("");
-    return { under: join(under), over: join(over) };
+    return { under: join(under), over: boxes.join("") + join(over) };
 }

package/dist/emblems/nba.parts.d.ts

@@ -0,0 +1,27 @@
+import type { Pt } from "./emblem.lathe.ts";
+/** The tones the NBA's postseason trophies share: the ball's silver (and the frosted silver of the earlier conference balls), the black of the rings and feet, and the pale gold of the etched net. */
+export declare const NBA_TONES: {
+    readonly silver: "#d3d8df";
+    readonly frost: "#e6e9ec";
+    readonly dark: "#16171b";
+    readonly etch: "#f0cf66";
+};
+/** The trumpet from its flange down to its foot, in the 64 unit box: the flange's rim is at 24.5 and the foot ends at 61.4. */
+export declare const TRUMPET: readonly Pt[];
+/** The ball's ring of the Western trophy: four bands that cross under the ball and rise round its lower half (the real ones are two rings). */
+export declare const WEST_BAND: readonly [readonly [0, 38.2], readonly [4.2, 37.6], readonly [8.4, 36.2], readonly [12, 33.6], readonly [14.6, 30.4], readonly [15.5, 28.8]];
+/** The Western base from the gold dome down: a black ring, a thin band, a flared black drum, a tall flared skirt and a black foot. In the earlier pair the thin band is black and the skirt polished silver. */
+export declare const westBase: (earlier: boolean) => readonly Pt[];
+/** The Eastern base from its plate down: a plate, three black tiers, a tall drum and a black foot. In the earlier pair the plate and the drum are polished silver. */
+export declare const eastBase: (earlier: boolean) => readonly Pt[];
+/** One of the three posts of the Eastern trophy and its stem and dish, as solids (the posts stand at 0, 120 and 240 degrees). */
+export declare const eastTop: () => ({
+    at: readonly [12.2, number];
+    p: readonly [readonly [33.4, 0.9, 1], readonly [40.6, 0.9, 1]];
+} | {
+    p: readonly [readonly [37.6, 1.2, 1], readonly [40.7, 1.4, 1]];
+    open?: undefined;
+} | {
+    open: boolean;
+    p: readonly [readonly [33.2, 10, 1], readonly [34, 9.7], readonly [36, 7.2], readonly [37.6, 3.2], readonly [38.2, 1.3, 1]];
+})[];

package/dist/emblems/nba.parts.js

@@ -0,0 +1,34 @@
+/** The tones the NBA's postseason trophies share: the ball's silver (and the frosted silver of the earlier conference balls), the black of the rings and feet, and the pale gold of the etched net. */
+export const NBA_TONES = { silver: "#d3d8df", frost: "#e6e9ec", dark: "#16171b", etch: "#f0cf66" };
+/** The trumpet from its flange down to its foot, in the 64 unit box: the flange's rim is at 24.5 and the foot ends at 61.4. */
+export const TRUMPET = [
+    [23, 10.3, 1], [23.2, 11.1], [24.3, 11.25, 1], [24.6, 11.2], [24.6, 9.95],
+    [26, 9.7], [28, 9.15], [30, 8.65], [32, 8.15], [34, 7.65], [36, 7.1], [38, 6.55], [40, 6.05], [42, 5.6], [44, 5.15], [46, 4.8], [48, 4.5], [49.4, 4.4], [50.6, 4.55], [51.8, 5.15], [52.8, 6.3], [53.7, 7.6], [54.4, 8.4], [54.8, 8.6, 1],
+    [54.8, 8.9, 1, "dark"], [56.4, 8.9, 1, "dark"], [56.4, 9.35, 1], [59.8, 9.4, 1], [59.8, 9.5, 1, "dark"], [61.4, 9.5, 1, "dark"],
+];
+/** The ball's ring of the Western trophy: four bands that cross under the ball and rise round its lower half (the real ones are two rings). */
+export const WEST_BAND = [[0, 38.2], [4.2, 37.6], [8.4, 36.2], [12, 33.6], [14.6, 30.4], [15.5, 28.8]];
+/** The Western base from the gold dome down: a black ring, a thin band, a flared black drum, a tall flared skirt and a black foot. In the earlier pair the thin band is black and the skirt polished silver. */
+export const westBase = (earlier) => [
+    [38, 3, 1], [38.5, 8.6], [39.6, 11], [40, 11.4, 1],
+    [40, 13.4, 1, "dark"], [42.2, 13.8, 1, "dark"],
+    [42.2, 14.3, 1, earlier ? "dark" : "main"], [44.8, 14.6, 1, earlier ? "dark" : "main"],
+    [44.8, 15.3, 1, "dark"], [46, 16], [48, 17.6], [50.4, 20, 1, "dark"],
+    [50.4, 20.2, 1, earlier ? "silver" : "main"], [53, 21], [56, 22], [60.6, 23, 1, earlier ? "silver" : "main"],
+    [60.6, 23.3, 1, "dark"], [62.4, 23.4, 1, "dark"],
+];
+/** The Eastern base from its plate down: a plate, three black tiers, a tall drum and a black foot. In the earlier pair the plate and the drum are polished silver. */
+export const eastBase = (earlier) => {
+    const light = earlier ? "silver" : "main";
+    return [
+        [40.6, 10.2, 1, light], [42.2, 10.4, 1, light],
+        [42.2, 12.2, 1, "dark"], [43.8, 12.2, 1, "dark"], [43.8, 14, 1, "dark"], [45.4, 14, 1, "dark"], [45.4, 15.8, 1, "dark"], [47, 15.8, 1, "dark"],
+        [47, 19.2, 1, light], [58.8, 19.5, 1, light],
+        [58.8, 20, 1, "dark"], [60.4, 20.6, 1, "dark"], [62.5, 20.9, 1, "dark"],
+    ];
+};
+/** One of the three posts of the Eastern trophy and its stem and dish, as solids (the posts stand at 0, 120 and 240 degrees). */
+export const eastTop = () => {
+    const post = (deg) => ({ at: [12.2, deg], p: [[33.4, 0.9, 1], [40.6, 0.9, 1]] });
+    return [{ p: [[37.6, 1.2, 1], [40.7, 1.4, 1]] }, { open: true, p: [[33.2, 10, 1], [34, 9.7], [36, 7.2], [37.6, 3.2], [38.2, 1.3, 1]] }, post(0), post(120), post(240)];
+};

package/dist/emblems/trophy/bill-russell-trophy.d.ts

@@ -1,2 +1,2 @@
-/** The Bill Russell NBA Finals Most Valuable Player Trophy: a gold basketball on a flared net goblet over a stepped round foot. */
+/** The Bill Russell NBA Finals Most Valuable Player Trophy: a gold basketball with silver seams in a net-etched gold trumpet over a stepped round foot. */
 export declare const TROPHY_BILL_RUSSELL_TROPHY: import("../emblem.core.ts").Emblem<import("../emblem.lathe.ts").LatheModel>;

package/dist/emblems/trophy/bill-russell-trophy.js

@@ -1,24 +1,28 @@
-// A gold basketball seated straight on the flared rim of a tall goblet: the body is a net-patterned cup that narrows in a long concave curve to a slim waist, then flares into a round foot of two stacked tiers, the upper one
-// holding the plain band for the engraving. Drawn for this package from a press photograph of the trophy standing beside the championship trophy (docs/likeness.md): the ball is a third of the height, the rim is wider than the ball,
-// the waist is under half the width of the rim and the foot is nearly as wide as the rim; the lettering and the etched strands are left out (the net is a diamond net in the model).
+// A gold basketball with grooved silver seams, seated in the mouth of a tall gold trumpet: the flange is wider than the body under it, the body narrows in a long smooth curve to a slim waist a little under half the
+// body's width, flares into a round foot of two tiers, and is etched with a net of silver diamonds. Drawn for this package from photographs of the 2022 trophy standing beside the championship trophy and the conference finals
+// MVP trophies (docs/likeness.md): the heights and radii are measured on a photograph of the whole row, the ball is a little under a third of the height, and the lettering on the foot's band and the ball's valve are left out
+// (the band takes the engraving option).
 import { defineLathe } from "../emblem.lathe.js";
-import { LATHE_EXTRAS } from "../lathe.extras.js";
-/** The Bill Russell NBA Finals Most Valuable Player Trophy: a gold basketball on a flared net goblet over a stepped round foot. */
+import { LATHE_BALL, LATHE_EXTRAS } from "../lathe.extras.js";
+/** The Bill Russell NBA Finals Most Valuable Player Trophy: a gold basketball with silver seams in a net-etched gold trumpet over a stepped round foot. */
 export const TROPHY_BILL_RUSSELL_TROPHY = /* @__PURE__ */ defineLathe("trophy:bill-russell-trophy", "Bill Russell Trophy", "ビル・ラッセル・トロフィー", "ours", {
     extras: LATHE_EXTRAS,
+    ballExtras: LATHE_BALL,
     metal: "gold",
-    turnBox: "-3.7 0 71.4 71.4",
-    tilt: 8,
+    tones: { silver: "#cfd3d8" },
+    box: "-0.3 0 64.6 64.6",
+    turnBox: "-4.6 0 73.1 73.1",
+    tilt: 10,
     solids: [
         {
             p: [
-                [22.3, 5, 1], [22.3, 11.3, 1], [22.9, 11.3, 1], [23.5, 10.4], [24.4, 9.9],
-                [26.5, 8.7], [28.7, 7.5], [32, 6.6], [35.1, 6.1], [38.5, 5.5], [41.5, 4.9], [44.2, 4.4], [46.4, 4.15], [49.6, 3.9], [50.9, 4.4], [51.9, 6.4], [52.6, 8.6, 1],
-                [52.7, 9.1, 1], [56.1, 9.4, 1], [56.2, 10, 1], [58.4, 10.3, 1], [60.2, 10.4], [60.8, 9.9, 1],
+                [22.8, 11, 1], [23, 12], [23.9, 12, 1], [24, 10.7, 1],
+                [25, 10.25], [27, 9.7], [29.3, 9.3], [31.4, 8.65], [33.5, 7.98], [35.7, 7.45], [37.8, 6.9], [39.9, 6.4], [42, 5.9], [44, 5.4], [45.5, 5.05], [47, 4.8], [50.5, 4.8], [51.6, 5.05], [52.7, 5.6], [53.7, 6.9], [54.8, 8.6], [55.9, 9.7, 1],
+                [55.9, 9.9, 1], [58, 10.4], [59.2, 10.7, 1], [59.2, 11, 1], [61.3, 11, 1],
             ],
-            decor: [["mesh", 25.2, 48.6, 8, 5], ["ring", 54.2], ["ring", 56.2]],
+            decor: [["mesh", 25.5, 46, 8, 5, "silver", 0.3], ["ring", 57.2]],
         },
     ],
-    balls: [{ kind: "basket", cy: 12.7, r: 9.4 }],
-    plate: { y0: 53.4, y1: 55.9, face: 0 },
+    balls: [{ kind: "plain", nba: true, cy: 13.3, r: 10.1, seam: "silver", lean: [-16, 22] }],
+    plate: { y0: 59.4, y1: 61 },
 });

package/dist/emblems/trophy/bob-cousy-trophy.d.ts

@@ -0,0 +1,2 @@
+/** The Bob Cousy Trophy: the Eastern Conference champions' trophy, a silver ball on three gold posts over a round black and gold base. */
+export declare const TROPHY_BOB_COUSY_TROPHY: import("../emblem.core.ts").Emblem<import("../emblem.lathe.ts").LatheModel>;

package/dist/emblems/trophy/bob-cousy-trophy.js

@@ -0,0 +1,18 @@
+// A large polished silver basketball with grooved seams on three slim gold posts over a small gold dish, on a round stepped base: a gold plate, three black tiers, a tall plain gold drum and a black foot. Drawn for this package
+// from a photograph of the 2022 conference champions' trophies standing side by side (docs/likeness.md): the posts stand at the corners of a triangle a little wider than the dish, and the lettering on the drum and the ball's
+// valve are left out (the drum is a plain band that takes the engraving option). The Western champions' trophy, the Oscar Robertson Trophy, holds the ball in crossed bands.
+import { defineLathe } from "../emblem.lathe.js";
+import { LATHE_BALL } from "../lathe.extras.js";
+import { NBA_TONES, eastBase, eastTop } from "../nba.parts.js";
+/** The Bob Cousy Trophy: the Eastern Conference champions' trophy, a silver ball on three gold posts over a round black and gold base. */
+export const TROPHY_BOB_COUSY_TROPHY = /* @__PURE__ */ defineLathe("trophy:bob-cousy-trophy", "Bob Cousy Trophy", "ボブ・クージー・トロフィー", "ours", {
+    ballExtras: LATHE_BALL,
+    metal: "gold",
+    tones: NBA_TONES,
+    box: "-2.3 0 68.6 68.6",
+    turnBox: "-10.5 -1.1 85 85",
+    tilt: 13,
+    solids: [{ p: eastBase(false) }, ...eastTop()],
+    balls: [{ kind: "plain", nba: true, cy: 19.2, r: 17.3, tone: "silver", lean: [20, -16] }],
+    plate: { y0: 49, y1: 57 },
+});

package/dist/emblems/trophy/foundation-player-award.js

@@ -25,5 +25,7 @@ export const TROPHY_FOUNDATION_PLAYER_AWARD = /* @__PURE__ */ defineLathe("troph
                 ["glass", "M19.2 61.8L20.6 60.4H43.4L44.8 61.8Z", "sh"],
             ],
         },
+        // The text the `engrave` option cuts into the clear middle of the glass; plain glass without it.
+        { kind: "cut", at: [0, 4.3], t: 0.1, decal: true, plate: [25.4, 38.6, 24, 38], layers: [] },
     ],
 });

package/dist/emblems/trophy/george-halas-trophy.d.ts

@@ -0,0 +1,2 @@
+/** The George Halas Trophy: an open football of polished silver, a laced ribbon in front and two curved bands behind, standing on its tip on a round flared base over a black foot. */
+export declare const TROPHY_GEORGE_HALAS_TROPHY: import("../emblem.core.ts").Emblem<import("../emblem.lathe.ts").LatheModel>;

package/dist/emblems/trophy/george-halas-trophy.js

@@ -0,0 +1,6 @@
+// The George Halas Trophy: the trophy of the National Football Conference champion, drawn as one drawing with the Lamar Hunt Trophy (lathe.conference.ts). Drawn for this package from photographs (docs/likeness.md); the
+// shield and the conference letters on the plate and the engraving on the base are left out.
+import { defineLathe } from "../emblem.lathe.js";
+import { NFL_CONFERENCE } from "../lathe.conference.js";
+/** The George Halas Trophy: an open football of polished silver, a laced ribbon in front and two curved bands behind, standing on its tip on a round flared base over a black foot. */
+export const TROPHY_GEORGE_HALAS_TROPHY = /* @__PURE__ */ defineLathe("trophy:george-halas-trophy", "George Halas Trophy", "ハラス・トロフィー", "ours", NFL_CONFERENCE);

package/dist/emblems/trophy/jackie-robinson-award.d.ts

@@ -0,0 +1,2 @@
+/** The Jackie Robinson Rookie of the Year Award: a walnut plaque with a black nameplate, a gold emblem, a bronze relief of a slide at the plate, a plate and a green pin. */
+export declare const TROPHY_JACKIE_ROBINSON_AWARD: import("../emblem.core.ts").Emblem<import("../emblem.shapes.ts").FlatModel>;