diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-05-04 19:08:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-04 19:08:43 +0200 |
commit | 84f64ddde956f5ecba4674750442df89b75556c9 (patch) | |
tree | 920e09993cd21dc3f809735a4669b6adaf7cd7cd /modules/gridmap | |
parent | 3a82b7eeef005fdc654aaccadbaa80b4520b5f13 (diff) | |
parent | de0ca3b999819a99a5dcab99f0083a760277b95e (diff) |
Merge pull request #60723 from reduz/refactor-module-initialization
Diffstat (limited to 'modules/gridmap')
-rw-r--r-- | modules/gridmap/register_types.cpp | 15 | ||||
-rw-r--r-- | modules/gridmap/register_types.h | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/modules/gridmap/register_types.cpp b/modules/gridmap/register_types.cpp index d7c9f5c92e..9efd18a265 100644 --- a/modules/gridmap/register_types.cpp +++ b/modules/gridmap/register_types.cpp @@ -39,14 +39,21 @@ #include "editor/grid_map_editor_plugin.h" #endif -void register_gridmap_types() { - GDREGISTER_CLASS(GridMap); +void initialize_gridmap_module(ModuleInitializationLevel p_level) { + if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { + GDREGISTER_CLASS(GridMap); + } #ifdef TOOLS_ENABLED - EditorPlugins::add_by_type<GridMapEditorPlugin>(); + if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) { + EditorPlugins::add_by_type<GridMapEditorPlugin>(); + } #endif } -void unregister_gridmap_types() { +void uninitialize_gridmap_module(ModuleInitializationLevel p_level) { + if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { + return; + } } #endif // _3D_DISABLED diff --git a/modules/gridmap/register_types.h b/modules/gridmap/register_types.h index fa3511c5d1..28f14cd398 100644 --- a/modules/gridmap/register_types.h +++ b/modules/gridmap/register_types.h @@ -31,7 +31,9 @@ #ifndef GRIDMAP_REGISTER_TYPES_H #define GRIDMAP_REGISTER_TYPES_H -void register_gridmap_types(); -void unregister_gridmap_types(); +#include "modules/register_module_types.h" + +void initialize_gridmap_module(ModuleInitializationLevel p_level); +void uninitialize_gridmap_module(ModuleInitializationLevel p_level); #endif // GRIDMAP_REGISTER_TYPES_H |