@johnmorrisdotca/dougu-sports 0.4.0 → 0.5.0

package/dist/emblems/ball/ball.face.js

@@ -38,7 +38,7 @@ const colourOf = (value) => {
 };
 const DESIGNS = Object.keys(LOOKS);
 /** The face, ready to draw: the design's words and colours under the caller's. `base` is the design a puck's own id starts from. */
-function resolve(face, base, own) {
+function resolve(face, base, own, flags, theme) {
     const f = typeof face === "object" && face !== null ? face : {};
     const design = (typeof f.design === "string" && DESIGNS.includes(f.design) ? f.design : own?.design ?? base);
     const words = { ...WORDS[design], ...own, ...definedOnly(f) };
@@ -60,7 +60,8 @@ function resolve(face, base, own) {
         look,
         image: typeof words.image === "string" ? words.image : undefined,
         flag: typeof words.flag === "string" ? words.flag.trim().toLowerCase().slice(0, 12) : undefined,
-        flags: typeof words.flags === "function" ? words.flags : undefined,
+        flags,
+        theme,
         text: cleanText(words.text),
         ring,
         number: number === "" ? undefined : number,
@@ -112,7 +113,7 @@ function picture(f, prefix, cx, cy, w, h) {
         if (f.flags !== undefined) {
             let svg;
             try {
-                svg = f.flags(code, { shape: "4:3", size: 120, theme: "light" });
+                svg = f.flags(code, { shape: "rect", size: 120, theme: f.theme });
             }
             catch {
                 svg = undefined;
@@ -182,8 +183,8 @@ function leaf(cx, cy, w, fill) {
     return `<path d="${LEAF_PATH}" transform="translate(${num(cx, 3)} ${num(cy, 3)}) scale(${num(w / 2, 4)})" fill="${fill}"/>`;
 }
 /** The face of a design, in the face's units (a disc of radius 1, up is up): its definitions and its drawing. `prefix` makes every id unique to this puck. */
-export function faceMarkup(face, design, own, prefix) {
-    const f = resolve(face, design, own);
+export function faceMarkup(face, design, own, prefix, flags, theme = "inherit") {
+    const f = resolve(face, design, own, typeof flags === "function" ? flags : undefined, theme);
     const look = f.look;
     const clip = `${prefix}clip`;
     let defs = `<clipPath id="${clip}"><circle r=".965"/></clipPath>`;

package/dist/emblems/ball/ball.family.panelled.d.ts

@@ -1,4 +1,9 @@
+import { type V3 } from "./ball.math.ts";
 import type { Surface } from "./ball.engine.ts";
+/** The 18 panels of a ball, painted and not outlined. `colours[i]` is the three strips of face i, or one colour for the middle strip and one for the outer two. */
+export declare function paint18(s: Surface, colours: ReadonlyArray<readonly [string, string]>): string;
+/** The seams of the 18-panel layout, each once: the lines between strips and the twelve edges of the cube. */
+export declare function seams18(): V3[][];
 /** The 18 panels of a ball. `colours[i]` is the three strips of face i, or one colour for the middle strip and one for the outer two. */
 export declare function strips18(s: Surface, colours: ReadonlyArray<readonly [string, string]>, seam: string, width?: number): string;
 /** The 8 panels of an octahedral ball: the octants, coloured by `pick(sx, sy, sz)`. */

package/dist/emblems/ball/ball.family.panelled.js

@@ -19,8 +19,8 @@ const onFace = (f, p, q) => {
     v[f.q] = q;
     return norm(v);
 };
-/** The 18 panels of a ball. `colours[i]` is the three strips of face i, or one colour for the middle strip and one for the outer two. */
-export function strips18(s, colours, seam, width = 1.1) {
+/** The 18 panels of a ball, painted and not outlined. `colours[i]` is the three strips of face i, or one colour for the middle strip and one for the outer two. */
+export function paint18(s, colours) {
     let out = "";
     FACES.forEach((f, fi) => {
         const [outer, middle] = colours[fi % colours.length];
@@ -30,6 +30,10 @@ export function strips18(s, colours, seam, width = 1.1) {
             out += s.panel(ring, i === 1 ? middle : outer, { n: 6, ink: false });
         }
     });
+    return out;
+}
+/** The seams of the 18-panel layout, each once: the lines between strips and the twelve edges of the cube. */
+export function seams18() {
     const curves = [];
     for (const f of FACES)
         for (const q of [-SPLIT, SPLIT])
@@ -40,9 +44,12 @@ export function strips18(s, colours, seam, width = 1.1) {
             curves.push(arc(norm([a, -1, b]), norm([a, 1, b]), 12));
             curves.push(arc(norm([-1, a, b]), norm([1, a, b]), 12));
         }
-    out += s.strokes(curves, seam, width);
-    out += s.strokes(curves, "#fff", width * 0.35, { deco: true, opacity: 0.4, dx: 0.25, dy: 0.3 });
-    return out;
+    return curves;
+}
+/** The 18 panels of a ball. `colours[i]` is the three strips of face i, or one colour for the middle strip and one for the outer two. */
+export function strips18(s, colours, seam, width = 1.1) {
+    const curves = seams18();
+    return paint18(s, colours) + s.strokes(curves, seam, width) + s.strokes(curves, "#fff", width * 0.35, { deco: true, opacity: 0.4, dx: 0.25, dy: 0.3 });
 }
 /** The 8 panels of an octahedral ball: the octants, coloured by `pick(sx, sy, sz)`. */
 export function octants8(s, pick, seam, width = 1.1) {

package/dist/emblems/ball/ball.family.seamed.d.ts

@@ -17,14 +17,21 @@ export interface SeamedOptions {
         width: number;
         raised?: boolean;
     };
-    /** Stitches across the seam: colour, count, the half-length across it (radians) and the stroke width. */
+    /** Stitches across the seam: colour, count, the half-length across it (radians) and the stroke width. With `colour2` every other stitch is in that colour (a two-thread seam). */
     stitch?: {
         colour: string;
+        colour2?: string;
         count: number;
         half: number;
         width: number;
         lean: number;
     };
+    /** Scuffs of wear: the number of dark and of pale patches. */
+    wear?: {
+        dark: number;
+        pale: number;
+        seed?: number;
+    };
     /** A thin groove along the seam. */
     groove?: string;
 }

package/dist/emblems/ball/ball.family.seamed.js

@@ -1,6 +1,8 @@
 // Balls with the seam of a baseball or a tennis ball: one closed curve that winds twice round the sphere, x=(1-b)cos t + b cos 3t, y=(1-b)sin t - b sin 3t, z=2sqrt(b(1-b)) sin 2t.
 // A baseball and a softball have red stitches that cross it in Vs; a tennis or padel ball has a white rubber strip along it; a sliotar a raised rib.
 import { defineBall } from "./ball.engine.js";
+import { mix } from "./ball.core.js";
+import { scuffs } from "./ball.decal.js";
 import { seamCurve } from "./ball.math.js";
 import { stitches } from "./ball.stitch.js";
 export function seamedBall(o) {
@@ -8,15 +10,23 @@ export function seamedBall(o) {
         view: o.view ?? { yaw: 0, pitch: 0, roll: 0 },
         base: o.base,
         mat: o.mat,
-        draw: (s) => {
+        draw: (s, base) => {
             const seam = seamCurve(o.b, 160);
             let out = "";
             if (o.groove !== undefined)
                 out += s.stroke(seam, o.groove, 0.8, { closed: true, opacity: 0.55 });
             if (o.strip !== undefined)
                 out += o.strip.raised === true ? s.seam(seam, o.strip.colour, o.strip.width, { closed: true }) : s.stroke(seam, o.strip.colour, o.strip.width, { closed: true });
-            if (o.stitch !== undefined)
-                out += s.strokes(stitches(seam, true, o.stitch.count, o.stitch.half, { v: true, lean: o.stitch.lean }), o.stitch.colour, o.stitch.width, { ink: false });
+            if (o.wear !== undefined)
+                out += scuffs(s, mix(base, -0.55), mix(base, 0.6), { dark: o.wear.dark, pale: o.wear.pale, seed: o.wear.seed });
+            if (o.stitch !== undefined) {
+                const marks = stitches(seam, true, o.stitch.count, o.stitch.half, { v: true, lean: o.stitch.lean });
+                const second = o.stitch.colour2;
+                if (second === undefined)
+                    out += s.strokes(marks, o.stitch.colour, o.stitch.width, { ink: false });
+                else
+                    out += s.strokes(marks.filter((_, i) => i % 2 === 0), o.stitch.colour, o.stitch.width, { ink: false }) + s.strokes(marks.filter((_, i) => i % 2 === 1), second, o.stitch.width, { ink: false });
+            }
             if (o.strip === undefined && o.stitch === undefined)
                 out += s.stroke(seam, "currentColor", 1.6, { closed: true });
             return out;

package/dist/emblems/ball/ball.index.js

@@ -27,13 +27,18 @@ import { BALL_SOCCER, BALL_SOCCER_COLOUR } from "./ball.soccer.js";
 import { BALL_SOCCER_26, BALL_SOCCER_18, BALL_SOCCER_14, BALL_SOCCER_12, BALL_SOCCER_6, BALL_SOCCER_ORANGE, BALL_SOCCER_26_ORANGE, BALL_SOCCER_18_ORANGE, BALL_SOCCER_14_ORANGE, BALL_SOCCER_12_ORANGE, BALL_SOCCER_6_ORANGE, BALL_SOCCER_YELLOW, BALL_SOCCER_26_YELLOW, BALL_SOCCER_18_YELLOW, BALL_SOCCER_14_YELLOW, BALL_SOCCER_12_YELLOW, BALL_SOCCER_6_YELLOW } from "./ball.soccer.panels.js";
 import { BALL_FUTSAL, BALL_BEACH_SOCCER } from "./ball.soccer.indoor.js";
 import { BALL_SOFTBALL } from "./ball.softball.js";
+import { BALL_SOCCER_1870_HAND_STITCHED, BALL_SOCCER_1900_LACED, BALL_SOCCER_1930_18_PANEL, BALL_SOCCER_1950_12_PANEL, BALL_SOCCER_1960_32_PANEL_LEATHER } from "./ball.soccer.vintage.js";
+import { BALL_SOCCER_1970_BLACK_WHITE, BALL_SOCCER_1978_TRIAD, BALL_SOCCER_1986_DECORATED_TRIAD, BALL_SOCCER_1998_COLOURED_TRIAD, BALL_SOCCER_2002_TRIANGLE_SWEEP, BALL_SOCCER_2006_PROPELLER, BALL_SOCCER_2010_GROOVED, BALL_SOCCER_2014_RIBBON, BALL_SOCCER_2018_PIXEL, BALL_SOCCER_2022_SPEED_SHELL, BALL_SOCCER_TRAINING_HIGH_VIS } from "./ball.soccer.era.js";
+import { BALL_SOCCER_STARS_BLUE, BALL_SOCCER_STARS_RED, BALL_SOCCER_STARS_NIGHT, BALL_SOCCER_HEXAGONS_CYAN, BALL_SOCCER_HEXAGONS_MAGENTA, BALL_SOCCER_HEXAGONS_LIME, BALL_SOCCER_FLAMES_FIRE, BALL_SOCCER_FLAMES_ICE, BALL_SOCCER_FLAMES_TOXIC, BALL_SOCCER_CHEVRONS_RED, BALL_SOCCER_CHEVRONS_GREEN, BALL_SOCCER_CHEVRONS_BLUE, BALL_SOCCER_SWIRL_BLUE, BALL_SOCCER_SWIRL_RED, BALL_SOCCER_SWIRL_TEAL, BALL_SOCCER_METALLIC_GOLD, BALL_SOCCER_METALLIC_SILVER, BALL_SOCCER_METALLIC_COBALT } from "./ball.soccer.store.js";
+import { BALL_BASEBALL_LEMON_PEEL, BALL_BASEBALL_RED_BLUE, BALL_BASEBALL_BLACK_RED, BALL_BASEBALL_VINTAGE_LEATHER, BALL_SOFTBALL_11_OPTIC } from "./ball.baseball.vintage.js";
+import { BALL_VOLLEYBALL_COLOURS, BALL_VOLLEYBALL_BRAZIL, BALL_VOLLEYBALL_JAPAN, BALL_VOLLEYBALL_CANADA, BALL_VOLLEYBALL_USA, BALL_VOLLEYBALL_ITALY, BALL_VOLLEYBALL_POLAND, BALL_VOLLEYBALL_FRANCE, BALL_VOLLEYBALL_SERBIA, BALL_VOLLEYBALL_NETHERLANDS, BALL_VOLLEYBALL_GERMANY } from "./ball.volleyball.flag.js";
 import { BALL_SQUASH_DOUBLE_YELLOW, BALL_SQUASH_YELLOW, BALL_SQUASH_RED, BALL_SQUASH_BLUE, BALL_SQUASH_GREEN } from "./ball.squash.js";
 import { BALL_TENNIS } from "./ball.tennis.js";
 import { BALL_TEQBALL } from "./ball.teqball.js";
 import { BALL_VOLLEYBALL, BALL_VOLLEYBALL_8, BALL_BEACH_VOLLEYBALL } from "./ball.volleyball.js";
 import { BALL_WATER_POLO } from "./ball.waterpolo.js";
 /** Every ball, in the order a gallery shows them. */
-export const BALLS = [BALL_SOCCER, BALL_SOCCER_COLOUR, BALL_SOCCER_26, BALL_SOCCER_18, BALL_SOCCER_14, BALL_SOCCER_12, BALL_SOCCER_6, BALL_SOCCER_ORANGE, BALL_SOCCER_26_ORANGE, BALL_SOCCER_18_ORANGE, BALL_SOCCER_14_ORANGE, BALL_SOCCER_12_ORANGE, BALL_SOCCER_6_ORANGE, BALL_SOCCER_YELLOW, BALL_SOCCER_26_YELLOW, BALL_SOCCER_18_YELLOW, BALL_SOCCER_14_YELLOW, BALL_SOCCER_12_YELLOW, BALL_SOCCER_6_YELLOW, BALL_FUTSAL, BALL_BEACH_SOCCER, BALL_TEQBALL, BALL_BASKETBALL, BALL_BASKETBALL_6, BALL_BASKETBALL_3X3, BALL_BASEBALL, BALL_SOFTBALL, BALL_TENNIS, BALL_PADEL, BALL_SLIOTAR, BALL_VOLLEYBALL, BALL_VOLLEYBALL_8, BALL_BEACH_VOLLEYBALL, BALL_CRICKET_RED, BALL_CRICKET_WHITE, BALL_CRICKET_PINK, BALL_FOOTBALL, BALL_FOOTBALL_CFL, BALL_FOOTBALL_IFAF, BALL_RUGBY, BALL_AFL, BALL_GAELIC_FOOTBALL, BALL_NETBALL, BALL_PICKLEBALL_OUTDOOR, BALL_PICKLEBALL_INDOOR, BALL_SQUASH_DOUBLE_YELLOW, BALL_SQUASH_YELLOW, BALL_SQUASH_GREEN, BALL_SQUASH_RED, BALL_SQUASH_BLUE, BALL_RACQUETBALL, BALL_LACROSSE, BALL_FIELD_HOCKEY, BALL_TABLE_TENNIS, BALL_HANDBALL, BALL_WATER_POLO, BALL_GOLF, BALL_PUCK, BALL_CURLING_STONE, BALL_SHOT, BALL_DISCUS, BALL_HAMMER, BALL_SEPAK_TAKRAW, BALL_ROUNDNET, BALL_SHUTTLECOCK_FEATHER, BALL_SHUTTLECOCK_NYLON];
+export const BALLS = [BALL_SOCCER, BALL_SOCCER_COLOUR, BALL_SOCCER_26, BALL_SOCCER_18, BALL_SOCCER_14, BALL_SOCCER_12, BALL_SOCCER_6, BALL_SOCCER_ORANGE, BALL_SOCCER_26_ORANGE, BALL_SOCCER_18_ORANGE, BALL_SOCCER_14_ORANGE, BALL_SOCCER_12_ORANGE, BALL_SOCCER_6_ORANGE, BALL_SOCCER_YELLOW, BALL_SOCCER_26_YELLOW, BALL_SOCCER_18_YELLOW, BALL_SOCCER_14_YELLOW, BALL_SOCCER_12_YELLOW, BALL_SOCCER_6_YELLOW, BALL_FUTSAL, BALL_BEACH_SOCCER, BALL_SOCCER_1870_HAND_STITCHED, BALL_SOCCER_1900_LACED, BALL_SOCCER_1930_18_PANEL, BALL_SOCCER_1950_12_PANEL, BALL_SOCCER_1960_32_PANEL_LEATHER, BALL_SOCCER_1970_BLACK_WHITE, BALL_SOCCER_1978_TRIAD, BALL_SOCCER_1986_DECORATED_TRIAD, BALL_SOCCER_1998_COLOURED_TRIAD, BALL_SOCCER_2002_TRIANGLE_SWEEP, BALL_SOCCER_2006_PROPELLER, BALL_SOCCER_2010_GROOVED, BALL_SOCCER_2014_RIBBON, BALL_SOCCER_2018_PIXEL, BALL_SOCCER_2022_SPEED_SHELL, BALL_SOCCER_TRAINING_HIGH_VIS, BALL_SOCCER_STARS_BLUE, BALL_SOCCER_STARS_RED, BALL_SOCCER_STARS_NIGHT, BALL_SOCCER_HEXAGONS_CYAN, BALL_SOCCER_HEXAGONS_MAGENTA, BALL_SOCCER_HEXAGONS_LIME, BALL_SOCCER_FLAMES_FIRE, BALL_SOCCER_FLAMES_ICE, BALL_SOCCER_FLAMES_TOXIC, BALL_SOCCER_CHEVRONS_RED, BALL_SOCCER_CHEVRONS_GREEN, BALL_SOCCER_CHEVRONS_BLUE, BALL_SOCCER_SWIRL_BLUE, BALL_SOCCER_SWIRL_RED, BALL_SOCCER_SWIRL_TEAL, BALL_SOCCER_METALLIC_GOLD, BALL_SOCCER_METALLIC_SILVER, BALL_SOCCER_METALLIC_COBALT, BALL_TEQBALL, BALL_BASKETBALL, BALL_BASKETBALL_6, BALL_BASKETBALL_3X3, BALL_BASEBALL, BALL_SOFTBALL, BALL_BASEBALL_LEMON_PEEL, BALL_BASEBALL_RED_BLUE, BALL_BASEBALL_BLACK_RED, BALL_BASEBALL_VINTAGE_LEATHER, BALL_SOFTBALL_11_OPTIC, BALL_TENNIS, BALL_PADEL, BALL_SLIOTAR, BALL_VOLLEYBALL, BALL_VOLLEYBALL_8, BALL_BEACH_VOLLEYBALL, BALL_VOLLEYBALL_COLOURS, BALL_VOLLEYBALL_BRAZIL, BALL_VOLLEYBALL_JAPAN, BALL_VOLLEYBALL_CANADA, BALL_VOLLEYBALL_USA, BALL_VOLLEYBALL_ITALY, BALL_VOLLEYBALL_POLAND, BALL_VOLLEYBALL_FRANCE, BALL_VOLLEYBALL_SERBIA, BALL_VOLLEYBALL_NETHERLANDS, BALL_VOLLEYBALL_GERMANY, BALL_CRICKET_RED, BALL_CRICKET_WHITE, BALL_CRICKET_PINK, BALL_FOOTBALL, BALL_FOOTBALL_CFL, BALL_FOOTBALL_IFAF, BALL_RUGBY, BALL_AFL, BALL_GAELIC_FOOTBALL, BALL_NETBALL, BALL_PICKLEBALL_OUTDOOR, BALL_PICKLEBALL_INDOOR, BALL_SQUASH_DOUBLE_YELLOW, BALL_SQUASH_YELLOW, BALL_SQUASH_GREEN, BALL_SQUASH_RED, BALL_SQUASH_BLUE, BALL_RACQUETBALL, BALL_LACROSSE, BALL_FIELD_HOCKEY, BALL_TABLE_TENNIS, BALL_HANDBALL, BALL_WATER_POLO, BALL_GOLF, BALL_PUCK, BALL_CURLING_STONE, BALL_SHOT, BALL_DISCUS, BALL_HAMMER, BALL_SEPAK_TAKRAW, BALL_ROUNDNET, BALL_SHUTTLECOCK_FEATHER, BALL_SHUTTLECOCK_NYLON];
 /** The id of every ball: `"ball:soccer"`, `"ball:cricket-red"`. */
 export const BALL_IDS = BALLS.map((b) => b.id);
 const TABLE = new Map([...BALLS, ...PUCKS].map((b) => [b.id, b]));

package/dist/emblems/ball/ball.puck.print.js

@@ -24,7 +24,7 @@ function definePuck(def) {
                 // The top face's plane in the box: its centre, and where a step of 1 along the puck's x and z axes goes (the face's right, and its down).
                 const o = cx.at([0, PUCK_H, 0]), ex = cx.at([1, PUCK_H, 0]), ez = cx.at([0, PUCK_H, 1]);
                 const m = [ex[0] - o[0], ex[1] - o[1], ez[0] - o[0], ez[1] - o[1], o[0], o[1]].map((v) => num(v, 4)).join(" ");
-                const face = faceMarkup(cx.opts.face, def.design, def.own, `${cx.id}p`);
+                const face = faceMarkup(cx.opts.face, def.design, def.own, `${cx.id}p`, cx.opts.flags, cx.opts.theme === "light" || cx.opts.theme === "dark" ? cx.opts.theme : "inherit");
                 // A light from the upper left and a falling-off at the far edge, over the print, in the box's own space so the light stays put while the puck turns.
                 const gid = `${cx.id}fl`;
                 const defs = `${face.defs}<radialGradient id="${gid}" cx=".36" cy=".3" r=".85"><stop offset="0" stop-color="#fff" stop-opacity=".34"/><stop offset=".4" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#000" stop-opacity=".42"/></radialGradient>`;

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

@@ -0,0 +1,23 @@
+import { type BallSpec } from "./ball.engine.ts";
+/** The 1970s: twelve black pentagons with a white ring round a small boss, and twenty white hexagons that each hold a pale dished hexagon and a dot. */
+export declare const BALL_SOCCER_1970_BLACK_WHITE: import("./ball.core.ts").Piece<BallSpec>;
+/** The late 1970s: a pinwheel of three bold curved triangles on each of the twenty hexagons, black on white; their points meet round each of the twelve pentagons. */
+export declare const BALL_SOCCER_1978_TRIAD: import("./ball.core.ts").Piece<BallSpec>;
+/** The 1980s: the same triads in a warm clay, each blade ornamented with a row of white beads along its spine, and gold-ringed dark pentagons. */
+export declare const BALL_SOCCER_1986_DECORATED_TRIAD: import("./ball.core.ts").Piece<BallSpec>;
+/** The 1990s: the triads in three colours (blue, red and gold) on a white ground, with deep navy pentagons. */
+export declare const BALL_SOCCER_1998_COLOURED_TRIAD: import("./ball.core.ts").Piece<BallSpec>;
+/** The early 2000s: long thin triangles that sweep across each hexagon from one side to the next, in graphite and gold, with a red spark, over charcoal pentagons. */
+export declare const BALL_SOCCER_2002_TRIANGLE_SWEEP: import("./ball.core.ts").Piece<BallSpec>;
+/** The mid 2000s: the 14-panel propeller layout (six propellers and eight triangles), with a fine line following each curved seam inside the panel, and a small ring on each triangle. */
+export declare const BALL_SOCCER_2006_PROPELLER: import("./ball.core.ts").Piece<BallSpec>;
+/** The early 2010s: the 8-panel layout, an octahedron whose edges are bent into S curves, with grooves for seams and fine contour lines across each panel. */
+export declare const BALL_SOCCER_2010_GROOVED: import("./ball.core.ts").Piece<BallSpec>;
+/** The mid 2010s: six twisted panels in white, crossed by wide ribbons that swirl round the ball in teal, orange and violet. */
+export declare const BALL_SOCCER_2014_RIBBON: import("./ball.core.ts").Piece<BallSpec>;
+/** The late 2010s: six panels covered with square pixel blocks, thick where the ball is dark and thinning out toward the lighter side. */
+export declare const BALL_SOCCER_2018_PIXEL: import("./ball.core.ts").Piece<BallSpec>;
+/** The early 2020s: twenty triangles (an icosahedron) in three warm tones, each carrying a shell of nested edges and a trail of speed lines. */
+export declare const BALL_SOCCER_2022_SPEED_SHELL: import("./ball.core.ts").Piece<BallSpec>;
+/** A modern high-visibility training ball: 32 panels in fluorescent yellow-green, hot pink pentagons ringed in black, and three dark speed marks across each hexagon. */
+export declare const BALL_SOCCER_TRAINING_HIGH_VIS: import("./ball.core.ts").Piece<BallSpec>;

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

@@ -0,0 +1,302 @@
+// Soccer balls in the style of an era's match balls, each on the construction of its time and with graphics of our own that only evoke the period: the black and white 32 panels of the early 1970s, curved
+// triangles in threes (late 1970s, 1980s and 1990s), a triangular sweep, the 14-panel propeller, the 8-panel grooved ball, 6 panels with ribbons, pixel blocks, 20 panels with a shell of lines, and a modern
+// high-visibility training ball. The panel counts are facts of the constructions (docs/references.md); the drawings are not the real balls' and use none of their marks, names or patterns.
+import { defineBall } from "./ball.engine.js";
+import { mix } from "./ball.core.js";
+import { frameAt, noise, place, spiral, tongue, turned } from "./ball.decal.js";
+import { shrink, truncatedIcosahedron } from "./ball.polyhedra.js";
+import { gorePoint, gores, icosahedron, octahedron8, propellers14 } from "./ball.tilings.js";
+import { SOCCER_SIZE } from "./ball.soccer.size.js";
+const INK = "#1b1d22";
+const WHITE = "#f8f8f6";
+const GREY = "#6b7180";
+const VIEW = { yaw: 30, pitch: 24, roll: 8 };
+const GLOSS = { gloss: 0.8, shade: "#2a3450", grain: { f: 1.1, a: 0.16 } };
+/** The highlight laid on a seam, so that it reads as a raised edge. */
+const lit = (s, seams, width = 0.45) => s.strokes(seams, "#fff", width, { deco: true, opacity: 0.45, dx: 0.3, dy: 0.35 });
+const ball = (id, en, ja, spec) => defineBall({ id, en, ja, size: SOCCER_SIZE, spec });
+/** What lies on the 32 panels: a frame at the middle of each hexagon, with x toward one of the three sides it shares with a pentagon. */
+const hexFrames = (t) => t.hexagonCentres.map((c, i) => frameAt(c, t.hexagonPentagonSides[i][0]));
+/** Three curved blades in a pinwheel about the middle of a hexagon (a triad): each is a leaf along a spiral, `sweep` radians of turn, `w` wide. */
+const triad = (r0, r1, sweep, w, start = 0.5) => [0, 1, 2].map((k) => tongue(spiral(r0, r1, start + (2 * Math.PI * k) / 3, sweep), (u) => w * Math.min(1, u * 5) * (1 - u) ** 0.7, 5));
+/** The hexagons of a 32-panel ball carrying a triad each, over a ground; `colours` has one fill for each blade. */
+function laidTriads(s, t, frames, blades, colours, edge, ew = 0.5) {
+    let out = "";
+    for (let k = 0; k < blades.length; k++)
+        out += s.panels(frames.map((f) => place(f, blades[k])), colours[k % colours.length], { n: 1 });
+    // The colour drawing is filled and needs no outline; the line drawing is the outline alone.
+    if (s.line) {
+        const rings = [];
+        for (const f of frames)
+            for (const b of blades)
+                rings.push(place(f, b));
+        out += s.strokes(rings, edge, ew, { closed: true });
+    }
+    void t;
+    return out;
+}
+/** The 1970s: twelve black pentagons with a white ring round a small boss, and twenty white hexagons that each hold a pale dished hexagon and a dot. */
+export const BALL_SOCCER_1970_BLACK_WHITE = /* @__PURE__ */ ball("ball:soccer-1970-black-white", "Soccer, 1970s black-white", "70年代風・白黒", {
+    view: VIEW,
+    base: INK,
+    ground: WHITE,
+    mat: GLOSS,
+    draw(s, base, accent) {
+        const t = truncatedIcosahedron();
+        let out = "";
+        t.hexagons.forEach((h, i) => {
+            out += s.panel(shrink(h, t.hexagonCentres[i], 0.5), accent ?? "#e4e5e1", { n: 2 });
+        });
+        for (const p of t.pentagons)
+            out += s.panel(p, base, { ink: true });
+        t.pentagons.forEach((p, i) => {
+            out += s.strokes([shrink(p, t.pentagonCentres[i], 0.45)], "#fff", 0.5, { closed: true, deco: true, opacity: 0.85 });
+        });
+        out += s.dots(t.hexagonCentres, 0.03, base, { light: false });
+        out += s.strokes(t.edges, GREY, 1.15);
+        return out + lit(s, t.edges);
+    },
+});
+/** The late 1970s: a pinwheel of three bold curved triangles on each of the twenty hexagons, black on white; their points meet round each of the twelve pentagons. */
+export const BALL_SOCCER_1978_TRIAD = /* @__PURE__ */ ball("ball:soccer-1978-triad", "Soccer, late-1970s triads", "70年代後期風・三つ巴", {
+    view: VIEW,
+    base: INK,
+    ground: WHITE,
+    mat: GLOSS,
+    draw(s, base) {
+        const t = truncatedIcosahedron();
+        let out = laidTriads(s, t, hexFrames(t), triad(0.0, 0.32, -0.85, 0.17, 0.3), [base], base, 0.4);
+        out += s.strokes(t.edges, mix(base, 0.45), 0.8);
+        return out + lit(s, t.edges, 0.4);
+    },
+});
+/** The 1980s: the same triads in a warm clay, each blade ornamented with a row of white beads along its spine, and gold-ringed dark pentagons. */
+export const BALL_SOCCER_1986_DECORATED_TRIAD = /* @__PURE__ */ ball("ball:soccer-1986-decorated-triad", "Soccer, decorated triads", "80年代風・飾り三つ巴", {
+    view: VIEW,
+    base: "#c4563a",
+    ground: WHITE,
+    mat: GLOSS,
+    draw(s, base, accent) {
+        const t = truncatedIcosahedron();
+        const hf = hexFrames(t);
+        const gold = accent ?? "#e0a526";
+        let out = "";
+        for (const p of t.pentagons)
+            out += s.panel(p, "#3a2a2c", { ink: true });
+        t.pentagons.forEach((p, i) => {
+            out += s.strokes([shrink(p, t.pentagonCentres[i], 0.4)], gold, 0.6, { closed: true, deco: true });
+        });
+        out += laidTriads(s, t, hf, triad(0.0, 0.31, -0.85, 0.16, 0.3), [base], mix(base, -0.45), 0.5);
+        const spines = [];
+        for (const f of hf)
+            for (let k = 0; k < 3; k++)
+                spines.push(Array.from({ length: 6 }, (_, j) => f(...spiral(0.06, 0.26, 0.3 + (2 * Math.PI * k) / 3, -0.85)(j / 5))));
+        out += s.strokes(spines, "#fff7e6", 1.1, { dash: "0 2.3", deco: true });
+        return out + s.strokes(t.edges, mix(base, -0.5), 1);
+    },
+});
+/** The 1990s: the triads in three colours (blue, red and gold) on a white ground, with deep navy pentagons. */
+export const BALL_SOCCER_1998_COLOURED_TRIAD = /* @__PURE__ */ ball("ball:soccer-1998-coloured-triad", "Soccer, coloured triads", "90年代風・色つき三つ巴", {
+    view: VIEW,
+    base: "#1e56b8",
+    ground: WHITE,
+    mat: GLOSS,
+    draw(s, base, accent) {
+        const t = truncatedIcosahedron();
+        let out = "";
+        for (const p of t.pentagons)
+            out += s.panel(p, mix(base, -0.55), { ink: true });
+        out += laidTriads(s, t, hexFrames(t), triad(0.0, 0.31, 0.9, 0.16, 0.2), [base, "#d8322f", accent ?? "#f2bf1b"], "#ffffff", 0.35);
+        out += s.strokes(t.edges, GREY, 0.9);
+        return out + lit(s, t.edges, 0.4);
+    },
+});
+/** The early 2000s: long thin triangles that sweep across each hexagon from one side to the next, in graphite and gold, with a red spark, over charcoal pentagons. */
+export const BALL_SOCCER_2002_TRIANGLE_SWEEP = /* @__PURE__ */ ball("ball:soccer-2002-triangle-sweep", "Soccer, triangle sweep", "00年代風・三角の流れ", {
+    view: VIEW,
+    base: "#4a4f5c",
+    ground: "#f3efe4",
+    mat: GLOSS,
+    draw(s, base, accent) {
+        const t = truncatedIcosahedron();
+        const gold = accent ?? "#d9a420";
+        let out = "";
+        for (const p of t.pentagons)
+            out += s.panel(p, mix(base, -0.45), { ink: true });
+        const big = [[0.3, -0.03], [0.02, 0.2], [-0.05, 0.04]];
+        const small = [[0.27, 0.035], [0.12, 0.16], [0.1, 0.07]];
+        const frames = hexFrames(t);
+        const turns = [0, 1, 2].map((k) => (2 * Math.PI * k) / 3);
+        out += s.panels(frames.flatMap((f) => turns.map((a) => place(f, turned(big, a)))), base, { n: 1 });
+        out += s.panels(frames.flatMap((f) => turns.map((a) => place(f, turned(small, a + 0.1)))), gold, { n: 1 });
+        out += s.strokes(t.edges, GREY, 0.9);
+        return out + lit(s, t.edges, 0.4);
+    },
+});
+/** The mid 2000s: the 14-panel propeller layout (six propellers and eight triangles), with a fine line following each curved seam inside the panel, and a small ring on each triangle. */
+export const BALL_SOCCER_2006_PROPELLER = /* @__PURE__ */ ball("ball:soccer-2006-propeller", "Soccer, 14-panel propeller", "14枚貼り・プロペラ形", {
+    view: { yaw: 40, pitch: 36, roll: 0 },
+    base: "#1f232b",
+    ground: "#f4f2ea",
+    mat: GLOSS,
+    draw(s, base, accent) {
+        const g = propellers14();
+        const gold = accent ?? "#c9962b";
+        let out = "";
+        for (const p of g.triangles)
+            out += s.panel(p, base, { n: 6, ink: true });
+        g.triangles.forEach((p, i) => {
+            out += s.panel(shrink(p, g.triangleCentres[i], 0.55), gold, { n: 4 });
+        });
+        // A line a little inside each propeller, following its seam.
+        g.propellers.forEach((p, i) => {
+            out += s.strokes([shrink(p, g.propellerCentres[i], 0.16).filter((_, j) => j % 2 === 0)], gold, 0.55, { closed: true, deco: true, opacity: 0.95 });
+        });
+        out += s.strokes(g.seams, "#3a3f4a", 1.4);
+        return out + lit(s, g.seams);
+    },
+});
+/** The early 2010s: the 8-panel layout, an octahedron whose edges are bent into S curves, with grooves for seams and fine contour lines across each panel. */
+export const BALL_SOCCER_2010_GROOVED = /* @__PURE__ */ ball("ball:soccer-2010-grooved", "Soccer, 8-panel grooved", "8枚貼り・溝つき", {
+    view: { yaw: 32, pitch: 26, roll: 0 },
+    base: "#e9ecee",
+    ground: "#eceff0",
+    mat: { gloss: 0.7, shade: "#33404c", grain: { f: 1.6, a: 0.2 } },
+    draw(s, base, accent) {
+        const g = octahedron8();
+        const tone = [base, accent ?? "#cfe3d6"];
+        let out = "";
+        g.panels.forEach((p, i) => {
+            if (g.parity[i] === 1)
+                out += s.panel(p, tone[1], { n: 1 });
+        });
+        const groove = "#3f4b57";
+        g.panels.forEach((p, i) => {
+            out += s.strokes([shrink(p, g.centres[i], 0.4).filter((_, j) => j % 2 === 0)], groove, 0.35, { closed: true, deco: true, opacity: 0.6 });
+        });
+        out += s.strokes(g.seams, groove, 1.8);
+        out += s.strokes(g.seams, "#fff", 0.55, { deco: true, opacity: 0.55, dx: 0.5, dy: 0.55 });
+        return out;
+    },
+});
+/** The six gores of the thermobonded layout (see ball.soccer.panels.ts), for the layers drawn on them: only the gores whose tone is not the ground's are painted. */
+function sixGores(s, tilt, tone, twist = 180) {
+    const g = gores(6, twist, tilt);
+    let out = "";
+    for (const { ring, gore } of g.pieces) {
+        if (gore % 3 !== 1)
+            continue;
+        out += s.panel(ring, tone, { n: 1 });
+        out += s.strokes([ring], tone, 0.5, { closed: true, deco: true });
+    }
+    return { g, out };
+}
+/** The mid 2010s: six twisted panels in white, crossed by wide ribbons that swirl round the ball in teal, orange and violet. */
+export const BALL_SOCCER_2014_RIBBON = /* @__PURE__ */ ball("ball:soccer-2014-ribbon", "Soccer, 6-panel ribbons", "6枚貼り・リボン柄", {
+    view: { yaw: 20, pitch: 22, roll: 0 },
+    base: "#14a7a0",
+    ground: "#f5f5f1",
+    mat: { gloss: 0.9, shade: "#2a3450", grain: { f: 0.7, a: 0.07 } },
+    draw(s, base, accent) {
+        const { g, out: panels } = sixGores(s, [0, 0, 28], "#ebebe5");
+        const at = gorePoint(6, 180, [0, 0, 28]);
+        const cols = [base, accent ?? "#f08a24", "#7a4bc2"];
+        let out = panels;
+        // Three ribbons on a gore, spiralling: each is a leaf whose spine follows a curve across the gore.
+        for (let i = 0; i < 6; i++) {
+            for (let k = 0; k < 2; k++) {
+                const c = cols[(i + k) % 3];
+                const left = [];
+                const right = [];
+                const s0 = -0.75 + k * 0.7 + (i % 2) * 0.12;
+                for (let j = 0; j <= 10; j++) {
+                    const u = j / 10;
+                    const lat = s0 + 0.5 * u;
+                    const w = 0.1 + 0.16 * Math.sin(Math.PI * u) ** 0.8;
+                    left.push(at(i, 0.12 + 0.76 * u, lat));
+                    right.push(at(i, 0.12 + 0.76 * u, lat + w));
+                }
+                out += s.panel([...left, ...right.reverse()], c, { n: 1 });
+            }
+        }
+        out += s.strokes(g.seams, GREY, 0.85);
+        return out + lit(s, g.seams, 0.5);
+    },
+});
+/** The late 2010s: six panels covered with square pixel blocks, thick where the ball is dark and thinning out toward the lighter side. */
+export const BALL_SOCCER_2018_PIXEL = /* @__PURE__ */ ball("ball:soccer-2018-pixel", "Soccer, pixel blocks", "ピクセル柄", {
+    view: { yaw: 20, pitch: 22, roll: 0 },
+    base: "#2a2f3a",
+    ground: "#f2f2ee",
+    mat: { gloss: 0.9, shade: "#2a3450", grain: { f: 0.7, a: 0.07 } },
+    draw(s, base, accent) {
+        const { g, out: panels } = sixGores(s, [0, 0, 28], "#e7e7e1", 90);
+        const pal = [base, mix(base, 0.4), accent ?? "#d4472f", "#e6b53a", mix(base, 0.4)];
+        let out = panels;
+        const groups = pal.map(() => []);
+        const rows = 17, cols = 34;
+        for (let r = 1; r < rows - 1; r++) {
+            for (let c = 0; c < cols; c++) {
+                const lon = (2 * Math.PI * c) / cols, lat = Math.PI * (r / rows - 0.5);
+                // Dense on one side (longitude near 0.8 turns), a few scattered elsewhere.
+                const band = Math.cos(lon - 3.2 * lat - 4.1);
+                const density = band > 0 ? 0.04 + 0.8 * band ** 0.9 : 0.02;
+                if (noise(r, c) > density)
+                    continue;
+                const d = (Math.PI / cols) * 1.7, e = (Math.PI / rows) * 0.85;
+                const corner = (a, b) => [Math.sin(lon + a) * Math.cos(lat + b), Math.sin(lat + b), Math.cos(lon + a) * Math.cos(lat + b)];
+                const k = Math.floor(noise(c, r + 50) * pal.length);
+                groups[k].push([corner(0, 0), corner(d, 0), corner(d, e), corner(0, e)]);
+            }
+        }
+        pal.forEach((c, k) => {
+            out += s.panels(groups[k], c, { n: 1, ink: k === 0 });
+        });
+        out += s.strokes(g.seams, GREY, 0.85);
+        return out + lit(s, g.seams, 0.5);
+    },
+});
+/** The early 2020s: twenty triangles (an icosahedron) in three warm tones, each carrying a shell of nested edges and a trail of speed lines. */
+export const BALL_SOCCER_2022_SPEED_SHELL = /* @__PURE__ */ ball("ball:soccer-2022-speed-shell", "Soccer, 20-panel shell", "20枚貼り・貝殻柄", {
+    view: { yaw: 30, pitch: 24, roll: 8 },
+    base: "#8c1d3b",
+    ground: "#f1ece0",
+    mat: GLOSS,
+    draw(s, base, accent) {
+        const g = icosahedron();
+        const gold = accent ?? "#d9a93a";
+        const fill = [mix(base, 0.0), "#f1ece0", gold, mix(base, 0.35)];
+        let out = "";
+        fill.forEach((c, k) => {
+            out += s.panels(g.panels.filter((_, i) => g.colour[i] === k), c, { n: 4, ink: k === 0 });
+        });
+        g.panels.forEach((p, i) => {
+            const inner = g.colour[i] === 0 ? "#f1ece0" : base;
+            for (const k of [0.3, 0.58])
+                out += s.strokes([shrink(p, g.centres[i], k)], inner, 0.45, { closed: true, deco: true, opacity: 0.85 });
+        });
+        out += s.strokes(g.seams, mix(base, -0.5), 1.1);
+        return out + lit(s, g.seams);
+    },
+});
+/** A modern high-visibility training ball: 32 panels in fluorescent yellow-green, hot pink pentagons ringed in black, and three dark speed marks across each hexagon. */
+export const BALL_SOCCER_TRAINING_HIGH_VIS = /* @__PURE__ */ ball("ball:soccer-training-high-vis", "Soccer, high-vis training", "蛍光トレーニングボール", {
+    view: VIEW,
+    base: "#ff2f7d",
+    ground: "#d8f21f",
+    mat: { gloss: 0.7, shade: "#3a5010", grain: { f: 1.3, a: 0.2 } },
+    draw(s, base, accent) {
+        const t = truncatedIcosahedron();
+        let out = "";
+        for (const p of t.pentagons)
+            out += s.panel(p, base, { ink: true });
+        t.pentagons.forEach((p, i) => {
+            out += s.strokes([shrink(p, t.pentagonCentres[i], 0.4)], accent ?? INK, 0.7, { closed: true, deco: true });
+        });
+        const dash = [[-0.1, -0.06], [0.1, -0.06], [0.1, -0.035], [-0.1, -0.035]];
+        const moved = dash.map(([x, y]) => [x + 0.05, y - 0.04]);
+        out += s.panels(hexFrames(t).flatMap((f) => [0, 1, 2].map((k) => place(f, turned(moved, (2 * Math.PI * k) / 3 + 0.5)))), accent ?? INK, { n: 1 });
+        out += s.strokes(t.edges, "#6d8a10", 1.1);
+        return out + lit(s, t.edges);
+    },
+});

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

@@ -0,0 +1,19 @@
+import { type BallSpec } from "./ball.engine.ts";
+export declare const BALL_SOCCER_STARS_BLUE: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_STARS_RED: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_STARS_NIGHT: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_HEXAGONS_CYAN: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_HEXAGONS_MAGENTA: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_HEXAGONS_LIME: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_FLAMES_FIRE: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_FLAMES_ICE: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_FLAMES_TOXIC: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_CHEVRONS_RED: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_CHEVRONS_GREEN: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_CHEVRONS_BLUE: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_SWIRL_BLUE: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_SWIRL_RED: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_SWIRL_TEAL: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_METALLIC_GOLD: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_METALLIC_SILVER: import("./ball.core.ts").Piece<BallSpec>;
+export declare const BALL_SOCCER_METALLIC_COBALT: import("./ball.core.ts").Piece<BallSpec>;