diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/classes/editor_plugin_registration.cpp (renamed from src/classes/editor_plugin.cpp) | 6 | ||||
| -rw-r--r-- | src/classes/wrapped.cpp | 44 | ||||
| -rw-r--r-- | src/core/class_db.cpp | 14 | ||||
| -rw-r--r-- | src/godot.cpp | 6 | ||||
| -rw-r--r-- | src/variant/char_string.cpp | 5 |
5 files changed, 67 insertions, 8 deletions
diff --git a/src/classes/editor_plugin.cpp b/src/classes/editor_plugin_registration.cpp index ca98a89..99819be 100644 --- a/src/classes/editor_plugin.cpp +++ b/src/classes/editor_plugin_registration.cpp @@ -1,5 +1,5 @@ /**************************************************************************/ -/* editor_plugin.cpp */ +/* editor_plugin_registration.cpp */ /**************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -#include <godot_cpp/classes/editor_plugin.hpp> +#include <godot_cpp/classes/editor_plugin_registration.hpp> -#include <godot_cpp/variant/string_name.hpp> +#include <godot_cpp/variant/variant.hpp> namespace godot { diff --git a/src/classes/wrapped.cpp b/src/classes/wrapped.cpp index 1e9239c..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 <vector> + #include <godot_cpp/classes/wrapped.hpp> #include <godot_cpp/variant/builtin_types.hpp> #include <godot_cpp/classes/object.hpp> +#include <godot_cpp/core/class_db.hpp> + namespace godot { const StringName *Wrapped::_get_extension_class_name() const { @@ -49,6 +53,25 @@ void Wrapped::_postinitialize() { } Wrapped::Wrapped(const StringName p_godot_class) { +#ifdef HOT_RELOAD_ENABLED + if (unlikely(Wrapped::recreate_instance)) { + RecreateInstance *recreate_data = Wrapped::recreate_instance; + RecreateInstance *previous = nullptr; + while (recreate_data) { + if (recreate_data->wrapper == this) { + _owner = recreate_data->owner; + if (previous) { + previous->next = recreate_data->next; + } else { + Wrapped::recreate_instance = recreate_data->next; + } + return; + } + previous = recreate_data; + recreate_data = recreate_data->next; + } + } +#endif _owner = godot::internal::gdextension_interface_classdb_construct_object(reinterpret_cast<GDExtensionConstStringNamePtr>(p_godot_class._native_ptr())); } @@ -62,6 +85,11 @@ void postinitialize_handler(Wrapped *p_wrapped) { namespace internal { +std::vector<EngineClassRegistrationCallback> &get_engine_class_registration_callbacks() { + static std::vector<EngineClassRegistrationCallback> 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 @@ -87,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<EngineClassRegistrationCallback> &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 diff --git a/src/core/class_db.cpp b/src/core/class_db.cpp index 9aaacef..1f4b135 100644 --- a/src/core/class_db.cpp +++ b/src/core/class_db.cpp @@ -352,6 +352,7 @@ void ClassDB::initialize(GDExtensionInitializationLevel p_level) { } void ClassDB::deinitialize(GDExtensionInitializationLevel p_level) { + std::set<StringName> to_erase; for (std::vector<StringName>::reverse_iterator i = class_register_order.rbegin(); i != class_register_order.rend(); ++i) { const StringName &name = *i; const ClassInfo &cl = classes[name]; @@ -362,9 +363,20 @@ void ClassDB::deinitialize(GDExtensionInitializationLevel p_level) { internal::gdextension_interface_classdb_unregister_extension_class(internal::library, name._native_ptr()); - for (auto method : cl.method_map) { + for (const std::pair<const StringName, MethodBind *> &method : cl.method_map) { memdelete(method.second); } + + classes.erase(name); + to_erase.insert(name); + } + + { + // The following is equivalent to c++20 `std::erase_if(class_register_order, [&](const StringName& name){ return to_erase.contains(name); });` + std::vector<StringName>::iterator it = std::remove_if(class_register_order.begin(), class_register_order.end(), [&](const StringName &p_name) { + return to_erase.count(p_name) > 0; + }); + class_register_order.erase(it, class_register_order.end()); } } diff --git a/src/godot.cpp b/src/godot.cpp index 05413ff..7579cfd 100644 --- a/src/godot.cpp +++ b/src/godot.cpp @@ -30,7 +30,7 @@ #include <godot_cpp/godot.hpp> -#include <godot_cpp/classes/editor_plugin.hpp> +#include <godot_cpp/classes/editor_plugin_registration.hpp> #include <godot_cpp/classes/wrapped.hpp> #include <godot_cpp/core/class_db.hpp> #include <godot_cpp/core/memory.hpp> @@ -130,6 +130,7 @@ GDExtensionInterfaceStringOperatorPlusEqCstr gdextension_interface_string_operat GDExtensionInterfaceStringOperatorPlusEqWcstr gdextension_interface_string_operator_plus_eq_wcstr = nullptr; GDExtensionInterfaceStringOperatorPlusEqC32str gdextension_interface_string_operator_plus_eq_c32str = nullptr; GDExtensionInterfaceStringResize gdextension_interface_string_resize = nullptr; +GDExtensionInterfaceStringNameNewWithLatin1Chars gdextension_interface_string_name_new_with_latin1_chars = nullptr; GDExtensionInterfaceXmlParserOpenBuffer gdextension_interface_xml_parser_open_buffer = nullptr; GDExtensionInterfaceFileAccessStoreBuffer gdextension_interface_file_access_store_buffer = nullptr; GDExtensionInterfaceFileAccessGetBuffer gdextension_interface_file_access_get_buffer = nullptr; @@ -347,6 +348,7 @@ GDExtensionBool GDExtensionBinding::init(GDExtensionInterfaceGetProcAddress p_ge LOAD_PROC_ADDRESS(string_operator_plus_eq_wcstr, GDExtensionInterfaceStringOperatorPlusEqWcstr); LOAD_PROC_ADDRESS(string_operator_plus_eq_c32str, GDExtensionInterfaceStringOperatorPlusEqC32str); LOAD_PROC_ADDRESS(string_resize, GDExtensionInterfaceStringResize); + LOAD_PROC_ADDRESS(string_name_new_with_latin1_chars, GDExtensionInterfaceStringNameNewWithLatin1Chars); LOAD_PROC_ADDRESS(xml_parser_open_buffer, GDExtensionInterfaceXmlParserOpenBuffer); LOAD_PROC_ADDRESS(file_access_store_buffer, GDExtensionInterfaceFileAccessStoreBuffer); LOAD_PROC_ADDRESS(file_access_get_buffer, GDExtensionInterfaceFileAccessGetBuffer); @@ -416,7 +418,7 @@ GDExtensionBool GDExtensionBinding::init(GDExtensionInterfaceGetProcAddress p_ge ERR_FAIL_NULL_V_MSG(init_callback, false, "Initialization callback must be defined."); Variant::init_bindings(); - register_engine_classes(); + godot::internal::register_engine_classes(); return true; } diff --git a/src/variant/char_string.cpp b/src/variant/char_string.cpp index fc8845e..a4083bf 100644 --- a/src/variant/char_string.cpp +++ b/src/variant/char_string.cpp @@ -458,8 +458,9 @@ String operator+(char32_t p_char, const String &p_str) { return String::chr(p_char) + p_str; } -StringName::StringName(const char *from) : - StringName(String(from)) {} +StringName::StringName(const char *from, bool p_static) { + internal::gdextension_interface_string_name_new_with_latin1_chars(&opaque, from, p_static); +} StringName::StringName(const wchar_t *from) : StringName(String(from)) {} |