@johnmorrisdotca/dougu-sports 0.8.0 → 0.10.0

package/dist/emblems/ball/ball.script.js

@@ -0,0 +1,107 @@
+// An original cursive script, drawn for this package: a pen's centre line through hand-placed waypoints, joined letter to letter at the baseline, with the pen's thick down strokes and hairline up
+// strokes made by the caller from each segment's direction (`tier`). No font file, no licensed outline and no maker's lettering: every waypoint below was placed by hand, in a grid where the x-height is 10,
+// the ascender 20 and the descender -10, with y up. A glyph enters at (0, 0) and leaves at (adv, 0), so the next one starts where it stops. Imports nothing.
+const LOWER = {
+    a: { adv: 8.4, d: "0,0 1.6,2.6 3.6,6.2 5.2,8.6 6.4,9.6 4.6,10.4 2.4,9.2 1.2,6 1.5,2.4 3.4,0.5 5.2,1.4 6.3,4.4 6.7,9.4 6.7,5 6.8,1.4 7.6,0.2 8.4,0" },
+    b: { adv: 8.6, d: "0,0 1.6,3.5 3.4,9 4.6,15.5 4.6,19.5 3.8,20.8 2.8,19.4 2.9,15 3.6,9 4,3.5 4.2,0.8 4.8,3.2 6.5,6.6 7.8,5.6 7.6,2.2 5.8,0.4 3.8,1.4 3.3,3.4 4.3,0.3 7.2,0 8.6,0" },
+    c: { adv: 7.4, d: "0,0 1.8,2.8 3.8,7 5.8,9.4 4.8,10.2 2.6,9 1.2,5.8 1.6,2.2 3.4,0.3 5.4,0.8 6.6,1.8 7.4,0" },
+    d: { adv: 9, d: "0,0 1.6,2.6 3.6,6.2 5.2,8.6 6.4,9.6 4.6,10.4 2.4,9.2 1.2,6 1.5,2.4 3.4,0.5 5.2,1.4 6.4,4.4 7.2,11 8,17.5 8,20.2 7.1,20.8 6.5,19.3 6.7,13 7,6 7.1,1.4 8,0.2 9,0" },
+    e: { adv: 7.6, d: "0,0 0.9,2.4 1.7,5 3.2,5.8 4.9,5.7 5.4,8.2 4.2,10.1 2.6,9.8 1.2,7.6 1.1,3.8 2.1,1.2 3.8,0.2 5.6,0.9 7,0.2 7.6,0" },
+    f: { adv: 6.4, d: "0,0 1.4,3.5 3.2,9.5 4.8,16.5 5.4,19.6 4.4,20.8 3.2,19 3.5,14 3.6,6 3.4,-2.4 2.2,-8.4 1,-9.6 0,-8 1,-5.2 3.6,-3 5.4,0.4 6.4,0 ; 0.6,10.2 4.4,10.8 7.2,10.2" },
+    g: { adv: 8.6, d: "0,0 1.6,2.6 3.6,6.2 5.2,8.6 6.4,9.6 4.6,10.4 2.4,9.2 1.2,6 1.5,2.4 3.4,0.5 5.2,1.4 6.4,4.4 6.8,9.6 6.4,3 6.2,-4.6 4.8,-9 2.4,-9.8 1,-8.2 2,-6.8 5,-6 7,-3.6 8,-0.5 8.6,0" },
+    h: { adv: 8.6, d: "0,0 1.6,3.5 3.4,9 4.6,15.5 4.6,19.5 3.8,20.8 2.8,19.4 2.9,15 3.6,9 4,3.5 4.1,0.4 4.6,3.6 6,7.8 7.2,8 7.5,5 7.1,1.4 7.6,0.2 8.6,0" },
+    i: { adv: 4.8, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.8,4.4 2.6,1 3.2,0.2 4.8,0 ; 3.2,12.8 3.2,13.4" },
+    j: { adv: 4.8, d: "0,0 1.4,3.4 2.4,8.2 3,9.6 3.2,3 3,-4.6 1.6,-9 0.2,-9.8 -0.8,-8.4 0.6,-6.8 2.6,-4 3.8,-0.5 4.8,0 ; 3.6,12.8 3.6,13.4" },
+    k: { adv: 8.2, d: "0,0 1.6,3.5 3.4,9 4.6,15.5 4.6,19.5 3.8,20.8 2.8,19.4 2.9,15 3.6,9 4,3.5 4.1,0.4 4.4,3.2 5,6.2 6.6,8 7,6.4 5.8,4.2 4.4,3.6 5.6,2.6 6.8,0.4 8.2,0" },
+    l: { adv: 4.8, d: "0,0 1.6,3.5 3.2,9.5 4.2,15.5 4.4,19.4 3.6,20.8 2.6,19.4 2.7,15 3.2,9 3.5,3.5 3.6,0.6 4.1,0.2 4.8,0" },
+    m: { adv: 12.8, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.9,5.5 2.8,1 3.2,3.6 4.4,8 5.6,8.4 6.1,5.2 6,1 6.4,3.6 7.6,8 8.8,8.4 9.4,5.2 9.2,1.2 9.9,0.2 10.8,0.6 12.8,0" },
+    n: { adv: 8.4, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.9,5.5 2.8,1 3.2,3.6 4.4,8 5.6,8.4 6.2,5.2 6,1.2 6.8,0.2 8.4,0" },
+    o: { adv: 7.6, d: "0,0 1.8,2.8 3.4,6.4 4.4,8.8 3.4,10.2 1.8,8.4 1.2,5.2 1.9,1.8 3.8,0.3 5.6,1.8 5.7,5.4 4.8,8.6 5.2,10 6.4,9.4 7.6,8.5" },
+    p: { adv: 8.6, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.9,2 2.4,-4.6 1.8,-9.6 ; 2.8,5 3.4,8.6 5.2,10.2 7.2,9 7.6,5.4 6.4,2 4.2,0.4 2.8,1.4 2.5,3.4 4.4,0.4 6.8,0 8.6,0" },
+    q: { adv: 8.4, d: "0,0 1.6,2.6 3.6,6.2 5.2,8.6 6.4,9.6 4.6,10.4 2.4,9.2 1.2,6 1.5,2.4 3.4,0.5 5.2,1.4 6.4,4.4 6.8,9.6 6.6,2 6.2,-5 6.4,-9.4 7.2,-9.8 8.4,-8.4" },
+    r: { adv: 7, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.9,5.5 2.8,1.6 3.4,4.6 4.6,8.4 5.8,9.6 6.4,8.4 5.4,7.6 6.2,8.4 7,8" },
+    s: { adv: 6.6, d: "0,0 1.2,2.4 2.8,6 4,8.6 4.6,9.8 3.6,9.8 3.5,7.6 4.8,5.8 5,3.6 4.2,1.4 2.8,0.4 1.5,0.8 1.6,1.8 3.2,1.4 5,0.5 6.6,0" },
+    t: { adv: 6.4, d: "0,0 1.4,3.4 2.6,8.5 3.2,13 3.4,16.8 3,16.4 3,10 2.8,3.2 3.4,0.6 4.6,0.4 6.4,0 ; 0.6,9.4 3,9.8 5.8,9.2" },
+    u: { adv: 8.4, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.7,5.5 2.6,2.2 3.4,0.4 5,0.6 6.4,3.6 7,9.6 6.8,4.6 6.8,1.2 7.6,0.2 8.4,0" },
+    v: { adv: 7.6, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.7,5.5 3,2.2 4,0.4 5.2,1.6 6.4,6 7,9 6.4,10 7.6,8.4" },
+    w: { adv: 10.4, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.7,5.5 3,2.2 4,0.4 5,2.4 5.4,6 5.5,2.2 6.6,0.4 7.8,2.4 8.6,6 9.2,9 8.8,10 10.4,8.4" },
+    x: { adv: 7.4, d: "0,0 1.6,3 3.4,7 5,9.6 4.2,10.4 3,9 3.6,5.6 4.4,2.4 4,0.4 2.6,0.2 2,1.4 3.4,2.2 5.2,4.6 6.4,8.6 6.8,10 7.4,9" },
+    y: { adv: 8.2, d: "0,0 1.4,3.4 2.4,8.2 2.8,9.6 2.7,5.5 3,2.2 4,0.4 5.4,2.4 6.4,6 6.8,9.6 6.4,2.6 5.6,-4.6 4,-9 2,-9.8 0.8,-8.4 2,-7 4.6,-5.6 7,-3.4 8.2,0" },
+    z: { adv: 7, d: "0,0 1.4,2.6 2.6,6.6 3.4,9 4.4,10 5.8,9.4 3.8,6.4 2.2,3.4 2,0.4 3,-1.6 4.8,-3.6 4.2,-6 2.8,-6.6 2,-5.4 3.4,-4 5.6,-2.2 6.4,0 7,0" },
+};
+/** Capitals drawn for their own: the rest of the capitals are the small letter set tall (see `scriptStrokes`). */
+const UPPER = {
+    B: { adv: 14, d: "0,0 1.6,6 3.2,12 5,18 6.2,22.4 7,20 6.2,12 5.4,5 4.6,0.4 6,6.6 9.6,12 13,13.6 13.6,10.6 11,7.6 7,6.4 6,6.2 9,5.6 12.2,3.4 12.8,0.6 11,-1.4 7.8,-1.6 4,0.2 1.4,1 0,0" },
+    S: { adv: 11, d: "0,0 2.4,5 5,10 7.6,14.4 9.4,17 8.2,18.8 6,17.2 6.2,14 8.4,11 9.6,7.2 8.4,3 5.8,0.8 3,0.4 1.8,2 3.4,3 6.6,1.6 9,0.4 11,0" },
+};
+const SLANT = 0.3;
+/** A smooth curve through waypoints (a Catmull-Rom spline), as points about 0.8 apart. */
+function through(wp) {
+    const out = [];
+    for (let i = 0; i + 1 < wp.length; i++) {
+        const p0 = wp[Math.max(0, i - 1)], p1 = wp[i], p2 = wp[i + 1], p3 = wp[Math.min(wp.length - 1, i + 2)];
+        const n = Math.max(2, Math.ceil(Math.hypot(p2[0] - p1[0], p2[1] - p1[1]) / 0.8));
+        for (let j = 0; j < n; j++) {
+            const t = j / n, t2 = t * t, t3 = t2 * t;
+            out.push([
+                0.5 * (2 * p1[0] + (-p0[0] + p2[0]) * t + (2 * p0[0] - 5 * p1[0] + 4 * p2[0] - p3[0]) * t2 + (-p0[0] + 3 * p1[0] - 3 * p2[0] + p3[0]) * t3),
+                0.5 * (2 * p1[1] + (-p0[1] + p2[1]) * t + (2 * p0[1] - 5 * p1[1] + 4 * p2[1] - p3[1]) * t2 + (-p0[1] + 3 * p1[1] - 3 * p2[1] + p3[1]) * t3),
+            ]);
+        }
+    }
+    out.push(wp[wp.length - 1]);
+    return out;
+}
+/** The letter for a character: a drawn capital, a small letter (a capital with no drawing of its own is that letter set 1.7 times as tall), or `undefined`. */
+function letterOf(ch) {
+    if (Object.hasOwn(UPPER, ch))
+        return { letter: UPPER[ch], k: 1 };
+    const low = ch.normalize("NFD").replace(/[̀-ͯ]/g, "").toLowerCase();
+    if (low.length !== 1 || !Object.hasOwn(LOWER, low))
+        return undefined;
+    return { letter: LOWER[low], k: ch === ch.toUpperCase() && ch !== ch.toLowerCase() ? 1.7 : 1 };
+}
+/** The width of a word in the grid. */
+export function scriptWidth(text) {
+    let x = 0;
+    for (const ch of [...text]) {
+        if (ch === " ")
+            x += 5;
+        else {
+            const l = letterOf(ch);
+            if (l !== undefined)
+                x += l.letter.adv * l.k;
+        }
+    }
+    return x;
+}
+/**
+ * A word as pen runs in the grid (y up, the baseline at 0, the left end of the first letter at 0), leaning right, each run with the thickness tier of its segments. Characters with no letter are left out;
+ * a space is a gap.
+ */
+export function scriptRuns(text) {
+    const runs = [];
+    let x = 0;
+    for (const ch of [...text]) {
+        if (ch === " ") {
+            x += 5;
+            continue;
+        }
+        const l = letterOf(ch);
+        if (l === undefined)
+            continue;
+        for (const stroke of l.letter.d.split(";")) {
+            const wp = stroke.trim().split(/\s+/).map((p) => p.split(",").map(Number));
+            const pts = through(wp).map(([px, py]) => [x + px * l.k + SLANT * py * l.k, py * l.k]);
+            const tier = pts.slice(1).map((p, i) => {
+                const a = pts[i];
+                const dx = p[0] - a[0], dy = p[1] - a[1];
+                const down = Math.max(0, -dy / (Math.hypot(dx, dy) || 1));
+                return down > 0.62 ? 2 : down > 0.2 ? 1 : 0;
+            });
+            runs.push({ pts, tier });
+        }
+        x += l.letter.adv * l.k;
+    }
+    return runs;
+}

package/dist/emblems/ball/ball.soccer.js

@@ -4,7 +4,7 @@ import { defineBall } from "./ball.engine.js";
 import { truncatedIcosahedron } from "./ball.polyhedra.js";
 import { add, mul, norm } from "./ball.math.js";
 import { blend, mix } from "./ball.core.js";
-import { SOCCER_SIZE } from "./ball.soccer.size.js";
+import { CLASSIC_HOME, SOCCER_SIZE } from "./ball.soccer.size.js";
 const SEAM = "#6b7180";
 export const BALL_SOCCER = /* @__PURE__ */ defineBall({
     id: "ball:soccer",
@@ -16,11 +16,13 @@ export const BALL_SOCCER = /* @__PURE__ */ defineBall({
         base: "#1e2025",
         ground: "#f8f8f6",
         mat: { gloss: 0.8, shade: "#2a3450", grain: { f: 1.1, a: 0.16 } },
-        draw(s, base) {
+        home: CLASSIC_HOME,
+        draw(s, base, _accent, _colors, custom) {
             const t = truncatedIcosahedron();
             let out = "";
             for (const p of t.pentagons)
                 out += s.panel(p, base, { ink: true });
+            out += custom?.printer?.(s, custom.print, "soccer", [custom.paint?.body ?? "#f8f8f6"]) ?? "";
             out += s.strokes(t.edges, SEAM, 1.15);
             out += s.strokes(t.edges, "#fff", 0.45, { deco: true, opacity: 0.5, dx: 0.3, dy: 0.35 });
             return out;
@@ -37,7 +39,8 @@ export const BALL_SOCCER_COLOUR = /* @__PURE__ */ defineBall({
         base: "#d4283c",
         ground: "#f8f8f6",
         mat: { gloss: 0.8, shade: "#3a2030", grain: { f: 1.1, a: 0.16 } },
-        draw(s, base) {
+        home: CLASSIC_HOME,
+        draw(s, base, _accent, _colors, custom) {
             const t = truncatedIcosahedron();
             const light = blend(base, "#ffffff", 0.45);
             let out = "";
@@ -47,6 +50,7 @@ export const BALL_SOCCER_COLOUR = /* @__PURE__ */ defineBall({
             });
             for (const p of t.pentagons)
                 out += s.panel(p, base, { ink: true });
+            out += custom?.printer?.(s, custom.print, "soccer", [custom.paint?.body ?? "#f8f8f6", light]) ?? "";
             out += s.strokes(t.edges, mix(base, -0.35), 1.1);
             out += s.strokes(t.edges, "#fff", 0.45, { deco: true, opacity: 0.45, dx: 0.3, dy: 0.35 });
             return out;

package/dist/emblems/ball/ball.soccer.panels.d.ts

@@ -7,6 +7,8 @@ export interface Tones {
     /** A third tone between the light and the mid one, for a third kind of panel. */
     deep: string;
     seam: string;
+    /** What a layout lays between its panels and its seams (the print of a ball that has one), if it has any. */
+    under?: (s: Surface) => string;
 }
 export type Layout = (s: Surface, t: Tones) => string;
 export declare const classic: Layout;

package/dist/emblems/ball/ball.soccer.panels.js

@@ -5,7 +5,7 @@ import { blend, mix } from "./ball.core.js";
 import { strips18 } from "./ball.family.panelled.js";
 import { truncatedIcosahedron } from "./ball.polyhedra.js";
 import { dodecahedron, gores, propellers14, rhombicuboctahedron } from "./ball.tilings.js";
-import { SOCCER_SIZE } from "./ball.soccer.size.js";
+import { CLASSIC_HOME, SOCCER_SIZE } from "./ball.soccer.size.js";
 const INK = "#1e2025";
 const WHITE = "#f8f8f6";
 const SEAM = "#6b7180";
@@ -16,6 +16,7 @@ export const classic = (s, t) => {
     let out = "";
     for (const p of g.pentagons)
         out += s.panel(p, t.dark, { ink: true });
+    out += t.under?.(s) ?? "";
     out += s.strokes(g.edges, t.seam, 1.15);
     return out + lit(s, g.edges);
 };
@@ -94,7 +95,8 @@ function specOf(construction, way, view) {
             base: INK,
             ground: WHITE,
             mat: construction === 6 ? { ...gloss, gloss: 0.9, grain: { f: 0.7, a: 0.07 } } : gloss,
-            draw: (s, base, accent) => layout(s, { light: WHITE, dark: base, mid: accent ?? "#dfe2ea", deep: blend(accent ?? "#dfe2ea", base, 0.12), seam: SEAM }),
+            home: construction === "classic" ? CLASSIC_HOME : undefined,
+            draw: (s, base, accent, _colors, custom) => layout(s, { light: WHITE, dark: base, mid: accent ?? "#dfe2ea", deep: blend(accent ?? "#dfe2ea", base, 0.12), seam: SEAM, under: construction === "classic" ? (u) => custom?.printer?.(u, custom.print, "soccer", [custom.paint?.body ?? WHITE]) ?? "" : undefined }),
         };
     }
     const c = COLOURWAYS[way];
@@ -102,7 +104,8 @@ function specOf(construction, way, view) {
         view,
         base: c.base,
         mat: { ...(construction === 6 ? { ...gloss, gloss: 0.9, grain: { f: 0.7, a: 0.07 } } : gloss), shade: mix(c.base, -0.65) },
-        draw: (s, base, accent) => layout(s, { light: base, dark: accent ?? c.accent, mid: blend(base, "#ffffff", 0.4), deep: blend(base, "#ffffff", 0.18), seam: mix(base, -0.5) }),
+        home: construction === "classic" ? CLASSIC_HOME : undefined,
+        draw: (s, base, accent, _colors, custom) => layout(s, { light: base, dark: accent ?? c.accent, mid: blend(base, "#ffffff", 0.4), deep: blend(base, "#ffffff", 0.18), seam: mix(base, -0.5), under: construction === "classic" ? (u) => custom?.printer?.(u, custom.print, "soccer", [base]) ?? "" : undefined }),
     };
 }
 /** The id, and the English and Japanese names, of each construction in each colourway (short, because the name is the accessible name: 26 characters in English and 12 in Japanese at most). */

package/dist/emblems/ball/ball.soccer.size.d.ts

@@ -1,2 +1,4 @@
 import type { PieceSize } from "./ball.core.ts";
 export declare const SOCCER_SIZE: PieceSize;
+/** Where the classic 32-panel ball takes a logo and lettering: the middle of a white hexagon, the way up there, and the view that shows it (the hexagon on the far side is the same, so the label can go there). */
+export declare const CLASSIC_HOME: import("./ball.engine.ts").BallSpec["home"];

package/dist/emblems/ball/ball.soccer.size.js

@@ -6,3 +6,11 @@ export const SOCCER_SIZE = {
     rule: "IFAB Laws of the Game, Law 2 The Ball, section 2.1 Qualities and measurements",
     note: "Diameter worked out from the middle of the circumference range (68 to 70 cm).",
 };
+/** Where the classic 32-panel ball takes a logo and lettering: the middle of a white hexagon, the way up there, and the view that shows it (the hexagon on the far side is the same, so the label can go there). */
+export const CLASSIC_HOME = {
+    c: [-0.577, -0.577, -0.577],
+    up: [-0.408, 0.816, -0.408],
+    reach: 0.38,
+    view: { yaw: 124.5, pitch: -40.8, roll: -6.1 },
+    word: "soccer",
+};

package/dist/emblems/ball/ball.softball.js

@@ -1,5 +1,5 @@
 // Softball: an optic-yellow ball with red stitches along the seam (88 here, which the rule leaves free).
-import { seamedBall } from "./ball.family.seamed.js";
+import { SEAMED_HOME, seamedBall } from "./ball.family.seamed.js";
 export const BALL_SOFTBALL = /* @__PURE__ */ seamedBall({
     id: "ball:softball",
     en: "Softball",
@@ -9,6 +9,7 @@ export const BALL_SOFTBALL = /* @__PURE__ */ seamedBall({
     b: 0.4,
     view: { yaw: 18, pitch: 28, roll: -10 },
     mat: { gloss: 0.35, shade: "#4c5a10", grain: { f: 1.4, a: 0.12 } },
+    home: SEAMED_HOME("softball"),
     groove: "#8a9420",
     stitch: { colour: "#d0262c", count: 88, half: 0.085, width: 0.95, lean: 0.04 },
 });

package/dist/emblems/ball/ball.warp.d.ts

@@ -0,0 +1,48 @@
+import type { Surface } from "./ball.engine.ts";
+import type { SafeImage } from "./ball.image.ts";
+import type { V3 } from "./ball.math.ts";
+export type P2 = readonly [number, number];
+/** A flat shape of a drawing: its outlines, its paint, and the width of its stroke, in the drawing's own units. */
+export interface Shape {
+    subs: Array<{
+        pts: P2[];
+        closed: boolean;
+    }>;
+    fill: string | undefined;
+    stroke: string | undefined;
+    /** The stroke's width, already scaled by the transforms the shape is under. */
+    width: number;
+    fillOpacity: number;
+    strokeOpacity: number;
+    evenodd: boolean;
+}
+/**
+ * The outlines of a path's data, curves flattened to `steps` segments at most. M, L, H, V, C, S, Q, T, A and Z, absolute and relative. A number that is not one ends the path.
+ */
+export declare function flattenPath(d: string, steps?: number): Array<{
+    pts: P2[];
+    closed: boolean;
+}>;
+/**
+ * The shapes of a safe drawing in order, with the paint each one ends up with. A gradient is the mean of its stops, `currentColor` is `ink`, an opacity multiplies down the groups, a clip path is not applied,
+ * and what is in `defs` or a `clipPath` is not drawn. `box` is the drawing's own box, to size the curves' samples.
+ */
+export declare function shapesOf(img: SafeImage, ink: string): Shape[];
+/** A polyline with points added so that no segment is longer than `step`. */
+export declare function densify(pts: readonly P2[], step: number, closed: boolean): P2[];
+/** What puts a flat point of the drawing on the ball: plane coordinates (y down) to a point of the sphere. */
+export type PlaneMap = (x: number, y: number) => V3;
+/**
+ * Shapes drawn on the ball. The drawing's box is fitted into a square of side `size` (radians, in the plane the `map` lays on the ball) and centred; `cap` is the longest segment kept before points are added
+ * (radians), so a straight edge curves with the sphere.
+ */
+export declare function drawShapes(s: Surface, shapes: readonly Shape[], box: readonly [number, number, number, number], map: PlaneMap, size: number, o?: {
+    opacity?: number;
+    colour?: string;
+}): string;
+/**
+ * A picture that is not a vector, laid on the ball in triangles. The picture is fitted into a square of side `size` radians; `href` is a data URI that was checked by the caller. Each triangle of a grid of
+ * `n` by `n` cells is the picture's piece carried by the one affine map that fits its three corners, clipped to the triangle (grown a little so that no seam shows); a triangle with a corner out of
+ * sight is left out. Returns the markup, with the picture in a definition of its own.
+ */
+export declare function drawPicture(s: Surface, href: string, map: PlaneMap, size: number, id: string, n?: number): string;