godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #78061 from dsnopek/gdextension-class-not-exposed 

Fix wrapping Object's in GDExtension that aren't exposed
This commit is contained in:
Rémi Verschelde 2023-06-15 10:50:27 +02:00
parent 2c22e56e37 36f4b99638
commit 8c5c29f2a3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/object/object.cpp
View File

@ -1719,6 +1719,30 @@ uint32_t Object::get_edited_version() const {
} }
#endif #endif
StringName Object::get_class_name_for_extension(const GDExtension *p_library) const {
// Only return the class name per the extension if it matches the given p_library.
if (_extension && _extension->library == p_library) {
return _extension->class_name;
}
// Extensions only have wrapper classes for classes exposed in ClassDB.
const StringName *class_name = _get_class_namev();
if (ClassDB::is_class_exposed(*class_name)) {
return *class_name;
}
// Find the nearest parent class that's exposed.
StringName parent_class = ClassDB::get_parent_class(*class_name);
while (parent_class != StringName()) {
if (ClassDB::is_class_exposed(parent_class)) {
return parent_class;
}
parent_class = ClassDB::get_parent_class(parent_class);
}
return SNAME("Object");
}
void Object::set_instance_binding(void *p_token, void *p_binding, const GDExtensionInstanceBindingCallbacks *p_callbacks) { void Object::set_instance_binding(void *p_token, void *p_binding, const GDExtensionInstanceBindingCallbacks *p_callbacks) {
// This is only meant to be used on creation by the binder. // This is only meant to be used on creation by the binder.
ERR_FAIL_COND(_instance_bindings != nullptr); ERR_FAIL_COND(_instance_bindings != nullptr);

12
core/object/object.h
View File

@ -800,17 +800,7 @@ public:
return *_class_name_ptr; return *_class_name_ptr;
} }
_FORCE_INLINE_ const StringName &get_class_name_for_extension(const GDExtension *p_library) const { StringName get_class_name_for_extension(const GDExtension *p_library) const;
// Only return the class name per the extension if it matches the given p_library.
if (_extension && _extension->library == p_library) {
return _extension->class_name;
}
// Otherwise, return the name of the built-in class.
if (unlikely(!_class_name_ptr)) {
return *_get_class_namev();
}
return *_class_name_ptr;
}
/* IAPI */ /* IAPI */