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

Fix Variant types displayed as `Nil` in extension_api.json

pull/879/head
Emmanuel Leblond 2022-10-03 14:28:33 +02:00
parent f69f1bb58f
commit 5282009121
No known key found for this signature in database
GPG Key ID: C360860E645EFFC0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
binding_generator.py
View File

@ -280,10 +280,7 @@ def generate_builtin_bindings(api, output_dir, build_config):
if "operators" in builtin_api: if "operators" in builtin_api:
for operator in builtin_api["operators"]: for operator in builtin_api["operators"]:
if "right_type" in operator: if "right_type" in operator:
# FIXME Temporary workaround for incorrect JSON if is_included(operator["right_type"], class_name):
if operator["right_type"] == "Nil":
used_classes.add("Variant")
elif is_included(operator["right_type"], class_name):
used_classes.add(operator["right_type"]) used_classes.add(operator["right_type"])
for type_name in fully_used_classes: for type_name in fully_used_classes:
@ -728,8 +725,12 @@ def generate_builtin_class_source(builtin_api, size, used_classes, fully_used_cl
if "operators" in builtin_api: if "operators" in builtin_api:
for operator in builtin_api["operators"]: for operator in builtin_api["operators"]:
if "right_type" in operator: if "right_type" in operator:
if operator["right_type"] == "Variant":
right_type_variant_type = "GDNATIVE_VARIANT_TYPE_NIL"
else:
right_type_variant_type = f"GDNATIVE_VARIANT_TYPE_{camel_to_snake(operator['right_type']).upper()}"
result.append( result.append(
f'\t_method_bindings.operator_{get_operator_id_name(operator["name"])}_{operator["right_type"]} = internal::gdn_interface->variant_get_ptr_operator_evaluator(GDNATIVE_VARIANT_OP_{get_operator_id_name(operator["name"]).upper()}, {enum_type_name}, GDNATIVE_VARIANT_TYPE_{camel_to_snake(operator["right_type"]).upper()});' f'\t_method_bindings.operator_{get_operator_id_name(operator["name"])}_{operator["right_type"]} = internal::gdn_interface->variant_get_ptr_operator_evaluator(GDNATIVE_VARIANT_OP_{get_operator_id_name(operator["name"]).upper()}, {enum_type_name}, {right_type_variant_type});'
) )
else: else:
result.append( result.append(