Skip to content

Commit 4bfddc5

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

File tree

19 files changed

+135
-129
lines changed

19 files changed

+135
-129
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

‎include/godot_cpp/classes/wrapped.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public:
145145
} \
146146
\
147147
static void set_object_instance(GDExtensionClassInstancePtr p_instance, GDNativeObjectPtr p_object_instance) { \
148-
godot::internal::interface->object_set_instance_binding(p_object_instance, godot::internal::token, p_instance, &m_class::___binding_callbacks); \
148+
godot::internal::gdn_interface->object_set_instance_binding(p_object_instance, godot::internal::token, p_instance, &m_class::___binding_callbacks); \
149149
reinterpret_cast<m_class *>(p_instance)->_owner = reinterpret_cast<godot::GodotObject *>(p_object_instance); \
150150
} \
151151
\
@@ -165,10 +165,10 @@ public:
165165
\
166166
static m_class *_new() { \
167167
static GDNativeExtensionPtr ___extension = nullptr; \
168-
static GDNativeClassConstructor ___constructor = godot::internal::interface->classdb_get_constructor(#m_class, &___extension); \
168+
static GDNativeClassConstructor ___constructor = godot::internal::gdn_interface->classdb_get_constructor(#m_class, &___extension); \
169169
CHECK_CLASS_CONSTRUCTOR(___constructor, m_class); \
170-
GDNativeObjectPtr obj = godot::internal::interface->classdb_construct_object(___constructor, ___extension); \
171-
return reinterpret_cast<m_class *>(godot::internal::interface->object_get_instance_binding(obj, godot::internal::token, &m_class::___binding_callbacks)); \
170+
GDNativeObjectPtr obj = godot::internal::gdn_interface->classdb_construct_object(___constructor, ___extension); \
171+
return reinterpret_cast<m_class *>(godot::internal::gdn_interface->object_get_instance_binding(obj, godot::internal::token, &m_class::___binding_callbacks)); \
172172
} \
173173
\
174174
private:
@@ -208,10 +208,10 @@ public:
208208
___binding_reference_callback, \
209209
}; \
210210
static m_class *_new() { \
211-
static GDNativeClassConstructor ___constructor = godot::internal::interface->classdb_get_constructor(#m_class, nullptr); \
211+
static GDNativeClassConstructor ___constructor = godot::internal::gdn_interface->classdb_get_constructor(#m_class, nullptr); \
212212
CHECK_CLASS_CONSTRUCTOR(___constructor, m_class); \
213213
GDNativeObjectPtr obj = ___constructor(); \
214-
return reinterpret_cast<m_class *>(godot::internal::interface->object_get_instance_binding(obj, godot::internal::token, &m_class::___binding_callbacks)); \
214+
return reinterpret_cast<m_class *>(godot::internal::gdn_interface->object_get_instance_binding(obj, godot::internal::token, &m_class::___binding_callbacks)); \
215215
} \
216216
\
217217
private:

‎include/godot_cpp/core/binder_common.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ template <class T>
106106
struct VariantCasterAndValidate {
107107
static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDNativeCallError &r_error) {
108108
GDNativeVariantType argtype = GetTypeInfo<T>::VARIANT_TYPE;
109-
if (!internal::interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) ||
109+
if (!internal::gdn_interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) ||
110110
!VariantObjectClassChecker<T>::check(p_args[p_arg_idx])) {
111111
r_error.error = GDNATIVE_CALL_ERROR_INVALID_ARGUMENT;
112112
r_error.argument = p_arg_idx;
@@ -121,7 +121,7 @@ template <class T>
121121
struct VariantCasterAndValidate<T &> {
122122
static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDNativeCallError &r_error) {
123123
GDNativeVariantType argtype = GetTypeInfo<T>::VARIANT_TYPE;
124-
if (!internal::interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) ||
124+
if (!internal::gdn_interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) ||
125125
!VariantObjectClassChecker<T>::check(p_args[p_arg_idx])) {
126126
r_error.error = GDNATIVE_CALL_ERROR_INVALID_ARGUMENT;
127127
r_error.argument = p_arg_idx;
@@ -136,7 +136,7 @@ template <class T>
136136
struct VariantCasterAndValidate<const T &> {
137137
static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDNativeCallError &r_error) {
138138
GDNativeVariantType argtype = GetTypeInfo<T>::VARIANT_TYPE;
139-
if (!internal::interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) ||
139+
if (!internal::gdn_interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) ||
140140
!VariantObjectClassChecker<T>::check(p_args[p_arg_idx])) {
141141
r_error.error = GDNATIVE_CALL_ERROR_INVALID_ARGUMENT;
142142
r_error.argument = p_arg_idx;

‎include/godot_cpp/core/class_db.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void ClassDB::register_class() {
163163
(void *)cl.name, //void *class_userdata;
164164
};
165165

166-
internal::interface->classdb_register_extension_class(internal::library, cl.name, cl.parent_name, &class_info);
166+
internal::gdn_interface->classdb_register_extension_class(internal::library, cl.name, cl.parent_name, &class_info);
167167

168168
// call bind_methods etc. to register all members of the class
169169
T::initialize_class();

‎include/godot_cpp/core/engine_ptrcall.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,22 +47,22 @@ template <class O, class... Args>
4747
O *_call_native_mb_ret_obj(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) {
4848
GodotObject *ret = nullptr;
4949
std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } };
50-
internal::interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret);
51-
return reinterpret_cast<O *>(internal::interface->object_get_instance_binding(ret, internal::token, &O::___binding_callbacks));
50+
internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret);
51+
return reinterpret_cast<O *>(internal::gdn_interface->object_get_instance_binding(ret, internal::token, &O::___binding_callbacks));
5252
}
5353

5454
template <class R, class... Args>
5555
R _call_native_mb_ret(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) {
5656
R ret;
5757
std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } };
58-
internal::interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret);
58+
internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret);
5959
return ret;
6060
}
6161

6262
template <class... Args>
6363
void _call_native_mb_no_ret(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) {
6464
std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } };
65-
internal::interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), nullptr);
65+
internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), nullptr);
6666
}
6767

6868
template <class R, class... Args>
@@ -78,7 +78,7 @@ Object *_call_utility_ret_obj(const GDNativePtrUtilityFunction func, void *insta
7878
GodotObject *ret = nullptr;
7979
std::array<const GDNativeTypePtr, sizeof...(Args)> mb_args = { { (const GDNativeTypePtr)args... } };
8080
func(&ret, mb_args.data(), mb_args.size());
81-
return (Object *)internal::interface->object_get_instance_binding(ret, internal::token, &Object::___binding_callbacks);
81+
return (Object *)internal::gdn_interface->object_get_instance_binding(ret, internal::token, &Object::___binding_callbacks);
8282
}
8383

8484
template <class... Args>

‎include/godot_cpp/core/memory.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void memdelete(T *p_class, typename std::enable_if<!std::is_base_of_v<godot::Wra
9090

9191
template <class T, std::enable_if_t<std::is_base_of_v<godot::Wrapped, T>, bool> = true>
9292
void memdelete(T *p_class) {
93-
godot::internal::interface->object_destroy(p_class->_owner);
93+
godot::internal::gdn_interface->object_destroy(p_class->_owner);
9494
}
9595

9696
#define memnew_arr(m_class, m_count) memnew_arr_template<m_class>(m_count)

0 commit comments

Comments
 (0)