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

Add big fonticon modifier to multiply size by 1.5

Browse Source
This commit is contained in:
Jan 2021-09-08 01:09:06 +02:00
parent 6e0586a335
commit 59e1099c06
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,6 +318,10 @@ namespace Components
fontIcon.flipVertical = true; fontIcon.flipVertical = true;
break; break;
case 'b':
fontIcon.big = true;
break;
case ':': case ':':
breakArgs = true; breakArgs = true;
break; break;
@ -350,7 +354,8 @@ namespace Components
const auto* colorMap = GetFontIconColorMap(fontIcon.material); const auto* colorMap = GetFontIconColorMap(fontIcon.material);
if (colorMap == nullptr) if (colorMap == nullptr)
return 0; return 0;
return static_cast<float>(font->pixelHeight) * (static_cast<float>(colorMap->width) / static_cast<float>(colorMap->height)) * xScale; const auto sizeMultiplier = fontIcon.big ? 1.5f : 1.0f;
return static_cast<float>(font->pixelHeight) * (static_cast<float>(colorMap->width) / static_cast<float>(colorMap->height)) * xScale * sizeMultiplier;
} }
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)
@ -380,9 +385,10 @@ namespace Components
t0 = 0.0f; t0 = 0.0f;
t1 = 1.0f; t1 = 1.0f;
} }
const auto sizeMultiplier = fontIcon.big ? 1.5f : 1.0f;
const auto h = static_cast<float>(font->pixelHeight) * yScale; const auto h = static_cast<float>(font->pixelHeight) * yScale * sizeMultiplier;
const auto w = static_cast<float>(font->pixelHeight) * (static_cast<float>(colorMap->width) / static_cast<float>(colorMap->height)) * xScale; const auto w = static_cast<float>(font->pixelHeight) * (static_cast<float>(colorMap->width) / static_cast<float>(colorMap->height)) * xScale * sizeMultiplier;
const auto yy = y - (h + yScale * static_cast<float>(font->pixelHeight)) * 0.5f; const auto yy = y - (h + yScale * static_cast<float>(font->pixelHeight)) * 0.5f;
Game::RB_DrawStretchPicRotate(fontIcon.material, x, yy, w, h, s0, t0, s1, t1, sinAngle, cosAngle, color); Game::RB_DrawStretchPicRotate(fontIcon.material, x, yy, w, h, s0, t0, s1, t1, sinAngle, cosAngle, color);

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

@ -47,6 +47,7 @@ namespace Components
Game::Material* material; Game::Material* material;
bool flipHorizontal; bool flipHorizontal;
bool flipVertical; bool flipVertical;
bool big;
}; };
struct HsvColor struct HsvColor