Skip to content

Allow GDExtension to register unexposed classes. #69653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/extension/gdnative_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ typedef GDNativeExtensionClassCallVirtual (*GDNativeExtensionClassGetVirtual)(vo
typedef struct {
GDNativeBool is_virtual;
GDNativeBool is_abstract;
GDNativeBool is_exposed;
GDNativeExtensionClassSet set_func;
GDNativeExtensionClassGet get_func;
GDNativeExtensionClassGetPropertyList get_property_list_func;
Expand Down
1 change: 1 addition & 0 deletions core/extension/native_extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ void NativeExtension::_register_extension_class(GDNativeExtensionClassLibraryPtr
extension->native_extension.editor_class = self->level_initialized == INITIALIZATION_LEVEL_EDITOR;
extension->native_extension.is_virtual = p_extension_funcs->is_virtual;
extension->native_extension.is_abstract = p_extension_funcs->is_abstract;
extension->native_extension.is_exposed = p_extension_funcs->is_exposed;
extension->native_extension.set = p_extension_funcs->set_func;
extension->native_extension.get = p_extension_funcs->get_func;
extension->native_extension.get_property_list = p_extension_funcs->get_property_list_func;
Expand Down
6 changes: 5 additions & 1 deletion core/object/class_db.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1541,7 +1541,11 @@ void ClassDB::register_extension_class(ObjectNativeExtension *p_extension) {
c.inherits = parent->name;
c.class_ptr = parent->class_ptr;
c.inherits_ptr = parent;
c.exposed = true;
c.exposed = p_extension->is_exposed;
if (c.exposed) {
// The parent classes should be exposed if has a exposed child class.
parent->exposed = true;
}

classes[p_extension->class_name] = c;
}
Expand Down
36 changes: 32 additions & 4 deletions core/object/class_db.h
Original file line number Diff line number Diff line change
Expand Up @@ -178,31 +178,59 @@ class ClassDB {
}

template <class T>
static void register_class(bool p_virtual = false) {
static void register_class(bool p_virtual = false, bool p_exposed = true) {
GLOBAL_LOCK_FUNCTION;
T::initialize_class();
ClassInfo *t = classes.getptr(T::get_class_static());
ERR_FAIL_COND(!t);
t->creation_func = &creator<T>;
t->exposed = true;
t->exposed = p_exposed;
t->is_virtual = p_virtual;
t->class_ptr = T::get_class_ptr_static();
t->api = current_api;
T::register_custom_data_to_otdb();
}

template <class T>
static void register_abstract_class() {
static void register_abstract_class(bool p_exposed = true) {
GLOBAL_LOCK_FUNCTION;
T::initialize_class();
ClassInfo *t = classes.getptr(T::get_class_static());
ERR_FAIL_COND(!t);
t->exposed = true;
t->exposed = p_exposed;
t->class_ptr = T::get_class_ptr_static();
t->api = current_api;
//nothing
}

template <class T>
static void register_virtual_class(bool p_exposed = true) {
GLOBAL_LOCK_FUNCTION;
T::initialize_class();
ClassInfo *t = classes.getptr(T::get_class_static());
ERR_FAIL_COND(!t);
t->creation_func = &creator<T>;
t->exposed = p_exposed;
t->is_virtual = true;
t->class_ptr = T::get_class_ptr_static();
t->api = current_api;
T::register_custom_data_to_otdb();
}

template <class T>
static void register_internal_class(bool p_virtual = false) {
GLOBAL_LOCK_FUNCTION;
T::initialize_class();
ClassInfo *t = classes.getptr(T::get_class_static());
ERR_FAIL_COND(!t);
t->creation_func = &creator<T>;
t->exposed = false;
t->is_virtual = false;
t->class_ptr = T::get_class_ptr_static();
t->api = current_api;
T::register_custom_data_to_otdb();
}

static void register_extension_class(ObjectNativeExtension *p_extension);
static void unregister_extension_class(const StringName &p_class);

Expand Down
1 change: 1 addition & 0 deletions core/object/object.h
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ struct ObjectNativeExtension {
bool editor_class = false;
bool is_virtual = false;
bool is_abstract = false;
bool is_exposed = true;
GDNativeExtensionClassSet set;
GDNativeExtensionClassGet get;
GDNativeExtensionClassGetPropertyList get_property_list;
Expand Down