Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Do not render fonticons if cursor is inside the fonticon text and properly render cursor

Browse Source
This commit is contained in:
Jan 2021-09-06 17:02:17 +02:00
parent 69352103b8
commit 10964ba059
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/Components/Modules/TextRenderer.cpp
View File

@ -123,7 +123,7 @@ namespace Components
Game::RB_DrawStretchPicRotate(material, x, y, w, h, static_cast<float>(charIndex % 16) * 0.0625f, 0.0f, static_cast<float>(charIndex % 16) * 0.0625f + 0.0625f, 1.0f, sinAngle, cosAngle, color); Game::RB_DrawStretchPicRotate(material, x, y, w, h, static_cast<float>(charIndex % 16) * 0.0625f, 0.0f, static_cast<float>(charIndex % 16) * 0.0625f + 0.0625f, 1.0f, sinAngle, cosAngle, color);
} }
Game::GfxImage* TextRenderer::GetFontIconColorMap(Game::Material* fontIconMaterial) Game::GfxImage* TextRenderer::GetFontIconColorMap(const Game::Material* fontIconMaterial)
{ {
for (auto i = 0u; i < fontIconMaterial->textureCount; i++) for (auto i = 0u; i < fontIconMaterial->textureCount; i++)
{ {
@ -186,6 +186,14 @@ namespace Components
return true; return true;
} }
float TextRenderer::GetFontIconWidth(const FontIconInfo& fontIcon, const Game::Font_s* font, const float xScale)
{
const auto* colorMap = GetFontIconColorMap(fontIcon.material);
if (colorMap == nullptr)
return 0;
return static_cast<float>(font->pixelHeight) * (static_cast<float>(colorMap->width) / static_cast<float>(colorMap->height)) * xScale;
}
float TextRenderer::DrawFontIcon(const FontIconInfo& fontIcon, const float x, const float y, const float sinAngle, const float cosAngle, const Game::Font_s* font, const float xScale, const float yScale, const unsigned color) float TextRenderer::DrawFontIcon(const FontIconInfo& fontIcon, const float x, const float y, const float sinAngle, const float cosAngle, const Game::Font_s* font, const float xScale, const float yScale, const unsigned color)
{ {
const auto* colorMap = GetFontIconColorMap(fontIcon.material); const auto* colorMap = GetFontIconColorMap(fontIcon.material);
@ -407,15 +415,28 @@ namespace Components
if(letter == ':') if(letter == ':')
{ {
FontIconInfo fontIconInfo{}; FontIconInfo fontIconInfo{};
if(IsFontIcon(curText, fontIconInfo)) const char* fontIconEnd = curText;
if(IsFontIcon(fontIconEnd, fontIconInfo) && !(renderFlags & Game::TEXT_RENDERFLAG_CURSOR && cursorPos > count && cursorPos <= count + (fontIconEnd - curText)))
{ {
RotateXY(cosAngle, sinAngle, startX, startY, xa, xy, &xRot, &yRot); RotateXY(cosAngle, sinAngle, startX, startY, xa, xy, &xRot, &yRot);
xa += DrawFontIcon(fontIconInfo, xRot, yRot, sinAngle, cosAngle, font, xScale, yScale, ColorRgba(255, 255, 255, finalColor.array[3]));
if(passes[passIndex] == Game::FONTPASS_NORMAL)
{
const auto fontIconWidth = DrawFontIcon(fontIconInfo, xRot, yRot, sinAngle, cosAngle, font, xScale, yScale, ColorRgba(255, 255, 255, finalColor.array[3]));
if (renderFlags & Game::TEXT_RENDERFLAG_CURSOR && count == cursorPos)
Game::RB_DrawCursor(material, cursorLetter, xRot, yRot, sinAngle, cosAngle, font, xScale, yScale, color.packed);
xa += fontIconWidth;
}
else
{
xa += GetFontIconWidth(fontIconInfo, font, xScale);
}
if (renderFlags & Game::TEXT_RENDERFLAG_PADDING) if (renderFlags & Game::TEXT_RENDERFLAG_PADDING)
xa += xScale * padding; xa += xScale * padding;
++count; count += (fontIconEnd - curText) + 1;
maxLengthRemaining--; maxLengthRemaining--;
curText = fontIconEnd;
continue; continue;
} }
} }

3
src/Components/Modules/TextRenderer.hpp
View File

@ -77,13 +77,14 @@ namespace Components
public: public:
static void DrawText2D(const char* text, float x, float y, Game::Font_s* font, float xScale, float yScale, float sinAngle, float cosAngle, Game::GfxColor color, int maxLength, int renderFlags, int cursorPos, char cursorLetter, float padding, Game::GfxColor glowForcedColor, int fxBirthTime, int fxLetterTime, int fxDecayStartTime, int fxDecayDuration, Game::Material* fxMaterial, Game::Material* fxMaterialGlow); static void DrawText2D(const char* text, float x, float y, Game::Font_s* font, float xScale, float yScale, float sinAngle, float cosAngle, Game::GfxColor color, int maxLength, int renderFlags, int cursorPos, char cursorLetter, float padding, Game::GfxColor glowForcedColor, int fxBirthTime, int fxLetterTime, int fxDecayStartTime, int fxDecayDuration, Game::Material* fxMaterial, Game::Material* fxMaterialGlow);
static int R_TextWidth_Hk(const char* text, int maxChars, Game::Font_s* font);
TextRenderer(); TextRenderer();
private: private:
static unsigned HsvToRgb(HsvColor hsv); static unsigned HsvToRgb(HsvColor hsv);
static Game::GfxImage* GetFontIconColorMap(Game::Material* fontIconMaterial); static Game::GfxImage* GetFontIconColorMap(const Game::Material* fontIconMaterial);
static bool IsFontIcon(const char*& text, FontIconInfo& fontIcon); static bool IsFontIcon(const char*& text, FontIconInfo& fontIcon);
static float DrawFontIcon(const FontIconInfo& fontIcon, float x, float y, float sinAngle, float cosAngle, const Game::Font_s* font, float xScale, float yScale, unsigned color); static float DrawFontIcon(const FontIconInfo& fontIcon, float x, float y, float sinAngle, float cosAngle, const Game::Font_s* font, float xScale, float yScale, unsigned color);