godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Properly set up virtual calls for extensions

Browse Source
This commit is contained in:
George Marques
2021-08-17 22:11:11 -03:00
parent fcfea84d5e
commit 3b593b596e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/extension/native_extension.cpp
View File

@@ -154,6 +154,7 @@ void NativeExtension::_register_extension_class(const GDNativeExtensionClassLibr
extension->native_extension.create_instance = p_extension_funcs->create_instance_func; extension->native_extension.create_instance = p_extension_funcs->create_instance_func;
extension->native_extension.set_object_instance = p_extension_funcs->object_instance_func; extension->native_extension.set_object_instance = p_extension_funcs->object_instance_func;
extension->native_extension.free_instance = p_extension_funcs->free_instance_func; extension->native_extension.free_instance = p_extension_funcs->free_instance_func;
extension->native_extension.get_virtual = p_extension_funcs->get_virtual_func;
ClassDB::register_extension_class(&extension->native_extension); ClassDB::register_extension_class(&extension->native_extension);
} }

2
core/object/make_virtuals.py
View File

@@ -1,8 +1,8 @@
proto = """ proto = """
#define GDVIRTUAL$VER($RET m_name $ARG) \\ #define GDVIRTUAL$VER($RET m_name $ARG) \\
GDNativeExtensionClassCallVirtual _gdvirtual_##m_name = (_get_extension() && _get_extension()->get_virtual) ? _get_extension()->get_virtual(_get_extension()->class_userdata, #m_name) : (GDNativeExtensionClassCallVirtual) nullptr;\\
StringName _gdvirtual_##m_name##_sn = #m_name;\\ StringName _gdvirtual_##m_name##_sn = #m_name;\\
bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST { \\
GDNativeExtensionClassCallVirtual _gdvirtual_##m_name = (_get_extension() && _get_extension()->get_virtual) ? _get_extension()->get_virtual(_get_extension()->class_userdata, #m_name) : (GDNativeExtensionClassCallVirtual) nullptr;\\
ScriptInstance *script_instance = ((Object*)(this))->get_script_instance();\\ ScriptInstance *script_instance = ((Object*)(this))->get_script_instance();\\
if (script_instance) {\\ if (script_instance) {\\
Callable::CallError ce; \\ Callable::CallError ce; \\