fix(engine): render card suit glyphs as SVG paths instead of text
The user's first post-migration screenshot showed near-invisible suit glyphs on every card — the rank rendered at correct size but the ♠ ♥ ♦ ♣ marks were tiny dots regardless of the requested 20px / 64px font-size. Root cause: the bundled FiraMono in svg_loader::shared_fontdb doesn't carry usable Unicode suit glyphs (U+2660-2666). usvg silently fell back to a substitute rendering at default size, producing the "tofu" effect. Fixes by replacing the `<text>` glyph rendering with inline SVG paths. `suit_path_d(suit)` returns a single closed-perimeter path authored in a 32 × 32 logical box, then face_svg wraps it in two `<g transform>` blocks (top-left small + bottom-right rotated large). Path-based rendering bypasses the font system entirely — same bytes on every machine, no fontdb dependency, no substitution risk. Same path data renders correctly whether filled (♥ ♠) or outlined (♦ ♣ — the always-on color-blind glyph differentiation from the design system). Knock-on changes that must land in this commit per the migration plan's lockstep rule: - `EXPECTED` in tests/card_face_svg_pin.rs rebaselined: 52 face hashes change (text → path), 5 back hashes unchanged (back_svg untouched). The bootstrap pattern in the test handled the rebaseline cleanly — empty EXPECTED, re-run, paste, re-run. - assets/cards/faces/*.png regenerated (the 52 face PNGs). - solitaire_engine/assets/themes/default/*_*.svg regenerated (the 52 theme face SVGs that production rasterises at startup). Both rendering paths must agree. Workspace clippy + cargo test --workspace clean. Pin test passes against the new hashes. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -24,58 +24,58 @@ use solitaire_engine::assets::card_face_svg::{
|
||||
use solitaire_engine::assets::rasterize_svg;
|
||||
|
||||
const EXPECTED: &[(&str, u64)] = &[
|
||||
("face_AC", 0xca11dff5bb9f0eb0),
|
||||
("face_2C", 0xc929a25f0f217577),
|
||||
("face_3C", 0xdaede8383266b5c3),
|
||||
("face_4C", 0xeaa3ea51866f69e5),
|
||||
("face_5C", 0xe5a74589cb09cc5c),
|
||||
("face_6C", 0xdbbc1036895ee08e),
|
||||
("face_7C", 0xb8a28119a85ccf5d),
|
||||
("face_8C", 0xab4d19ce4b8d15e7),
|
||||
("face_9C", 0x17c95eb07f382059),
|
||||
("face_10C", 0x1f1b2c84e42211b1),
|
||||
("face_JC", 0xd87c45124df8b03d),
|
||||
("face_QC", 0xe23701b6685994b2),
|
||||
("face_KC", 0xc628e55b8a15472a),
|
||||
("face_AD", 0x49a140d84b0a731b),
|
||||
("face_2D", 0x713f755b5ecfb67a),
|
||||
("face_3D", 0xe59a72abc47af7d4),
|
||||
("face_4D", 0xf75ac828822079d1),
|
||||
("face_5D", 0x6db0cc9a5849395f),
|
||||
("face_6D", 0x9b034cf6851512de),
|
||||
("face_7D", 0x85f96e0326780a6e),
|
||||
("face_8D", 0x59ec5533b615ecd4),
|
||||
("face_9D", 0x3689911671b30921),
|
||||
("face_10D", 0x682684217e3e8b60),
|
||||
("face_JD", 0xd999f85e6862c5a7),
|
||||
("face_QD", 0x6db493a3b370b211),
|
||||
("face_KD", 0x4c2ec19166fdee7b),
|
||||
("face_AH", 0x0d41c498281b9a74),
|
||||
("face_2H", 0xec6493b71d4576b1),
|
||||
("face_3H", 0xd2fb4b5956caf15b),
|
||||
("face_4H", 0xfbe8e1eaa2b28c5a),
|
||||
("face_5H", 0x649a0964e549f008),
|
||||
("face_6H", 0xa10fa42b5549fc85),
|
||||
("face_7H", 0x6823107295c149b5),
|
||||
("face_8H", 0x474d2de14865e65b),
|
||||
("face_9H", 0x1b0de1af8dae108a),
|
||||
("face_10H", 0x451fd5855859c9d7),
|
||||
("face_JH", 0xd821a7d4c79a37e0),
|
||||
("face_QH", 0xde0c6ef7e963861a),
|
||||
("face_KH", 0xe29039cb6a115214),
|
||||
("face_AS", 0x1697fbcc61b64e0f),
|
||||
("face_2S", 0x5ada7ea3e39547d0),
|
||||
("face_3S", 0x6d8eed531f2d659c),
|
||||
("face_4S", 0x1b1a2d25e080d71e),
|
||||
("face_5S", 0x5eb82baa4f9a74bb),
|
||||
("face_6S", 0xa00b217892d32ead),
|
||||
("face_7S", 0xaf60935ec8d93346),
|
||||
("face_8S", 0xffbde852d8699a80),
|
||||
("face_9S", 0x8f68afa04b88e1a2),
|
||||
("face_10S", 0x96fa4a08f168210a),
|
||||
("face_JS", 0x73030a8109b5b5e6),
|
||||
("face_QS", 0x303eb6c33e363cc1),
|
||||
("face_KS", 0x3ed5b5a9432c91e9),
|
||||
("face_AC", 0x79b449cb455e496d),
|
||||
("face_2C", 0x10a1056c4800c45e),
|
||||
("face_3C", 0xbd128e390e06673a),
|
||||
("face_4C", 0x949c323c78a804c0),
|
||||
("face_5C", 0xd396d5ed99fb57e9),
|
||||
("face_6C", 0x15519c6d72d1720f),
|
||||
("face_7C", 0xc24bdc1a2d380d78),
|
||||
("face_8C", 0x36464f4ab4cf672e),
|
||||
("face_9C", 0x32add2eb53b1aec4),
|
||||
("face_10C", 0x68619202f29481fc),
|
||||
("face_JC", 0x116b3eeac58e0f58),
|
||||
("face_QC", 0xb149ab5b2cac85e3),
|
||||
("face_KC", 0x2a9fd2c63b99bd3b),
|
||||
("face_AD", 0xe49c3fec2c01817c),
|
||||
("face_2D", 0x8f42b4014e0d6809),
|
||||
("face_3D", 0x63ff77fa873c557b),
|
||||
("face_4D", 0x33356bd9628daaf2),
|
||||
("face_5D", 0x8897839054dbd808),
|
||||
("face_6D", 0x03ff93fb0c05a195),
|
||||
("face_7D", 0xc2b7f97f5b1cc545),
|
||||
("face_8D", 0xd8515a8278d74a7b),
|
||||
("face_9D", 0xfbfe52ec3bbd2962),
|
||||
("face_10D", 0x8f2dfc06a1d55a2f),
|
||||
("face_JD", 0x3941d34384607530),
|
||||
("face_QD", 0x0dcf5a9e2fc99f02),
|
||||
("face_KD", 0xb834cb89d80bd39c),
|
||||
("face_AH", 0x1a2e6d2ac818093f),
|
||||
("face_2H", 0x8ab9ad7d2111233e),
|
||||
("face_3H", 0x5e1057fa87c90968),
|
||||
("face_4H", 0x1e1550b0af8a35a5),
|
||||
("face_5H", 0x77404642251596d3),
|
||||
("face_6H", 0xf7bec77bcbb9f942),
|
||||
("face_7H", 0x9b7c52a5c03fb4f2),
|
||||
("face_8H", 0xd2623a827963fe68),
|
||||
("face_9H", 0xec19380e53986015),
|
||||
("face_10H", 0x1205d0ec042a7484),
|
||||
("face_JH", 0xd28bf03e6e871ccb),
|
||||
("face_QH", 0x78548704b4530c65),
|
||||
("face_KH", 0x9708e6c2d9c3bedf),
|
||||
("face_AS", 0xebabc54128f38105),
|
||||
("face_2S", 0xaac2970387b18ffe),
|
||||
("face_3S", 0xb0864e78a6802bea),
|
||||
("face_4S", 0xd118bc992bd41330),
|
||||
("face_5S", 0x7fb7d6040d9b0641),
|
||||
("face_6S", 0xbc048e82f1079637),
|
||||
("face_7S", 0x147ee7c002e43648),
|
||||
("face_8S", 0xfed30db056fbaa8e),
|
||||
("face_9S", 0x332bc2060d8fcca4),
|
||||
("face_10S", 0x0b810ffaf105421c),
|
||||
("face_JS", 0x2ea7b956f2f23c28),
|
||||
("face_QS", 0xedca2e002087ae6b),
|
||||
("face_KS", 0x92e486d4e96ac4a3),
|
||||
("back_0", 0xf698d0e161eae13a),
|
||||
("back_1", 0x446fdc0a3c83a03a),
|
||||
("back_2", 0xcf188fdec9f5819a),
|
||||
|
||||
Reference in New Issue
Block a user