From 3551c2d8b761dc8af4b0ea817872d7a1d526afa4 Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Thu, 18 Apr 2024 19:14:41 +0200 Subject: [PATCH] HUD: Text element color support --- games/devtest/mods/testhud/init.lua | 2 ++ src/client/hud.cpp | 24 ++++++++++++++++++------ src/gui/guiFormSpecMenu.cpp | 7 +------ src/util/enriched_string.cpp | 15 +++++++++++++++ src/util/enriched_string.h | 1 + 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/games/devtest/mods/testhud/init.lua b/games/devtest/mods/testhud/init.lua index 5fdae3d38..9afed8fc7 100644 --- a/games/devtest/mods/testhud/init.lua +++ b/games/devtest/mods/testhud/init.lua @@ -8,6 +8,8 @@ local font_states = { {4, "Monospace font"}, {5, "Bold and monospace font"}, {7, "ZOMG all the font styles"}, + {7, "Colors test! " .. minetest.colorize("green", "Green") .. + minetest.colorize("red", "\nRed") .. " END"}, } diff --git a/src/client/hud.cpp b/src/client/hud.cpp index e1641366e..b18beb978 100644 --- a/src/client/hud.cpp +++ b/src/client/hud.cpp @@ -40,6 +40,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "client/renderingengine.h" #include "client/minimap.h" #include "gui/touchscreengui.h" +#include "util/enriched_string.h" +#include "irrlicht_changes/CGUITTFont.h" #define OBJECT_CROSSHAIR_LINE_SIZE 8 #define CROSSHAIR_LINE_SIZE 10 @@ -377,10 +379,14 @@ void Hud::drawLuaElements(const v3s16 &camera_offset) (e->style & HUD_STYLE_MONO) ? FM_Mono : FM_Unspecified, e->style & HUD_STYLE_BOLD, e->style & HUD_STYLE_ITALIC)); + irr::gui::CGUITTFont *ttfont = nullptr; + if (textfont->getType() == irr::gui::EGFT_CUSTOM) + ttfont = static_cast(textfont); + video::SColor color(255, (e->number >> 16) & 0xFF, (e->number >> 8) & 0xFF, (e->number >> 0) & 0xFF); - std::wstring text = unescape_translate(utf8_to_wide(e->text)); + EnrichedString text(unescape_string(utf8_to_wide(e->text)), color); core::dimension2d textsize = textfont->getDimension(text.c_str()); v2s32 offset(0, (e->align.Y - 1.0) * (textsize.Height / 2)); @@ -388,13 +394,19 @@ void Hud::drawLuaElements(const v3s16 &camera_offset) text_height * e->scale.Y * m_scale_factor); v2s32 offs(e->offset.X * m_scale_factor, e->offset.Y * m_scale_factor); - std::wstringstream wss(text); - std::wstring line; - while (std::getline(wss, line, L'\n')) - { + + // Draw each line + // See also: GUIFormSpecMenu::parseLabel + size_t str_pos = 0; + while (str_pos < text.size()) { + EnrichedString line = text.getNextLine(&str_pos); + core::dimension2d linesize = textfont->getDimension(line.c_str()); v2s32 line_offset((e->align.X - 1.0) * (linesize.Width / 2), 0); - textfont->draw(line.c_str(), size + pos + offset + offs + line_offset, color); + if (ttfont) + ttfont->draw(line, size + pos + offset + offs + line_offset); + else + textfont->draw(line.c_str(), size + pos + offset + offs + line_offset, color); offset.Y += linesize.Height; } break; } diff --git a/src/gui/guiFormSpecMenu.cpp b/src/gui/guiFormSpecMenu.cpp index 0c616967c..fe0aa2930 100644 --- a/src/gui/guiFormSpecMenu.cpp +++ b/src/gui/guiFormSpecMenu.cpp @@ -1771,12 +1771,7 @@ void GUIFormSpecMenu::parseLabel(parserData* data, const std::string &element) size_t str_pos = 0; for (size_t i = 0; str_pos < str.size(); ++i) { - // Split per line - size_t str_nl = str.getString().find(L'\n', str_pos); - if (str_nl == std::wstring::npos) - str_nl = str.getString().size(); - EnrichedString line = str.substr(str_pos, str_nl - str_pos); - str_pos += line.size() + 1; + EnrichedString line = str.getNextLine(&str_pos); core::rect rect; diff --git a/src/util/enriched_string.cpp b/src/util/enriched_string.cpp index 7edbf8eb7..04c5ef806 100644 --- a/src/util/enriched_string.cpp +++ b/src/util/enriched_string.cpp @@ -166,6 +166,21 @@ void EnrichedString::operator+=(const EnrichedString &other) } } +EnrichedString EnrichedString::getNextLine(size_t *pos) const +{ + size_t str_pos = *pos; + + // Split per line + size_t str_nl = getString().find(L'\n', str_pos); + if (str_nl == std::wstring::npos) + str_nl = getString().size(); + EnrichedString line = substr(str_pos, str_nl - str_pos); + str_pos += line.size() + 1; + + *pos = str_pos; + return line; +} + EnrichedString EnrichedString::substr(size_t pos, size_t len) const { if (pos >= m_string.length()) diff --git a/src/util/enriched_string.h b/src/util/enriched_string.h index b48408ac6..3d19eaed5 100644 --- a/src/util/enriched_string.h +++ b/src/util/enriched_string.h @@ -49,6 +49,7 @@ public: // color. The color used will be the one from the last character. void addCharNoColor(wchar_t c); + EnrichedString getNextLine(size_t *pos) const; EnrichedString substr(size_t pos = 0, size_t len = std::string::npos) const; EnrichedString operator+(const EnrichedString &other) const; void operator+=(const EnrichedString &other);