From b507b3e5913344a97e90ba27b221e28924f555ab Mon Sep 17 00:00:00 2001 From: David Snopek Date: Wed, 11 Oct 2023 22:59:59 -0500 Subject: Automatically register only engine classes whose header has been included --- src/classes/editor_plugin.cpp | 61 ------------------------------ src/classes/editor_plugin_registration.cpp | 61 ++++++++++++++++++++++++++++++ src/classes/wrapped.cpp | 25 ++++++++++++ 3 files changed, 86 insertions(+), 61 deletions(-) delete mode 100644 src/classes/editor_plugin.cpp create mode 100644 src/classes/editor_plugin_registration.cpp (limited to 'src/classes') diff --git a/src/classes/editor_plugin.cpp b/src/classes/editor_plugin.cpp deleted file mode 100644 index ca98a89..0000000 --- a/src/classes/editor_plugin.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/**************************************************************************/ -/* editor_plugin.cpp */ -/**************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/**************************************************************************/ -/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ -/* */ -/* Permission is hereby granted, free of charge, to any person obtaining */ -/* a copy of this software and associated documentation files (the */ -/* "Software"), to deal in the Software without restriction, including */ -/* without limitation the rights to use, copy, modify, merge, publish, */ -/* distribute, sublicense, and/or sell copies of the Software, and to */ -/* permit persons to whom the Software is furnished to do so, subject to */ -/* the following conditions: */ -/* */ -/* The above copyright notice and this permission notice shall be */ -/* included in all copies or substantial portions of the Software. */ -/* */ -/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ -/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ -/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ -/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ -/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ -/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ -/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/**************************************************************************/ - -#include - -#include - -namespace godot { - -Vector EditorPlugins::plugin_classes; - -void EditorPlugins::add_plugin_class(const StringName &p_class_name) { - ERR_FAIL_COND_MSG(plugin_classes.find(p_class_name) != -1, vformat("Editor plugin already registered: %s", p_class_name)); - plugin_classes.push_back(p_class_name); - internal::gdextension_interface_editor_add_plugin(p_class_name._native_ptr()); -} - -void EditorPlugins::remove_plugin_class(const StringName &p_class_name) { - int index = plugin_classes.find(p_class_name); - ERR_FAIL_COND_MSG(index == -1, vformat("Editor plugin is not registered: %s", p_class_name)); - plugin_classes.remove_at(index); - internal::gdextension_interface_editor_remove_plugin(p_class_name._native_ptr()); -} - -void EditorPlugins::deinitialize(GDExtensionInitializationLevel p_level) { - if (p_level == GDEXTENSION_INITIALIZATION_EDITOR) { - for (const StringName &class_name : plugin_classes) { - internal::gdextension_interface_editor_remove_plugin(class_name._native_ptr()); - } - plugin_classes.clear(); - } -} - -} // namespace godot diff --git a/src/classes/editor_plugin_registration.cpp b/src/classes/editor_plugin_registration.cpp new file mode 100644 index 0000000..99819be --- /dev/null +++ b/src/classes/editor_plugin_registration.cpp @@ -0,0 +1,61 @@ +/**************************************************************************/ +/* editor_plugin_registration.cpp */ +/**************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/**************************************************************************/ +/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/**************************************************************************/ + +#include + +#include + +namespace godot { + +Vector EditorPlugins::plugin_classes; + +void EditorPlugins::add_plugin_class(const StringName &p_class_name) { + ERR_FAIL_COND_MSG(plugin_classes.find(p_class_name) != -1, vformat("Editor plugin already registered: %s", p_class_name)); + plugin_classes.push_back(p_class_name); + internal::gdextension_interface_editor_add_plugin(p_class_name._native_ptr()); +} + +void EditorPlugins::remove_plugin_class(const StringName &p_class_name) { + int index = plugin_classes.find(p_class_name); + ERR_FAIL_COND_MSG(index == -1, vformat("Editor plugin is not registered: %s", p_class_name)); + plugin_classes.remove_at(index); + internal::gdextension_interface_editor_remove_plugin(p_class_name._native_ptr()); +} + +void EditorPlugins::deinitialize(GDExtensionInitializationLevel p_level) { + if (p_level == GDEXTENSION_INITIALIZATION_EDITOR) { + for (const StringName &class_name : plugin_classes) { + internal::gdextension_interface_editor_remove_plugin(class_name._native_ptr()); + } + plugin_classes.clear(); + } +} + +} // namespace godot diff --git a/src/classes/wrapped.cpp b/src/classes/wrapped.cpp index 5b425c7..37fcf65 100644 --- a/src/classes/wrapped.cpp +++ b/src/classes/wrapped.cpp @@ -28,12 +28,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ +#include + #include #include #include +#include + namespace godot { const StringName *Wrapped::_get_extension_class_name() const { @@ -81,6 +85,11 @@ void postinitialize_handler(Wrapped *p_wrapped) { namespace internal { +std::vector &get_engine_class_registration_callbacks() { + static std::vector engine_class_registration_callbacks; + return engine_class_registration_callbacks; +} + GDExtensionPropertyInfo *create_c_property_list(const ::godot::List<::godot::PropertyInfo> &plist_cpp, uint32_t *r_size) { GDExtensionPropertyInfo *plist = nullptr; // Linked list size can be expensive to get so we cache it @@ -106,6 +115,22 @@ void free_c_property_list(GDExtensionPropertyInfo *plist) { memfree(plist); } +void add_engine_class_registration_callback(EngineClassRegistrationCallback p_callback) { + get_engine_class_registration_callbacks().push_back(p_callback); +} + +void register_engine_class(const StringName &p_name, const GDExtensionInstanceBindingCallbacks *p_callbacks) { + ClassDB::_register_engine_class(p_name, p_callbacks); +} + +void register_engine_classes() { + std::vector &engine_class_registration_callbacks = get_engine_class_registration_callbacks(); + for (EngineClassRegistrationCallback cb : engine_class_registration_callbacks) { + cb(); + } + engine_class_registration_callbacks.clear(); +} + } // namespace internal } // namespace godot -- cgit v1.2.3