asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[3.x] Fix building with the FreeType module disabled

Browse source
This commit is contained in:
Aaron Franke 2021-07-29 21:47:16 -05:00
parent 78d9a4ae7e
commit e47018ffa4
No known key found for this signature in database
GPG key ID: 40A1750B977E56BF
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/main/scene_tree.cpp
View file

@ -30,6 +30,8 @@
#include "scene_tree.h" #include "scene_tree.h"
#include "modules/modules_enabled.gen.h"
#include "core/io/marshalls.h" #include "core/io/marshalls.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/message_queue.h" #include "core/message_queue.h"
@ -493,10 +495,12 @@ bool SceneTree::iteration(float p_time) {
} }
void SceneTree::_update_font_oversampling(float p_ratio) { void SceneTree::_update_font_oversampling(float p_ratio) {
#ifdef MODULE_FREETYPE_ENABLED
if (use_font_oversampling) { if (use_font_oversampling) {
DynamicFontAtSize::font_oversampling = p_ratio; DynamicFontAtSize::font_oversampling = p_ratio;
DynamicFont::update_oversampling(); DynamicFont::update_oversampling();
} }
#endif // MODULE_FREETYPE_ENABLED
} }
bool SceneTree::idle(float p_time) { bool SceneTree::idle(float p_time) {

12
scene/register_scene_types.cpp
View file

@ -218,7 +218,9 @@
static Ref<ResourceFormatSaverText> resource_saver_text; static Ref<ResourceFormatSaverText> resource_saver_text;
static Ref<ResourceFormatLoaderText> resource_loader_text; static Ref<ResourceFormatLoaderText> resource_loader_text;
#ifdef MODULE_FREETYPE_ENABLED
static Ref<ResourceFormatLoaderDynamicFont> resource_loader_dynamic_font; static Ref<ResourceFormatLoaderDynamicFont> resource_loader_dynamic_font;
#endif // MODULE_FREETYPE_ENABLED
static Ref<ResourceFormatLoaderStreamTexture> resource_loader_stream_texture; static Ref<ResourceFormatLoaderStreamTexture> resource_loader_stream_texture;
static Ref<ResourceFormatLoaderTextureLayered> resource_loader_texture_layered; static Ref<ResourceFormatLoaderTextureLayered> resource_loader_texture_layered;
@ -235,8 +237,10 @@ void register_scene_types() {
Node::init_node_hrcr(); Node::init_node_hrcr();
#ifdef MODULE_FREETYPE_ENABLED
resource_loader_dynamic_font.instance(); resource_loader_dynamic_font.instance();
ResourceLoader::add_resource_format_loader(resource_loader_dynamic_font); ResourceLoader::add_resource_format_loader(resource_loader_dynamic_font);
#endif // MODULE_FREETYPE_ENABLED
resource_loader_stream_texture.instance(); resource_loader_stream_texture.instance();
ResourceLoader::add_resource_format_loader(resource_loader_stream_texture); ResourceLoader::add_resource_format_loader(resource_loader_stream_texture);
@ -681,10 +685,12 @@ void register_scene_types() {
ClassDB::register_class<TextFile>(); ClassDB::register_class<TextFile>();
#ifdef MODULE_FREETYPE_ENABLED
ClassDB::register_class<DynamicFontData>(); ClassDB::register_class<DynamicFontData>();
ClassDB::register_class<DynamicFont>(); ClassDB::register_class<DynamicFont>();
DynamicFont::initialize_dynamic_fonts(); DynamicFont::initialize_dynamic_fonts();
#endif // MODULE_FREETYPE_ENABLED
ClassDB::register_virtual_class<StyleBox>(); ClassDB::register_virtual_class<StyleBox>();
ClassDB::register_class<StyleBoxEmpty>(); ClassDB::register_class<StyleBoxEmpty>();
@ -784,17 +790,19 @@ void register_scene_types() {
void unregister_scene_types() { void unregister_scene_types() {
clear_default_theme(); clear_default_theme();
#ifdef MODULE_FREETYPE_ENABLED
ResourceLoader::remove_resource_format_loader(resource_loader_dynamic_font); ResourceLoader::remove_resource_format_loader(resource_loader_dynamic_font);
resource_loader_dynamic_font.unref(); resource_loader_dynamic_font.unref();
DynamicFont::finish_dynamic_fonts();
#endif // MODULE_FREETYPE_ENABLED
ResourceLoader::remove_resource_format_loader(resource_loader_texture_layered); ResourceLoader::remove_resource_format_loader(resource_loader_texture_layered);
resource_loader_texture_layered.unref(); resource_loader_texture_layered.unref();
ResourceLoader::remove_resource_format_loader(resource_loader_stream_texture); ResourceLoader::remove_resource_format_loader(resource_loader_stream_texture);
resource_loader_stream_texture.unref(); resource_loader_stream_texture.unref();
DynamicFont::finish_dynamic_fonts();
ResourceSaver::remove_resource_format_saver(resource_saver_text); ResourceSaver::remove_resource_format_saver(resource_saver_text);
resource_saver_text.unref(); resource_saver_text.unref();

4
scene/resources/dynamic_font.h
View file

@ -307,6 +307,6 @@ public:
virtual String get_resource_type(const String &p_path) const; virtual String get_resource_type(const String &p_path) const;
}; };
#endif #endif // MODULE_FREETYPE_ENABLED
#endif #endif // DYNAMIC_FONT_H