Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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
No known key found for this signature in database
GPG key ID: 009E1BFE42239B95
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_fb/text_server_fb.cpp
View file

@ -107,10 +107,12 @@ RID TextServerFallback::create_font_system(const String &p_name, int p_base_size
RID TextServerFallback::create_font_resource(const String &p_filename, int p_base_size) {
_THREAD_SAFE_METHOD_
FontDataFallback *fd = nullptr;
if (p_filename.get_extension() == "ttf" || p_filename.get_extension() == "otf" || p_filename.get_extension() == "woff") {
fd = memnew(DynamicFontDataFallback);
} 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(BitmapFontDataFallback);
#ifdef MODULE_FREETYPE_ENABLED
} else if (p_filename.get_extension() == "ttf" || p_filename.get_extension() == "otf" || p_filename.get_extension() == "woff") {
fd = memnew(DynamicFontDataFallback);
#endif
} else {
return RID();
}
@ -127,10 +129,12 @@ RID TextServerFallback::create_font_resource(const String &p_filename, int p_bas
RID TextServerFallback::create_font_memory(const uint8_t *p_data, size_t p_size, const String &p_type, int p_base_size) {
_THREAD_SAFE_METHOD_
FontDataFallback *fd = nullptr;
if (p_type == "ttf" || p_type == "otf" || p_type == "woff") {
fd = memnew(DynamicFontDataFallback);
} else if (p_type == "fnt" || p_type == "font") {
if (p_type == "fnt" || p_type == "font") {
fd = memnew(BitmapFontDataFallback);
#ifdef MODULE_FREETYPE_ENABLED
} else if (p_type == "ttf" || p_type == "otf" || p_type == "woff") {
fd = memnew(DynamicFontDataFallback);
#endif
} else {
return RID();
}