Improve text centering accuracy

PiratesAhoy · Nov 27, 2023 · 8489c0a · 8489c0a
1 parent 2ec1507
commit 8489c0a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/libs/renderer/src/s_device.cpp b/src/libs/renderer/src/s_device.cpp
@@ -2906,7 +2906,7 @@ int32_t DX9RENDER::ExtPrint(int32_t nFontNum, uint32_t foreColor, uint32_t backC
     switch (wAlign)
     {
     case PR_ALIGN_CENTER:
-        x -= static_cast<int32_t>((pFont->GetStringWidth(Buff_4k, {.scale = fScale}) + 1L) / 2L);
+        x -= static_cast<int32_t>(pFont->GetStringWidth(Buff_4k, {.scale = fScale}) / 2);
         break;
     case PR_ALIGN_RIGHT:
         x -= static_cast<int32_t>(pFont->GetStringWidth(Buff_4k, {.scale = fScale}));

diff --git a/src/libs/renderer/src/storm/bmfont/bmfont.cpp b/src/libs/renderer/src/storm/bmfont/bmfont.cpp
@@ -129,7 +129,7 @@ size_t BmFont::GetStringWidth(const std::string_view &text, const FontPrintOverr
         previous = codepoint;
     }
 
-    return static_cast<int32_t>(xoffset);
+    return std::lround(xoffset);
 }
 
 size_t BmFont::GetHeight() const
@@ -290,6 +290,10 @@ BmFont::UpdateVertexBufferResult BmFont::UpdateVertexBuffer(float x, float y, co
     {
         char32_t codepoint = utf8::Utf8ToCodepoint(text.data() + i);
 
+        if (codepoint == 10 || codepoint == 13) {
+            continue;
+        }
+
         const BmCharacter *character = GetCharacter(codepoint);
 
         if (character == nullptr) {