render side art as stacked per-color layers (fixes torn right panel, much lighter layout)
Deploy / deploy (push) Successful in 3s

This commit is contained in:
2026-10-03 16:41:17 +02:00
parent f33c753b23
commit bb1ee4e3dd
3 changed files with 35 additions and 20 deletions
+5 -4
View File
@@ -213,12 +213,13 @@ button {
pointer-events: none;
user-select: none;
}
.side i { font-style: normal; }
/* the art comes as one layer per color, stacked */
.side { display: grid; }
.side > span { grid-area: 1 / 1; direction: ltr; unicode-bidi: isolate; }
.side-left { left: 0; }
/* rtl only so the right panel clips on its inner edge; the art itself stays
ltr, or the bidi algorithm reorders runs of punctuation */
/* rtl only so the right panel clips on its inner edge; the layers stay ltr
(above), or the bidi algorithm reorders runs of punctuation */
.side-right { right: 0; direction: rtl; }
.side-right > span { direction: ltr; unicode-bidi: isolate; }
/* the column's shadow: the art fades out under it instead of stopping dead
beside the text. Eased falloff, as wide as about a third of the margin. */
+29 -15
View File
@@ -43,7 +43,7 @@ function ansi_html_cached(string $file, bool $mirror = false): string
{
$dir = (defined('DATA_DIR') ? DATA_DIR : sys_get_temp_dir()) . '/art-cache';
$base = $dir . '/' . md5($file . '|' . (int) $mirror);
$key = $base . '-' . filemtime($file) . '.html';
$key = $base . '-' . filemtime($file) . '-layers.html'; // bump the suffix when the markup changes
if (is_file($key)) {
return (string) file_get_contents($key);
}
@@ -79,23 +79,37 @@ function ansi_html(string $file, bool $mirror = false): string
}
$width = max(array_map('count', $lines) ?: [0]);
$out = [];
foreach ($lines as $cells) {
foreach ($lines as &$cells) {
$cells = array_pad($cells, $width, [' ', null]);
if ($mirror) {
$cells = array_map(static fn($c) => [$flip[$c[0]] ?? $c[0], $c[1]], array_reverse($cells));
}
$html = '';
$open = null;
foreach ($cells as [$ch, $color]) {
// blanks have no color of their own; let them ride along in the open run
if ($ch !== ' ' && $color !== $open) {
$html .= ($open !== null ? '</i>' : '') . ($color !== null ? "<i style=\"color:#$color\">" : '');
$open = $color;
}
$html .= htmlspecialchars($ch);
}
$out[] = $html . ($open !== null ? '</i>' : '');
}
return implode("\n", $out);
unset($cells);
// One full-size text layer per color, holding only that color's
// characters; CSS stacks them. A few dozen elements instead of a span per
// color run (thousands), which is what made the art slow to lay out.
$colors = [];
foreach ($lines as $cells) {
foreach ($cells as [$ch, $color]) {
if ($ch !== ' ') {
$colors[$color ?? ''] = true;
}
}
}
$html = '';
foreach (array_keys($colors) as $color) {
$rows = [];
foreach ($lines as $cells) {
$row = '';
foreach ($cells as [$ch, $c]) {
$row .= ($ch !== ' ' && ($c ?? '') === $color) ? $ch : ' ';
}
$rows[] = $row;
}
$style = $color !== '' ? " style=\"color:#$color\"" : '';
$html .= "<span$style>" . htmlspecialchars(implode("\n", $rows)) . '</span>';
}
return $html;
}
+1 -1
View File
@@ -12,6 +12,6 @@ $build = preg_match('/[0-9a-f]{7,40}/i', $build, $m) ? $m[0] : ($build ?: 'dev')
</footer>
<?php require_once __DIR__ . '/art.php'; ?>
<pre class="side side-left" aria-hidden="true"><?= ansi_html_cached(__DIR__ . '/art/sakura.ans') ?></pre>
<pre class="side side-right" aria-hidden="true"><span><?= ansi_html_cached(__DIR__ . '/art/sakura.ans', mirror: true) ?></span></pre>
<pre class="side side-right" aria-hidden="true"><?= ansi_html_cached(__DIR__ . '/art/sakura.ans', mirror: true) ?></pre>
</body>
</html>