Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use GDType for GDExtension types as well.

Browse source 
Co-authored-by: David Snopek <dsnopek@gmail.com>
This commit is contained in:
Lukas Tenbrink 2025-10-06 22:35:40 +02:00
parent 2ecefada8d
commit aa33b53e67
6 changed files with 78 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

26
core/object/class_db.cpp
View file

@ -196,6 +196,8 @@ public:
obj->_extension = ClassDB::get_placeholder_extension(ti->name);
obj->_extension_instance = memnew(PlaceholderExtensionInstance(ti->name));
obj->_reset_gdtype();
#ifdef TOOLS_ENABLED
if (obj->_extension->track_instance) {
obj->_extension->track_instance(obj->_extension->tracking_userdata, obj);
@ -756,10 +758,19 @@ ObjectGDExtension *ClassDB::get_placeholder_extension(const StringName &p_class)
placeholder_extension->call_virtual_with_data = nullptr;
placeholder_extension->recreate_instance = &PlaceholderExtensionInstance::placeholder_class_recreate_instance;
placeholder_extension->create_gdtype();
return placeholder_extension;
}
#endif
const GDType *ClassDB::get_gdtype(const StringName &p_class) {
Locker::Lock lock(Locker::STATE_READ);
ClassInfo *type = classes.getptr(p_class);
ERR_FAIL_NULL_V(type, nullptr);
return type->gdtype;
}
void ClassDB::set_object_extension_instance(Object *p_object, const StringName &p_class, GDExtensionClassInstancePtr p_instance) {
ERR_FAIL_NULL(p_object);
ClassInfo *ti;
@ -779,6 +790,8 @@ void ClassDB::set_object_extension_instance(Object *p_object, const StringName &
p_object->_extension = ti->gdextension;
p_object->_extension_instance = p_instance;
p_object->_reset_gdtype();
#ifdef TOOLS_ENABLED
if (p_object->_extension->track_instance) {
p_object->_extension->track_instance(p_object->_extension->tracking_userdata, p_object);
@ -870,17 +883,20 @@ use_script:
return scr.is_valid() && scr->is_valid() && scr->is_abstract();
}
void ClassDB::_add_class(const StringName &p_class, const StringName &p_inherits) {
void ClassDB::_add_class(const GDType &p_class, const GDType *p_inherits) {
Locker::Lock lock(Locker::STATE_WRITE);
const StringName &name = p_class;
const StringName &name = p_class.get_name();
ERR_FAIL_COND_MSG(classes.has(name), vformat("Class '%s' already exists.", String(p_class)));
ERR_FAIL_COND_MSG(classes.has(name), vformat("Class '%s' already exists.", name));
classes[name] = ClassInfo();
ClassInfo &ti = classes[name];
ti.name = name;
ti.inherits = p_inherits;
ti.gdtype = &p_class;
if (p_inherits) {
ti.inherits = p_inherits->get_name();
}
ti.api = current_api;
if (ti.inherits) {
@ -2350,6 +2366,8 @@ void ClassDB::register_extension_class(ObjectGDExtension *p_extension) {
c.is_runtime = p_extension->is_runtime;
#endif
c.gdtype = p_extension->gdtype;
classes[p_extension->class_name] = c;
}