mirror of
https://gitea.wildfiregames.com/0ad/0ad
synced 2026-06-16 05:13:58 -07:00
bdd94bd264
This commit enhances text rendering by leveraging FreeType and a dynamic font atlas. Previously, GUI scaling relied on bitmap fonts, which led to blurry and distorted text when scaling up. Now, we scale the font size directly using FreeType, resulting in much sharper and more readable text at any GUI scale. Key improvements: - Replaced bitmap font scaling with true font size scaling via FreeType. - Reduced glyph cache dependency on fixed positions, relying on shader scaling instead. - Switched to float-based glyph positioning for more accurate rendering and scaling. These changes ensure clean and consistent text appearance across different GUI scales.
61 lines
1.6 KiB
C++
61 lines
1.6 KiB
C++
/* Copyright (C) 2025 Wildfire Games.
|
|
* This file is part of 0 A.D.
|
|
*
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "precompiled.h"
|
|
#include "FontMetrics.h"
|
|
|
|
#include "graphics/Font.h"
|
|
#include "graphics/FontManager.h"
|
|
#include "ps/Filesystem.h"
|
|
#include "ps/CLogger.h"
|
|
#include "renderer/Renderer.h"
|
|
|
|
CFontMetrics::CFontMetrics(CStrIntern font)
|
|
{
|
|
m_Font = g_Renderer.GetFontManager().LoadFont(font);
|
|
}
|
|
|
|
float CFontMetrics::GetLineSpacing() const
|
|
{
|
|
// Return some arbitrary default if the font failed to load, so that the
|
|
// user of CFontMetrics doesn't have to care about failures
|
|
if (!m_Font)
|
|
return 12;
|
|
return m_Font->GetLineSpacing();
|
|
}
|
|
|
|
float CFontMetrics::GetHeight() const
|
|
{
|
|
if (!m_Font)
|
|
return 6;
|
|
return m_Font->GetHeight();
|
|
}
|
|
|
|
float CFontMetrics::GetCharacterWidth(wchar_t c) const
|
|
{
|
|
if (!m_Font)
|
|
return 6;
|
|
return m_Font->GetCharacterWidth(c);
|
|
}
|
|
|
|
void CFontMetrics::CalculateStringSize(const wchar_t* string, float& w, float& h) const
|
|
{
|
|
if (!m_Font)
|
|
w = h = 0;
|
|
else
|
|
m_Font->CalculateStringSize(string, w, h);
|
|
}
|