godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 17:36:07 +00:00
Code Releases Wiki Activity

Make FreeType optional for export templates.

Browse Source
This commit is contained in:
bruvzg
2021-02-18 15:45:28 +02:00
parent b4aba47969
commit 2d66f364d9
9 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/text_server_adv/text_server_adv.cpp
View File

@@ -529,10 +529,12 @@ RID TextServerAdvanced::create_font_system(const String &p_name, int p_base_size
RID TextServerAdvanced::create_font_resource(const String &p_filename, int p_base_size) {
_THREAD_SAFE_METHOD_
FontDataAdvanced *fd = nullptr;
if (p_filename.get_extension() == "ttf" || p_filename.get_extension() == "otf" || p_filename.get_extension() == "woff") {
fd = memnew(DynamicFontDataAdvanced);
} else if (p_filename.get_extension() == "fnt" || p_filename.get_extension() == "font") {
if (p_filename.get_extension() == "fnt" || p_filename.get_extension() == "font") {
fd = memnew(BitmapFontDataAdvanced);
#ifdef MODULE_FREETYPE_ENABLED
} else if (p_filename.get_extension() == "ttf" || p_filename.get_extension() == "otf" || p_filename.get_extension() == "woff") {
fd = memnew(DynamicFontDataAdvanced);
#endif
} else {
return RID();
}
@@ -549,10 +551,12 @@ RID TextServerAdvanced::create_font_resource(const String &p_filename, int p_bas
RID TextServerAdvanced::create_font_memory(const uint8_t *p_data, size_t p_size, const String &p_type, int p_base_size) {
_THREAD_SAFE_METHOD_
FontDataAdvanced *fd = nullptr;
if (p_type == "ttf" || p_type == "otf" || p_type == "woff") {
fd = memnew(DynamicFontDataAdvanced);
} else if (p_type == "fnt" || p_type == "font") {
if (p_type == "fnt" || p_type == "font") {
fd = memnew(BitmapFontDataAdvanced);
#ifdef MODULE_FREETYPE_ENABLED
} else if (p_type == "ttf" || p_type == "otf" || p_type == "woff") {
fd = memnew(DynamicFontDataAdvanced);
#endif
} else {
return RID();
}