Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix object_set_instance being wrongly called for built-in wrapped classes

pull/668/head
Gilles Roudière 2021-12-06 15:39:51 +01:00
parent f58a2f25a2
commit adbbf1a3a1
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/godot_cpp/classes/wrapped.hpp
View File

@ -45,7 +45,7 @@ class Wrapped {
friend void postinitialize_handler(Wrapped *); friend void postinitialize_handler(Wrapped *);
protected: protected:
virtual const char *_get_class() const = 0; // This is needed to retrieve the class name before the godot object has its _extension and _extension_instance members assigned. virtual const char *_get_extension_class() const; // This is needed to retrieve the class name before the godot object has its _extension and _extension_instance members assigned.
virtual const GDNativeInstanceBindingCallbacks *_get_bindings_callbacks() const = 0; virtual const GDNativeInstanceBindingCallbacks *_get_bindings_callbacks() const = 0;
void _postinitialize(); void _postinitialize();
@ -60,26 +60,13 @@ public:
} // namespace godot } // namespace godot
#ifdef DEBUG_ENABLED
#define CHECK_CLASS_CONSTRUCTOR(m_constructor, m_class) \
if (unlikely(!m_constructor)) { \
ERR_PRINT_ONCE("Constructor for class " #m_class "not found. Likely wasn't registered in ClassDB."); \
return nullptr; \
} else \
((void)0)
#else
#define CHECK_CLASS_CONSTRUCTOR(m_constructor, m_class)
#endif
#define GDCLASS(m_class, m_inherits) \ #define GDCLASS(m_class, m_inherits) \
private: \ private: \
void operator=(const m_class &p_rval) {} \ void operator=(const m_class &p_rval) {} \
friend class ClassDB; \ friend class ClassDB; \
\ \
using SelfType = m_class; \
\
protected: \ protected: \
virtual const char *_get_class() const override { \ virtual const char *_get_extension_class() const override { \
return get_class_static(); \ return get_class_static(); \
} \ } \
\ \
@ -151,10 +138,6 @@ private:
void operator=(const m_class &p_rval) {} \ void operator=(const m_class &p_rval) {} \
\ \
protected: \ protected: \
virtual const char *_get_class() const override { \
return get_class_static(); \
} \
\
virtual const GDNativeInstanceBindingCallbacks *_get_bindings_callbacks() const override { \ virtual const GDNativeInstanceBindingCallbacks *_get_bindings_callbacks() const override { \
return &___binding_callbacks; \ return &___binding_callbacks; \
} \ } \

9
src/classes/wrapped.cpp
View File

@ -36,8 +36,15 @@
namespace godot { namespace godot {
const char *Wrapped::_get_extension_class() const {
return nullptr;
}
void Wrapped::_postinitialize() { void Wrapped::_postinitialize() {
godot::internal::gdn_interface->object_set_instance(_owner, _get_class(), this); const char *extension_class = _get_extension_class();
if (extension_class) {
godot::internal::gdn_interface->object_set_instance(_owner, extension_class, this);
}
godot::internal::gdn_interface->object_set_instance_binding(_owner, godot::internal::token, this, _get_bindings_callbacks()); godot::internal::gdn_interface->object_set_instance_binding(_owner, godot::internal::token, this, _get_bindings_callbacks());
} }