mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-01 17:38:41 +00:00
Fully remove bitmap font support (#11863)
Freetype is now a build requirement.
This commit is contained in:
parent
bf22569019
commit
76dbd0d2d0
50 changed files with 71 additions and 319 deletions
|
@ -30,12 +30,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
#include "client/fontengine.h"
|
||||
#include "log.h"
|
||||
#include "gettext.h"
|
||||
#include "irrlicht_changes/CGUITTFont.h"
|
||||
#include <string>
|
||||
|
||||
#if USE_FREETYPE
|
||||
#include "irrlicht_changes/CGUITTFont.h"
|
||||
#endif
|
||||
|
||||
inline u32 clamp_u8(s32 value)
|
||||
{
|
||||
return (u32) MYMIN(MYMAX(value, 0), 255);
|
||||
|
@ -328,19 +325,16 @@ void GUIChatConsole::drawText()
|
|||
core::rect<s32> destrect(
|
||||
x, y, x + m_fontsize.X * fragment.text.size(), y + m_fontsize.Y);
|
||||
|
||||
#if USE_FREETYPE
|
||||
if (m_font->getType() == irr::gui::EGFT_CUSTOM) {
|
||||
// Draw colored text if FreeType is enabled
|
||||
irr::gui::CGUITTFont *tmp = dynamic_cast<irr::gui::CGUITTFont *>(m_font);
|
||||
// Draw colored text if possible
|
||||
gui::CGUITTFont *tmp = static_cast<gui::CGUITTFont*>(m_font);
|
||||
tmp->draw(
|
||||
fragment.text,
|
||||
destrect,
|
||||
false,
|
||||
false,
|
||||
&AbsoluteClippingRect);
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
} else {
|
||||
// Otherwise use standard text
|
||||
m_font->draw(
|
||||
fragment.text.c_str(),
|
||||
|
|
|
@ -17,31 +17,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "IGUIEnvironment.h"
|
||||
#include "IGUIElement.h"
|
||||
#include "guiHyperText.h"
|
||||
#include "guiScrollBar.h"
|
||||
#include "IGUIFont.h"
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <unordered_map>
|
||||
using namespace irr::gui;
|
||||
#include "client/fontengine.h"
|
||||
#include <SColor.h>
|
||||
#include "client/tile.h"
|
||||
#include "IVideoDriver.h"
|
||||
#include "client/client.h"
|
||||
#include "client/renderingengine.h"
|
||||
#include "hud.h"
|
||||
#include "guiHyperText.h"
|
||||
#include "util/string.h"
|
||||
#include "irrlicht_changes/CGUITTFont.h"
|
||||
|
||||
bool check_color(const std::string &str)
|
||||
using namespace irr::gui;
|
||||
|
||||
static bool check_color(const std::string &str)
|
||||
{
|
||||
irr::video::SColor color;
|
||||
return parseColorString(str, color, false);
|
||||
}
|
||||
|
||||
bool check_integer(const std::string &str)
|
||||
static bool check_integer(const std::string &str)
|
||||
{
|
||||
if (str.empty())
|
||||
return false;
|
||||
|
@ -616,12 +611,10 @@ TextDrawer::TextDrawer(const wchar_t *text, Client *client,
|
|||
if (e.font) {
|
||||
e.dim.Width = e.font->getDimension(e.text.c_str()).Width;
|
||||
e.dim.Height = e.font->getDimension(L"Yy").Height;
|
||||
#if USE_FREETYPE
|
||||
if (e.font->getType() == irr::gui::EGFT_CUSTOM) {
|
||||
e.baseline = e.dim.Height - 1 -
|
||||
((irr::gui::CGUITTFont *)e.font)->getAscender() / 64;
|
||||
CGUITTFont *tmp = static_cast<CGUITTFont*>(e.font);
|
||||
e.baseline = e.dim.Height - 1 - tmp->getAscender() / 64;
|
||||
}
|
||||
#endif
|
||||
} else {
|
||||
e.dim = {0, 0};
|
||||
}
|
||||
|
|
|
@ -19,16 +19,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "config.h" // for USE_FREETYPE
|
||||
#include <vector>
|
||||
#include <list>
|
||||
#include <unordered_map>
|
||||
#include <string>
|
||||
#include "irrlichttypes_extrabloated.h"
|
||||
|
||||
using namespace irr;
|
||||
|
||||
class ISimpleTextureSource;
|
||||
class Client;
|
||||
|
||||
#if USE_FREETYPE
|
||||
#include "irrlicht_changes/CGUITTFont.h"
|
||||
#endif
|
||||
class GUIScrollBar;
|
||||
|
||||
class ParsedText
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue