Skip to content

Commit ef528d3

Browse files
BastiaanOlijBastiaanOlij
committed
Rename interface to gdn_interface because it's a defined keyword under windows
1 parent 5148aad commit ef528d3

File tree

19 files changed

+246
-240
lines changed

19 files changed

+246
-240
lines changed

‎binding_generator.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -499,58 +499,58 @@ def generate_builtin_class_source(builtin_api, size, used_classes, fully_used_cl
499499
if "constructors" in builtin_api:
500500
for constructor in builtin_api["constructors"]:
501501
result.append(
502-
f'\t_method_bindings.constructor_{constructor["index"]} = internal::interface->variant_get_ptr_constructor({enum_type_name}, {constructor["index"]});'
502+
f'\t_method_bindings.constructor_{constructor["index"]} = internal::gdn_interface->variant_get_ptr_constructor({enum_type_name}, {constructor["index"]});'
503503
)
504504

505505
if builtin_api["has_destructor"]:
506506
result.append(
507-
f"\t_method_bindings.destructor = internal::interface->variant_get_ptr_destructor({enum_type_name});"
507+
f"\t_method_bindings.destructor = internal::gdn_interface->variant_get_ptr_destructor({enum_type_name});"
508508
)
509509

510510
if "methods" in builtin_api:
511511
for method in builtin_api["methods"]:
512512
# TODO: Add error check for hash mismatch.
513513
result.append(
514-
f'\t_method_bindings.method_{method["name"]} = internal::interface->variant_get_ptr_builtin_method({enum_type_name}, "{method["name"]}", {method["hash"]});'
514+
f'\t_method_bindings.method_{method["name"]} = internal::gdn_interface->variant_get_ptr_builtin_method({enum_type_name}, "{method["name"]}", {method["hash"]});'
515515
)
516516

517517
if "members" in builtin_api:
518518
for member in builtin_api["members"]:
519519
result.append(
520-
f'\t_method_bindings.member_{member["name"]}_setter = internal::interface->variant_get_ptr_setter({enum_type_name}, "{member["name"]}");'
520+
f'\t_method_bindings.member_{member["name"]}_setter = internal::gdn_interface->variant_get_ptr_setter({enum_type_name}, "{member["name"]}");'
521521
)
522522
result.append(
523-
f'\t_method_bindings.member_{member["name"]}_getter = internal::interface->variant_get_ptr_getter({enum_type_name}, "{member["name"]}");'
523+
f'\t_method_bindings.member_{member["name"]}_getter = internal::gdn_interface->variant_get_ptr_getter({enum_type_name}, "{member["name"]}");'
524524
)
525525

526526
if "indexing_return_type" in builtin_api:
527527
result.append(
528-
f"\t_method_bindings.indexed_setter = internal::interface->variant_get_ptr_indexed_setter({enum_type_name});"
528+
f"\t_method_bindings.indexed_setter = internal::gdn_interface->variant_get_ptr_indexed_setter({enum_type_name});"
529529
)
530530
result.append(
531-
f"\t_method_bindings.indexed_getter = internal::interface->variant_get_ptr_indexed_getter({enum_type_name});"
531+
f"\t_method_bindings.indexed_getter = internal::gdn_interface->variant_get_ptr_indexed_getter({enum_type_name});"
532532
)
533533

534534
if "is_keyed" in builtin_api and builtin_api["is_keyed"]:
535535
result.append(
536-
f"\t_method_bindings.keyed_setter = internal::interface->variant_get_ptr_keyed_setter({enum_type_name});"
536+
f"\t_method_bindings.keyed_setter = internal::gdn_interface->variant_get_ptr_keyed_setter({enum_type_name});"
537537
)
538538
result.append(
539-
f"\t_method_bindings.keyed_getter = internal::interface->variant_get_ptr_keyed_getter({enum_type_name});"
539+
f"\t_method_bindings.keyed_getter = internal::gdn_interface->variant_get_ptr_keyed_getter({enum_type_name});"
540540
)
541541
result.append(
542-
f"\t_method_bindings.keyed_checker = internal::interface->variant_get_ptr_keyed_checker({enum_type_name});"
542+
f"\t_method_bindings.keyed_checker = internal::gdn_interface->variant_get_ptr_keyed_checker({enum_type_name});"
543543
)
544544

545545
if "operators" in builtin_api:
546546
for operator in builtin_api["operators"]:
547547
if "right_type" in operator:
548548
result.append(
549-
f'\t_method_bindings.operator_{get_operator_id_name(operator["name"])}_{operator["right_type"]} = internal::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()});'
549+
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()});'
550550
)
551551
else:
552552
result.append(
553-
f'\t_method_bindings.operator_{get_operator_id_name(operator["name"])} = internal::interface->variant_get_ptr_operator_evaluator(GDNATIVE_VARIANT_OP_{get_operator_id_name(operator["name"]).upper()}, {enum_type_name}, GDNATIVE_VARIANT_TYPE_NIL);'
553+
f'\t_method_bindings.operator_{get_operator_id_name(operator["name"])} = internal::gdn_interface->variant_get_ptr_operator_evaluator(GDNATIVE_VARIANT_OP_{get_operator_id_name(operator["name"]).upper()}, {enum_type_name}, GDNATIVE_VARIANT_TYPE_NIL);'
554554
)
555555

