From 1b9fb57a7315b4116a091531ea08438728f1baea Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 8 Jan 2023 15:55:50 +0100 Subject: [PATCH] Updated register_types.h and cpp to the current godot 4 style. --- register_types.cpp | 32 ++++++++++++++++++-------------- register_types.h | 11 +++++++++-- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/register_types.cpp b/register_types.cpp index 7816fec..fa47663 100644 --- a/register_types.cpp +++ b/register_types.cpp @@ -45,31 +45,35 @@ SOFTWARE. #include "props_2d/prop_2d_data_mesh_data.h" #endif -void register_mesh_data_resource_types() { - ClassDB::register_class(); - ClassDB::register_class(); +void initialize_mesh_data_resource_module(ModuleInitializationLevel p_level) { + if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) { + GDREGISTER_CLASS(MeshDataResource); + GDREGISTER_CLASS(MeshDataResourceCollection); - ClassDB::register_class(); - ClassDB::register_class(); + GDREGISTER_CLASS(MeshDataInstance); + GDREGISTER_CLASS(MeshDataInstance2D); #if PROPS_PRESENT - ClassDB::register_class(); - Ref processor = Ref(memnew(PropDataMeshData)); - PropUtils::add_processor(processor); + GDREGISTER_CLASS(PropDataMeshData); + Ref processor = Ref(memnew(PropDataMeshData)); + PropUtils::add_processor(processor); #endif #if PROPS_2D_PRESENT - ClassDB::register_class(); - Ref prop_2d_processor = Ref(memnew(Prop2DDataMeshData)); - Prop2DUtils::add_processor(prop_2d_processor); + GDREGISTER_CLASS(Prop2DDataMeshData); + Ref prop_2d_processor = Ref(memnew(Prop2DDataMeshData)); + Prop2DUtils::add_processor(prop_2d_processor); #endif + } #ifdef TOOLS_ENABLED - EditorPlugins::add_by_type(); + if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) { + EditorPlugins::add_by_type(); - EditorPlugins::add_by_type(); + EditorPlugins::add_by_type(); + } #endif } -void unregister_mesh_data_resource_types() { +void initialize_mesh_data_resource_module(ModuleInitializationLevel p_level) { } diff --git a/register_types.h b/register_types.h index c6efacb..10378b8 100644 --- a/register_types.h +++ b/register_types.h @@ -20,5 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -void register_mesh_data_resource_types(); -void unregister_mesh_data_resource_types(); +#ifndef MESH_DATA_RESOURCE_REGISTER_TYPES_H +#define MESH_DATA_RESOURCE_REGISTER_TYPES_H + +#include "modules/register_module_types.h" + +void initialize_mesh_data_resource_module(ModuleInitializationLevel p_level); +void uninitialize_mesh_data_resource_module(ModuleInitializationLevel p_level); + +#endif \ No newline at end of file