luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-15 17:35:37 +02:00
Code Activity

Remove irr namespace (#16309)

Browse Source
This commit is contained in:
Lars Müller
2025-07-09 10:35:52 +02:00
committed by GitHub
parent 7e22c72492
commit 61551cfc3a
381 changed files with 680 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/client/fontengine.h
View File

@@ -13,11 +13,9 @@
#include "irrString.h" // utf8_to_wide
#include "threading/mutex_auto_lock.h"
namespace irr {
namespace gui {
class IGUIEnvironment;
class IGUIFont;
}
namespace gui {
class IGUIEnvironment;
class IGUIFont;
}
#define FONT_SIZE_UNSPECIFIED 0xFFFFFFFF
@@ -76,9 +74,9 @@ public:
~FontEngine();
// Get best possible font specified by FontSpec
irr::gui::IGUIFont *getFont(FontSpec spec);
gui::IGUIFont *getFont(FontSpec spec);
irr::gui::IGUIFont *getFont(unsigned int font_size=FONT_SIZE_UNSPECIFIED,
gui::IGUIFont *getFont(unsigned int font_size=FONT_SIZE_UNSPECIFIED,
FontMode mode=FM_Unspecified)
{
FontSpec spec(font_size, mode, m_default_bold, m_default_italic);
@@ -148,7 +146,7 @@ public:
void clearMediaFonts();
private:
irr::gui::IGUIFont *getFont(FontSpec spec, bool may_fail);
gui::IGUIFont *getFont(FontSpec spec, bool may_fail);
/** update content of font cache in case of a setting change made it invalid */
void updateCache();
@@ -174,7 +172,7 @@ private:
std::recursive_mutex m_font_mutex;
/** internal storage for caching fonts of different size */
std::map<unsigned int, irr::gui::IGUIFont*> m_font_cache[FontSpec::MAX_VARIANTS];
std::map<unsigned int, gui::IGUIFont*> m_font_cache[FontSpec::MAX_VARIANTS];
/** media-provided faces, indexed by filename (without extension) */
std::unordered_map<std::string, irr_ptr<gui::SGUITTFace>> m_media_faces;