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

Merge pull request #1412 from dsnopek/gdextension-register-virtual-method-namespace 

Use explicit `::godot` namespace in gdvirtual.gen.inc
pull/1375/head
David Snopek 2024-03-12 14:27:56 -05:00 committed by GitHub
parent efb46f7f82 12ebe4b180
commit d78fe9853f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
binding_generator.py
View File

@ -72,13 +72,13 @@ def generate_wrappers(target):
def generate_virtual_version(argcount, const=False, returns=False): def generate_virtual_version(argcount, const=False, returns=False):
s = """#define GDVIRTUAL$VER($RET m_name $ARG)\\ s = """#define GDVIRTUAL$VER($RET m_name $ARG)\\
StringName _gdvirtual_##m_name##_sn = #m_name;\\ ::godot::StringName _gdvirtual_##m_name##_sn = #m_name;\\
template <bool required>\\ template <bool required>\\
_FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST {\\ _FORCE_INLINE_ bool _gdvirtual_##m_name##_call($CALLARGS) $CONST {\\
if (::godot::internal::gdextension_interface_object_has_script_method(_owner, &_gdvirtual_##m_name##_sn)) { \\ if (::godot::internal::gdextension_interface_object_has_script_method(_owner, &_gdvirtual_##m_name##_sn)) { \\
GDExtensionCallError ce;\\ GDExtensionCallError ce;\\
$CALLSIARGS\\ $CALLSIARGS\\
Variant ret;\\ ::godot::Variant ret;\\
::godot::internal::gdextension_interface_object_call_script_method(_owner, &_gdvirtual_##m_name##_sn, $CALLSIARGPASS, &ret, &ce);\\ ::godot::internal::gdextension_interface_object_call_script_method(_owner, &_gdvirtual_##m_name##_sn, $CALLSIARGPASS, &ret, &ce);\\
if (ce.error == GDEXTENSION_CALL_OK) {\\ if (ce.error == GDEXTENSION_CALL_OK) {\\
$CALLSIRET\\ $CALLSIRET\\
@ -92,10 +92,10 @@ def generate_virtual_version(argcount, const=False, returns=False):
return false;\\ return false;\\
}\\ }\\
_FORCE_INLINE_ bool _gdvirtual_##m_name##_overridden() const {\\ _FORCE_INLINE_ bool _gdvirtual_##m_name##_overridden() const {\\
return godot::internal::gdextension_interface_object_has_script_method(_owner, &_gdvirtual_##m_name##_sn); \\ return ::godot::internal::gdextension_interface_object_has_script_method(_owner, &_gdvirtual_##m_name##_sn); \\
}\\ }\\
_FORCE_INLINE_ static MethodInfo _gdvirtual_##m_name##_get_method_info() {\\ _FORCE_INLINE_ static ::godot::MethodInfo _gdvirtual_##m_name##_get_method_info() {\\
MethodInfo method_info;\\ ::godot::MethodInfo method_info;\\
method_info.name = #m_name;\\ method_info.name = #m_name;\\
method_info.flags = $METHOD_FLAGS;\\ method_info.flags = $METHOD_FLAGS;\\
$FILL_METHOD_INFO\\ $FILL_METHOD_INFO\\
@ -110,8 +110,8 @@ def generate_virtual_version(argcount, const=False, returns=False):
sproto += "R" sproto += "R"
s = s.replace("$RET", "m_ret,") s = s.replace("$RET", "m_ret,")
s = s.replace("$RVOID", "(void)r_ret;") # If required, may lead to uninitialized errors s = s.replace("$RVOID", "(void)r_ret;") # If required, may lead to uninitialized errors
method_info += "method_info.return_val = GetTypeInfo<m_ret>::get_class_info();\\\n" method_info += "method_info.return_val = ::godot::GetTypeInfo<m_ret>::get_class_info();\\\n"
method_info += "\t\tmethod_info.return_val_metadata = GetTypeInfo<m_ret>::METADATA;" method_info += "\t\tmethod_info.return_val_metadata = ::godot::GetTypeInfo<m_ret>::METADATA;"
else: else:
s = s.replace("$RET ", "") s = s.replace("$RET ", "")
s = s.replace("\t\t\t$RVOID\\\n", "") s = s.replace("\t\t\t$RVOID\\\n", "")
@ -119,10 +119,10 @@ def generate_virtual_version(argcount, const=False, returns=False):
if const: if const:
sproto += "C" sproto += "C"
s = s.replace("$CONST", "const") s = s.replace("$CONST", "const")
s = s.replace("$METHOD_FLAGS", "METHOD_FLAG_VIRTUAL | METHOD_FLAG_CONST") s = s.replace("$METHOD_FLAGS", "::godot::METHOD_FLAG_VIRTUAL | ::godot::METHOD_FLAG_CONST")
else: else:
s = s.replace("$CONST ", "") s = s.replace("$CONST ", "")
s = s.replace("$METHOD_FLAGS", "METHOD_FLAG_VIRTUAL") s = s.replace("$METHOD_FLAGS", "::godot::METHOD_FLAG_VIRTUAL")
s = s.replace("$VER", sproto) s = s.replace("$VER", sproto)
argtext = "" argtext = ""
@ -131,8 +131,8 @@ def generate_virtual_version(argcount, const=False, returns=False):
callsiargptrs = "" callsiargptrs = ""
if argcount > 0: if argcount > 0:
argtext += ", " argtext += ", "
callsiargs = f"Variant vargs[{argcount}] = {{ " callsiargs = f"::godot::Variant vargs[{argcount}] = {{ "
callsiargptrs = f"\t\t\tconst Variant *vargptrs[{argcount}] = {{ " callsiargptrs = f"\t\t\tconst ::godot::Variant *vargptrs[{argcount}] = {{ "
for i in range(argcount): for i in range(argcount):
if i > 0: if i > 0:
argtext += ", " argtext += ", "
@ -141,12 +141,12 @@ def generate_virtual_version(argcount, const=False, returns=False):
callsiargptrs += ", " callsiargptrs += ", "
argtext += f"m_type{i + 1}" argtext += f"m_type{i + 1}"
callargtext += f"m_type{i + 1} arg{i + 1}" callargtext += f"m_type{i + 1} arg{i + 1}"
callsiargs += f"Variant(arg{i + 1})" callsiargs += f"::godot::Variant(arg{i + 1})"
callsiargptrs += f"&vargs[{i}]" callsiargptrs += f"&vargs[{i}]"
if method_info: if method_info:
method_info += "\\\n\t\t" method_info += "\\\n\t\t"
method_info += f"method_info.arguments.push_back(GetTypeInfo<m_type{i + 1}>::get_class_info());\\\n" method_info += f"method_info.arguments.push_back(::godot::GetTypeInfo<m_type{i + 1}>::get_class_info());\\\n"
method_info += f"\t\tmethod_info.arguments_metadata.push_back(GetTypeInfo<m_type{i + 1}>::METADATA);" method_info += f"\t\tmethod_info.arguments_metadata.push_back(::godot::GetTypeInfo<m_type{i + 1}>::METADATA);"
if argcount: if argcount:
callsiargs += " };\\\n" callsiargs += " };\\\n"
@ -161,7 +161,7 @@ def generate_virtual_version(argcount, const=False, returns=False):
if argcount > 0: if argcount > 0:
callargtext += ", " callargtext += ", "
callargtext += "m_ret &r_ret" callargtext += "m_ret &r_ret"
s = s.replace("$CALLSIRET", "r_ret = VariantCaster<m_ret>::cast(ret);") s = s.replace("$CALLSIRET", "r_ret = ::godot::VariantCaster<m_ret>::cast(ret);")
else: else:
s = s.replace("\t\t\t\t$CALLSIRET\\\n", "") s = s.replace("\t\t\t\t$CALLSIRET\\\n", "")