jaildesigner-jailgames/aee-arcade
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(core/rendering): deduplicar Text::write* i nomenar magic numbers (DUP-03 + HC-01)

Browse Source 
Text tenia cinc mètodes (write, writeColored, writeMonoDigits, length,
lengthMonoDigits) i dos getters (glyphWidth, getGlyphClip) que repetien
el mateix patró de resolució de codepoint: find(cp), fallback a '?' si
no hi és. Extret a un helper privat resolveGlyph(cp) que centralitza
aquesta lògica; totes les funcions passen a usar-lo.

write() ara delega directament a writeColored(...) passant el color per
defecte, eliminant ~19 línies del bucle UTF-8 duplicades.

Els literals 1 (índex de "tinta" al PNG) i 15 (color per defecte a la
paleta) passen a ser Text::INK_COLOR_INDEX i Text::DEFAULT_TEXT_COLOR
(HC-01).

Build + smoke 5s xvfb OK (exit 124).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
JailDesignerandClaude Opus 4.7 committed 2026-04-20 09:32:37 +02:00
1 parent 5f46fb22a4
commit a63deac6a3
3 files changed
+47 -53
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/core/rendering/text.cpp
+31 -49
View File
@@ -140,27 +140,10 @@ Text::Text(const std::shared_ptr<Surface>& surface, const std::shared_ptr<File>&
offset_(text_file->offset) {
}
// Dibuixa la cadena amb la tinta per defecte (codi 15 a la paleta del png).
// Els glifs amb codepoint no registrat es substitueixen pel glif '?'.
// Dibuixa la cadena amb la tinta per defecte. Els glifs amb codepoint no
// registrat es substitueixen pel glif '?'.
void Text::write(int x, int y, const std::string& text, int kerning, int length) {
int shift = 0;
int glyphs_done = 0;
std::size_t pos = 0;
sprite_->setY(static_cast<float>(y));
while (pos < text.size()) {
if (length != -1 && glyphs_done >= length) { break; }
std::uint32_t cp = nextCodepoint(text, pos);
auto it = offset_.find(cp);
if (it == offset_.end()) { it = offset_.find('?'); }
if (it != offset_.end()) {
sprite_->setClip(static_cast<float>(it->second.x), static_cast<float>(it->second.y), static_cast<float>(box_width_), static_cast<float>(box_height_));
sprite_->setX(static_cast<float>(x + shift));
sprite_->render(1, 15);
shift += it->second.w + kerning;
}
++glyphs_done;
}
writeColored(x, y, text, DEFAULT_TEXT_COLOR, kerning, length);
}
void Text::writeColored(int x, int y, const std::string& text, Uint8 color, int kerning, int length) {
@@ -172,13 +155,11 @@ void Text::writeColored(int x, int y, const std::string& text, Uint8 color, int
while (pos < text.size()) {
if (length != -1 && glyphs_done >= length) { break; }
std::uint32_t cp = nextCodepoint(text, pos);
auto it = offset_.find(cp);
if (it == offset_.end()) { it = offset_.find('?'); }
if (it != offset_.end()) {
sprite_->setClip(static_cast<float>(it->second.x), static_cast<float>(it->second.y), static_cast<float>(box_width_), static_cast<float>(box_height_));
if (const Offset* off = resolveGlyph(cp); off != nullptr) {
sprite_->setClip(static_cast<float>(off->x), static_cast<float>(off->y), static_cast<float>(box_width_), static_cast<float>(box_height_));
sprite_->setX(static_cast<float>(x + shift));
sprite_->render(1, color);
shift += it->second.w + kerning;
sprite_->render(INK_COLOR_INDEX, color);
shift += off->w + kerning;
}
++glyphs_done;
}
@@ -235,21 +216,20 @@ void Text::writeMonoDigits(int x, int y, const std::string& text, Uint8 color, i
sprite_->setY(static_cast<float>(y));
while (pos < text.size()) {
std::uint32_t cp = nextCodepoint(text, pos);
auto it = offset_.find(cp);
if (it == offset_.end()) { it = offset_.find('?'); }
if (it == offset_.end()) { continue; }
const Offset* off = resolveGlyph(cp);
if (off == nullptr) { continue; }
const bool IS_DIGIT = (cp >= '0' && cp <= '9');
const int GLYPH_W = it->second.w;
const int GLYPH_W = off->w;
const int CELL_W = IS_DIGIT ? digit_cell_w : GLYPH_W;
const int GLYPH_X = IS_DIGIT ? x + shift + ((CELL_W - GLYPH_W) / 2) : x + shift;
sprite_->setClip(static_cast<float>(it->second.x),
static_cast<float>(it->second.y),
sprite_->setClip(static_cast<float>(off->x),
static_cast<float>(off->y),
static_cast<float>(box_width_),
static_cast<float>(box_height_));
sprite_->setX(static_cast<float>(GLYPH_X));
sprite_->render(1, color);
sprite_->render(INK_COLOR_INDEX, color);
shift += CELL_W + kerning;
}
@@ -261,12 +241,11 @@ auto Text::lengthMonoDigits(const std::string& text, int digit_cell_w, int kerni
while (pos < text.size()) {
std::uint32_t cp = nextCodepoint(text, pos);
auto it = offset_.find(cp);
if (it == offset_.end()) { it = offset_.find('?'); }
if (it == offset_.end()) { continue; }
const Offset* off = resolveGlyph(cp);
if (off == nullptr) { continue; }
const bool IS_DIGIT = (cp >= '0' && cp <= '9');
shift += (IS_DIGIT ? digit_cell_w : it->second.w) + kerning;
shift += (IS_DIGIT ? digit_cell_w : off->w) + kerning;
}
return shift > 0 ? shift - kerning : 0;
@@ -278,10 +257,8 @@ auto Text::length(const std::string& text, int kerning) const -> int {
while (pos < text.size()) {
std::uint32_t cp = nextCodepoint(text, pos);
auto it = offset_.find(cp);
if (it == offset_.end()) { it = offset_.find('?'); }
if (it != offset_.end()) {
shift += it->second.w + kerning;
if (const Offset* off = resolveGlyph(cp); off != nullptr) {
shift += off->w + kerning;
}
}
@@ -289,18 +266,23 @@ auto Text::length(const std::string& text, int kerning) const -> int {
}
auto Text::glyphWidth(std::uint32_t codepoint, int kerning) const -> int {
auto it = offset_.find(codepoint);
if (it == offset_.end()) { it = offset_.find('?'); }
if (it != offset_.end()) { return it->second.w + kerning; }
if (const Offset* off = resolveGlyph(codepoint); off != nullptr) {
return off->w + kerning;
}
return 0;
}
auto Text::getGlyphClip(std::uint32_t codepoint) const -> SDL_FRect {
auto it = offset_.find(codepoint);
if (it == offset_.end()) { it = offset_.find('?'); }
if (it == offset_.end()) { return {.x = 0.0F, .y = 0.0F, .w = 0.0F, .h = 0.0F}; }
return {.x = static_cast<float>(it->second.x),
.y = static_cast<float>(it->second.y),
const Offset* off = resolveGlyph(codepoint);
if (off == nullptr) { return {.x = 0.0F, .y = 0.0F, .w = 0.0F, .h = 0.0F}; }
return {.x = static_cast<float>(off->x),
.y = static_cast<float>(off->y),
.w = static_cast<float>(box_width_),
.h = static_cast<float>(box_height_)};
}
auto Text::resolveGlyph(std::uint32_t cp) const -> const Offset* {
auto it = offset_.find(cp);
if (it == offset_.end()) { it = offset_.find('?'); }
return (it != offset_.end()) ? &it->second : nullptr;
}
source/core/rendering/text.hpp
+11
View File
@@ -36,6 +36,13 @@ class Text {
static constexpr Uint8 CENTER_FLAG = 4;
static constexpr Uint8 STROKE_FLAG = 8;
// Índex del píxel "tinta" al PNG de la font. Els glifs són monocroms
// sobre transparent i tots els píxels opacs usen aquest índex; la Surface
// el recolora al vol per a emetre el color destí.
static constexpr Uint8 INK_COLOR_INDEX = 1;
// Color per defecte a la paleta quan s'usa write() sense especificar-lo.
static constexpr Uint8 DEFAULT_TEXT_COLOR = 15;
Text(const std::shared_ptr<Surface>& surface, const std::string& text_file);
Text(const std::shared_ptr<Surface>& surface, const std::shared_ptr<File>& text_file);
~Text() = default;
@@ -68,6 +75,10 @@ class Text {
static auto nextCodepoint(const std::string& s, std::size_t& pos) -> std::uint32_t;
private:
// Busca l'Offset del codepoint; si no hi és, cau al glif '?' com a
// substitut. Retorna nullptr si tampoc hi ha '?'.
[[nodiscard]] auto resolveGlyph(std::uint32_t cp) const -> const Offset*;
std::unique_ptr<Sprite> sprite_;
int box_width_{0};
int box_height_{0};