diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-06-14 09:39:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 09:39:46 -0500 |
| commit | 5d8f80bc5578a2312d271d854745a172dad56501 (patch) | |
| tree | 5edad0345eb3f085ba44ffcfebef705500520ed0 /include/godot_cpp/classes | |
| parent | ee9acbcf109486eec3827d84ff033387762bccb7 (diff) | |
| parent | 76cbc66785104756d6b37d16e8eb85dccc0497e8 (diff) | |
| download | redot-cpp-5d8f80bc5578a2312d271d854745a172dad56501.tar.gz | |
Merge pull request #1446 from Daylily-Zeleen/daylily-zeleen/set_instance_and_instance_biding_in_Wrapped_constructor
Set instance and instance binding in `Wrapped` constructor.
Diffstat (limited to 'include/godot_cpp/classes')
| -rw-r--r-- | include/godot_cpp/classes/wrapped.hpp | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/include/godot_cpp/classes/wrapped.hpp b/include/godot_cpp/classes/wrapped.hpp index 8702fb1..9cc1d39 100644 --- a/include/godot_cpp/classes/wrapped.hpp +++ b/include/godot_cpp/classes/wrapped.hpp @@ -46,13 +46,31 @@ class ClassDB; typedef void GodotObject; +template <typename T, std::enable_if_t<std::is_base_of<::godot::Wrapped, T>::value, bool> = true> +_ALWAYS_INLINE_ void _pre_initialize(); + // Base for all engine classes, to contain the pointer to the engine instance. class Wrapped { friend class GDExtensionBinding; friend class ClassDB; friend void postinitialize_handler(Wrapped *); + template <typename T, std::enable_if_t<std::is_base_of<::godot::Wrapped, T>::value, bool>> + friend _ALWAYS_INLINE_ void _pre_initialize(); + + thread_local static const StringName *_constructing_extension_class_name; + thread_local static const GDExtensionInstanceBindingCallbacks *_constructing_class_binding_callbacks; + + template <typename T> + _ALWAYS_INLINE_ static void _set_construct_info() { + _constructing_extension_class_name = T::_get_extension_class_name(); + _constructing_class_binding_callbacks = &T::_gde_binding_callbacks; + } + protected: + virtual bool _is_extension_class() const { return false; } + static const StringName *_get_extension_class_name(); // This is needed to retrieve the class name before the godot object has its _extension and _extension_instance members assigned. + #ifdef HOT_RELOAD_ENABLED struct RecreateInstance { GDExtensionClassInstancePtr wrapper; @@ -62,9 +80,6 @@ protected: inline static RecreateInstance *recreate_instance = nullptr; #endif - virtual const StringName *_get_extension_class_name() const; // This is needed to retrieve the class name before the godot object has its _extension and _extension_instance members assigned. - virtual const GDExtensionInstanceBindingCallbacks *_get_bindings_callbacks() const = 0; - void _notification(int p_what) {} bool _set(const StringName &p_name, const Variant &p_property) { return false; } bool _get(const StringName &p_name, Variant &r_property) const { return false; } @@ -109,6 +124,11 @@ public: GodotObject *_owner = nullptr; }; +template <typename T, std::enable_if_t<std::is_base_of<::godot::Wrapped, T>::value, bool>> +_ALWAYS_INLINE_ void _pre_initialize() { + Wrapped::_set_construct_info<T>(); +} + _FORCE_INLINE_ void snarray_add_str(Vector<StringName> &arr) { } @@ -161,15 +181,14 @@ struct EngineClassRegistration { private: \ void operator=(const m_class &p_rval) {} \ friend class ::godot::ClassDB; \ + friend class ::godot::Wrapped; \ \ protected: \ - virtual const ::godot::StringName *_get_extension_class_name() const override { \ - static ::godot::StringName string_name = get_class_static(); \ - return &string_name; \ - } \ + virtual bool _is_extension_class() const override { return true; } \ \ - virtual const GDExtensionInstanceBindingCallbacks *_get_bindings_callbacks() const override { \ - return &_gde_binding_callbacks; \ + static const ::godot::StringName *_get_extension_class_name() { \ + const ::godot::StringName &string_name = get_class_static(); \ + return &string_name; \ } \ \ static void (*_get_bind_methods())() { \ @@ -388,12 +407,9 @@ private: inline static ::godot::internal::EngineClassRegistration<m_class> _gde_engine_class_registration_helper; \ void operator=(const m_class &p_rval) {} \ friend class ::godot::ClassDB; \ + friend class ::godot::Wrapped; \ \ protected: \ - virtual const GDExtensionInstanceBindingCallbacks *_get_bindings_callbacks() const override { \ - return &_gde_binding_callbacks; \ - } \ - \ m_class(const char *p_godot_class) : m_inherits(p_godot_class) {} \ m_class(GodotObject *p_godot_object) : m_inherits(p_godot_object) {} \ \ |