Merge pull request #60723 from reduz/refactor-module-initialization

This commit is contained in:
Rémi Verschelde
2022-05-04 19:08:43 +02:00
committed by GitHub
103 changed files with 897 additions and 454 deletions

View File

@ -32,7 +32,11 @@
#include "text_server_adv.h"
void preregister_text_server_adv_types() {
void initialize_text_server_adv_module(ModuleInitializationLevel p_level) {
if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
return;
}
GDREGISTER_CLASS(TextServerAdvanced);
TextServerManager *tsman = TextServerManager::get_singleton();
if (tsman) {
@ -42,10 +46,10 @@ void preregister_text_server_adv_types() {
}
}
void register_text_server_adv_types() {
}
void unregister_text_server_adv_types() {
void uninitialize_text_server_adv_module(ModuleInitializationLevel p_level) {
if (p_level != MODULE_INITIALIZATION_LEVEL_SERVERS) {
return;
}
}
#ifdef GDEXTENSION
@ -61,8 +65,9 @@ extern "C" {
GDNativeBool GDN_EXPORT textserver_advanced_init(const GDNativeInterface *p_interface, const GDNativeExtensionClassLibraryPtr p_library, GDNativeInitialization *r_initialization) {
GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization);
init_obj.register_server_initializer(&preregister_text_server_adv_types);
init_obj.register_server_terminator(&unregister_text_server_adv_types);
init_obj.register_initializer(&initialize_text_server_adv_module);
init_obj.register_terminator(&uninitialize_text_server_adv_module);
init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SERVERS);
return init_obj.init();
}

View File

@ -31,10 +31,14 @@
#ifndef TEXT_SERVER_ADV_REGISTER_TYPES_H
#define TEXT_SERVER_ADV_REGISTER_TYPES_H
#define MODULE_TEXT_SERVER_ADV_HAS_PREREGISTER
#ifdef GDEXTENSION
#include <godot_cpp/core/class_db.hpp>
using namespace godot;
#else
#include "modules/register_module_types.h"
#endif
void preregister_text_server_adv_types();
void register_text_server_adv_types();
void unregister_text_server_adv_types();
void initialize_text_server_adv_module(ModuleInitializationLevel p_level);
void uninitialize_text_server_adv_module(ModuleInitializationLevel p_level);
#endif // TEXT_SERVER_ADV_REGISTER_TYPES_H