556556
result.append("}")
@@ -1012,13 +1012,13 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
10121012
if is_singleton:
10131013
result.append(f"{class_name} *{class_name}::get_singleton() {{")
10141014
result.append(
1015-
f'\tstatic GDNativeObjectPtr singleton_obj = internal::interface->global_get_singleton("{class_name}");'
1015+
f'\tstatic GDNativeObjectPtr singleton_obj = internal::gdn_interface->global_get_singleton("{class_name}");'
10161016
)
10171017
result.append("#ifdef DEBUG_ENABLED")
10181018
result.append("\tERR_FAIL_COND_V(singleton_obj == nullptr, nullptr);")
10191019
result.append("#endif // DEBUG_ENABLED")
10201020
result.append(
1021-
f"\tstatic {class_name} *singleton = reinterpret_cast<{class_name} *>(internal::interface->object_get_instance_binding(singleton_obj, internal::token, &{class_name}::___binding_callbacks));"
1021+
f"\tstatic {class_name} *singleton = reinterpret_cast<{class_name} *>(internal::gdn_interface->object_get_instance_binding(singleton_obj, internal::token, &{class_name}::___binding_callbacks));"
10221022
)
10231023
result.append("\treturn singleton;")
10241024
result.append("}")
@@ -1038,7 +1038,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
10381038

10391039
# Method body.
10401040
result.append(
1041-
f'\tstatic GDNativeMethodBindPtr ___method_bind = internal::interface->classdb_get_method_bind("{class_name}", "{method["name"]}", {method["hash"]});'
1041+
f'\tstatic GDNativeMethodBindPtr ___method_bind = internal::gdn_interface->classdb_get_method_bind("{class_name}", "{method["name"]}", {method["hash"]});'
10421042
)
10431043
method_call = "\t"
10441044
has_return = "return_value" in method and method["return_value"]["type"] != "void"
@@ -1080,7 +1080,7 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
10801080
else: # vararg.
10811081
result.append("\tGDNativeCallError error;")
10821082
result.append("\tVariant ret;")
1083-
method_call += "internal::interface->object_method_bind_call(___method_bind, _owner, (const GDNativeVariantPtr *)args, arg_count, &ret, &error"
1083+
method_call += "internal::gdn_interface->object_method_bind_call(___method_bind, _owner, (const GDNativeVariantPtr *)args, arg_count, &ret, &error"
10841084

10851085
if is_ref:
10861086
method_call += ")" # Close Ref<> constructor.
@@ -1231,7 +1231,7 @@ def generate_utility_functions(api, output_dir):
12311231
# Function body.
12321232

12331233
source.append(
1234-
f'\tstatic GDNativePtrUtilityFunction ___function = internal::interface->variant_get_ptr_utility_function("{function["name"]}", {function["hash"]});'
1234+
f'\tstatic GDNativePtrUtilityFunction ___function = internal::gdn_interface->variant_get_ptr_utility_function("{function["name"]}", {function["hash"]});'
12351235
)
12361236
has_return = "return_type" in function and function["return_type"] != "void"
12371237
if has_return:

‎include/godot_cpp/classes/ref.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ class Ref {
240240
template <class T>
241241
struct PtrToArg<Ref<T>> {
242242
_FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) {
243-
return Ref<T>(godot::internal::interface->object_get_instance_binding((void *)p_ptr, godot::internal::token, &T::___binding_callbacks));
243+
return Ref<T>(godot::internal::gdn_interface->object_get_instance_binding((void *)p_ptr, godot::internal::token, &T::___binding_callbacks));
244244
}
245245

246246
typedef Ref<T> EncodeT;
@@ -255,7 +255,7 @@ struct PtrToArg<const Ref<T> &> {
255255
typedef Ref<T> EncodeT;
256256

257257
_FORCE_INLINE_ static Ref<T> convert(const void *p_ptr) {
258-
return Ref<T>(godot::internal::interface->object_get_instance_binding((void *)p_ptr, godot::internal::token, &T::___binding_callbacks));
258+
return Ref<T>(godot::internal::gdn_interface->object_get_instance_binding((void *)p_ptr, godot::internal::token, &T::___binding_callbacks));
259259
}
260260
};
261261

0 commit comments

Comments
 (0)