diff options
Diffstat (limited to 'include/godot_cpp/core')
| -rw-r--r-- | include/godot_cpp/core/binder_common.hpp | 124 | ||||
| -rw-r--r-- | include/godot_cpp/core/builtin_ptrcall.hpp | 18 | ||||
| -rw-r--r-- | include/godot_cpp/core/class_db.hpp | 66 | ||||
| -rw-r--r-- | include/godot_cpp/core/defs.hpp | 8 | ||||
| -rw-r--r-- | include/godot_cpp/core/engine_ptrcall.hpp | 36 | ||||
| -rw-r--r-- | include/godot_cpp/core/math.hpp | 2 | ||||
| -rw-r--r-- | include/godot_cpp/core/memory.hpp | 2 | ||||
| -rw-r--r-- | include/godot_cpp/core/method_bind.hpp | 112 | ||||
| -rw-r--r-- | include/godot_cpp/core/method_ptrcall.hpp | 4 | ||||
| -rw-r--r-- | include/godot_cpp/core/object.hpp | 20 | ||||
| -rw-r--r-- | include/godot_cpp/core/property_info.hpp | 4 | ||||
| -rw-r--r-- | include/godot_cpp/core/type_info.hpp | 198 |
12 files changed, 297 insertions, 297 deletions
diff --git a/include/godot_cpp/core/binder_common.hpp b/include/godot_cpp/core/binder_common.hpp index 93b21ca..30ff8f3 100644 --- a/include/godot_cpp/core/binder_common.hpp +++ b/include/godot_cpp/core/binder_common.hpp @@ -31,7 +31,7 @@ #ifndef GODOT_BINDER_COMMON_HPP #define GODOT_BINDER_COMMON_HPP -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <godot_cpp/core/method_ptrcall.hpp> #include <godot_cpp/core/type_info.hpp> @@ -125,11 +125,11 @@ struct VariantObjectClassChecker<const Ref<T> &> { template <class T> struct VariantCasterAndValidate { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDNativeCallError &r_error) { - GDNativeVariantType argtype = GDNativeVariantType(GetTypeInfo<T>::VARIANT_TYPE); - if (!internal::gdn_interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) || + static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDExtensionCallError &r_error) { + GDExtensionVariantType argtype = GDExtensionVariantType(GetTypeInfo<T>::VARIANT_TYPE); + if (!internal::gde_interface->variant_can_convert_strict(static_cast<GDExtensionVariantType>(p_args[p_arg_idx]->get_type()), argtype) || !VariantObjectClassChecker<T>::check(p_args[p_arg_idx])) { - r_error.error = GDNATIVE_CALL_ERROR_INVALID_ARGUMENT; + r_error.error = GDEXTENSION_CALL_ERROR_INVALID_ARGUMENT; r_error.argument = p_arg_idx; r_error.expected = argtype; } @@ -140,11 +140,11 @@ struct VariantCasterAndValidate { template <class T> struct VariantCasterAndValidate<T &> { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDNativeCallError &r_error) { - GDNativeVariantType argtype = GDNativeVariantType(GetTypeInfo<T>::VARIANT_TYPE); - if (!internal::gdn_interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) || + static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDExtensionCallError &r_error) { + GDExtensionVariantType argtype = GDExtensionVariantType(GetTypeInfo<T>::VARIANT_TYPE); + if (!internal::gde_interface->variant_can_convert_strict(static_cast<GDExtensionVariantType>(p_args[p_arg_idx]->get_type()), argtype) || !VariantObjectClassChecker<T>::check(p_args[p_arg_idx])) { - r_error.error = GDNATIVE_CALL_ERROR_INVALID_ARGUMENT; + r_error.error = GDEXTENSION_CALL_ERROR_INVALID_ARGUMENT; r_error.argument = p_arg_idx; r_error.expected = argtype; } @@ -155,11 +155,11 @@ struct VariantCasterAndValidate<T &> { template <class T> struct VariantCasterAndValidate<const T &> { - static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDNativeCallError &r_error) { - GDNativeVariantType argtype = GDNativeVariantType(GetTypeInfo<T>::VARIANT_TYPE); - if (!internal::gdn_interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(p_args[p_arg_idx]->get_type()), argtype) || + static _FORCE_INLINE_ T cast(const Variant **p_args, uint32_t p_arg_idx, GDExtensionCallError &r_error) { + GDExtensionVariantType argtype = GDExtensionVariantType(GetTypeInfo<T>::VARIANT_TYPE); + if (!internal::gde_interface->variant_can_convert_strict(static_cast<GDExtensionVariantType>(p_args[p_arg_idx]->get_type()), argtype) || !VariantObjectClassChecker<T>::check(p_args[p_arg_idx])) { - r_error.error = GDNATIVE_CALL_ERROR_INVALID_ARGUMENT; + r_error.error = GDEXTENSION_CALL_ERROR_INVALID_ARGUMENT; r_error.argument = p_arg_idx; r_error.expected = argtype; } @@ -169,48 +169,48 @@ struct VariantCasterAndValidate<const T &> { }; template <class T, class... P, size_t... Is> -void call_with_ptr_args_helper(T *p_instance, void (T::*p_method)(P...), GDNativeConstTypePtr *p_args, IndexSequence<Is...>) { +void call_with_ptr_args_helper(T *p_instance, void (T::*p_method)(P...), GDExtensionConstTypePtr *p_args, IndexSequence<Is...>) { (p_instance->*p_method)(PtrToArg<P>::convert(p_args[Is])...); } template <class T, class... P, size_t... Is> -void call_with_ptr_argsc_helper(T *p_instance, void (T::*p_method)(P...) const, GDNativeConstTypePtr *p_args, IndexSequence<Is...>) { +void call_with_ptr_argsc_helper(T *p_instance, void (T::*p_method)(P...) const, GDExtensionConstTypePtr *p_args, IndexSequence<Is...>) { (p_instance->*p_method)(PtrToArg<P>::convert(p_args[Is])...); } template <class T, class R, class... P, size_t... Is> -void call_with_ptr_args_ret_helper(T *p_instance, R (T::*p_method)(P...), GDNativeConstTypePtr *p_args, void *r_ret, IndexSequence<Is...>) { +void call_with_ptr_args_ret_helper(T *p_instance, R (T::*p_method)(P...), GDExtensionConstTypePtr *p_args, void *r_ret, IndexSequence<Is...>) { PtrToArg<R>::encode((p_instance->*p_method)(PtrToArg<P>::convert(p_args[Is])...), r_ret); } template <class T, class R, class... P, size_t... Is> -void call_with_ptr_args_retc_helper(T *p_instance, R (T::*p_method)(P...) const, GDNativeConstTypePtr *p_args, void *r_ret, IndexSequence<Is...>) { +void call_with_ptr_args_retc_helper(T *p_instance, R (T::*p_method)(P...) const, GDExtensionConstTypePtr *p_args, void *r_ret, IndexSequence<Is...>) { PtrToArg<R>::encode((p_instance->*p_method)(PtrToArg<P>::convert(p_args[Is])...), r_ret); } template <class T, class... P> -void call_with_ptr_args(T *p_instance, void (T::*p_method)(P...), GDNativeConstTypePtr *p_args, void * /*ret*/) { +void call_with_ptr_args(T *p_instance, void (T::*p_method)(P...), GDExtensionConstTypePtr *p_args, void * /*ret*/) { call_with_ptr_args_helper<T, P...>(p_instance, p_method, p_args, BuildIndexSequence<sizeof...(P)>{}); } template <class T, class... P> -void call_with_ptr_args(T *p_instance, void (T::*p_method)(P...) const, GDNativeConstTypePtr *p_args, void * /*ret*/) { +void call_with_ptr_args(T *p_instance, void (T::*p_method)(P...) const, GDExtensionConstTypePtr *p_args, void * /*ret*/) { call_with_ptr_argsc_helper<T, P...>(p_instance, p_method, p_args, BuildIndexSequence<sizeof...(P)>{}); } template <class T, class R, class... P> -void call_with_ptr_args(T *p_instance, R (T::*p_method)(P...), GDNativeConstTypePtr *p_args, void *r_ret) { +void call_with_ptr_args(T *p_instance, R (T::*p_method)(P...), GDExtensionConstTypePtr *p_args, void *r_ret) { call_with_ptr_args_ret_helper<T, R, P...>(p_instance, p_method, p_args, r_ret, BuildIndexSequence<sizeof...(P)>{}); } template <class T, class R, class... P> -void call_with_ptr_args(T *p_instance, R (T::*p_method)(P...) const, GDNativeConstTypePtr *p_args, void *r_ret) { +void call_with_ptr_args(T *p_instance, R (T::*p_method)(P...) const, GDExtensionConstTypePtr *p_args, void *r_ret) { call_with_ptr_args_retc_helper<T, R, P...>(p_instance, p_method, p_args, r_ret, BuildIndexSequence<sizeof...(P)>{}); } template <class T, class... P, size_t... Is> -void call_with_variant_args_helper(T *p_instance, void (T::*p_method)(P...), const Variant **p_args, GDNativeCallError &r_error, IndexSequence<Is...>) { - r_error.error = GDNATIVE_CALL_OK; +void call_with_variant_args_helper(T *p_instance, void (T::*p_method)(P...), const Variant **p_args, GDExtensionCallError &r_error, IndexSequence<Is...>) { + r_error.error = GDEXTENSION_CALL_OK; #ifdef DEBUG_METHODS_ENABLED (p_instance->*p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); @@ -221,8 +221,8 @@ void call_with_variant_args_helper(T *p_instance, void (T::*p_method)(P...), con } template <class T, class... P, size_t... Is> -void call_with_variant_argsc_helper(T *p_instance, void (T::*p_method)(P...) const, const Variant **p_args, GDNativeCallError &r_error, IndexSequence<Is...>) { - r_error.error = GDNATIVE_CALL_OK; +void call_with_variant_argsc_helper(T *p_instance, void (T::*p_method)(P...) const, const Variant **p_args, GDExtensionCallError &r_error, IndexSequence<Is...>) { + r_error.error = GDEXTENSION_CALL_OK; #ifdef DEBUG_METHODS_ENABLED (p_instance->*p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); @@ -233,8 +233,8 @@ void call_with_variant_argsc_helper(T *p_instance, void (T::*p_method)(P...) con } template <class T, class R, class... P, size_t... Is> -void call_with_variant_args_ret_helper(T *p_instance, R (T::*p_method)(P...), const Variant **p_args, Variant &r_ret, GDNativeCallError &r_error, IndexSequence<Is...>) { - r_error.error = GDNATIVE_CALL_OK; +void call_with_variant_args_ret_helper(T *p_instance, R (T::*p_method)(P...), const Variant **p_args, Variant &r_ret, GDExtensionCallError &r_error, IndexSequence<Is...>) { + r_error.error = GDEXTENSION_CALL_OK; #ifdef DEBUG_METHODS_ENABLED r_ret = (p_instance->*p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); @@ -244,8 +244,8 @@ void call_with_variant_args_ret_helper(T *p_instance, R (T::*p_method)(P...), co } template <class T, class R, class... P, size_t... Is> -void call_with_variant_args_retc_helper(T *p_instance, R (T::*p_method)(P...) const, const Variant **p_args, Variant &r_ret, GDNativeCallError &r_error, IndexSequence<Is...>) { - r_error.error = GDNATIVE_CALL_OK; +void call_with_variant_args_retc_helper(T *p_instance, R (T::*p_method)(P...) const, const Variant **p_args, Variant &r_ret, GDExtensionCallError &r_error, IndexSequence<Is...>) { + r_error.error = GDEXTENSION_CALL_OK; #ifdef DEBUG_METHODS_ENABLED r_ret = (p_instance->*p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); @@ -256,10 +256,10 @@ void call_with_variant_args_retc_helper(T *p_instance, R (T::*p_method)(P...) co } template <class T, class... P> -void call_with_variant_args_dv(T *p_instance, void (T::*p_method)(P...), GDNativeConstVariantPtr *p_args, int p_argcount, GDNativeCallError &r_error, const std::vector<Variant> &default_values) { +void call_with_variant_args_dv(T *p_instance, void (T::*p_method)(P...), GDExtensionConstVariantPtr *p_args, int p_argcount, GDExtensionCallError &r_error, const std::vector<Variant> &default_values) { #ifdef DEBUG_ENABLED if ((size_t)p_argcount > sizeof...(P)) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_MANY_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_MANY_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -270,7 +270,7 @@ void call_with_variant_args_dv(T *p_instance, void (T::*p_method)(P...), GDNativ int32_t dvs = (int32_t)default_values.size(); #ifdef DEBUG_ENABLED if (missing > dvs) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_FEW_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -291,10 +291,10 @@ void call_with_variant_args_dv(T *p_instance, void (T::*p_method)(P...), GDNativ } template <class T, class... P> -void call_with_variant_argsc_dv(T *p_instance, void (T::*p_method)(P...) const, GDNativeConstVariantPtr *p_args, int p_argcount, GDNativeCallError &r_error, const std::vector<Variant> &default_values) { +void call_with_variant_argsc_dv(T *p_instance, void (T::*p_method)(P...) const, GDExtensionConstVariantPtr *p_args, int p_argcount, GDExtensionCallError &r_error, const std::vector<Variant> &default_values) { #ifdef DEBUG_ENABLED if ((size_t)p_argcount > sizeof...(P)) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_MANY_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_MANY_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -305,7 +305,7 @@ void call_with_variant_argsc_dv(T *p_instance, void (T::*p_method)(P...) const, int32_t dvs = (int32_t)default_values.size(); #ifdef DEBUG_ENABLED if (missing > dvs) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_FEW_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -326,10 +326,10 @@ void call_with_variant_argsc_dv(T *p_instance, void (T::*p_method)(P...) const, } template <class T, class R, class... P> -void call_with_variant_args_ret_dv(T *p_instance, R (T::*p_method)(P...), GDNativeConstVariantPtr *p_args, int p_argcount, Variant &r_ret, GDNativeCallError &r_error, const std::vector<Variant> &default_values) { +void call_with_variant_args_ret_dv(T *p_instance, R (T::*p_method)(P...), GDExtensionConstVariantPtr *p_args, int p_argcount, Variant &r_ret, GDExtensionCallError &r_error, const std::vector<Variant> &default_values) { #ifdef DEBUG_ENABLED if ((size_t)p_argcount > sizeof...(P)) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_MANY_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_MANY_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -340,7 +340,7 @@ void call_with_variant_args_ret_dv(T *p_instance, R (T::*p_method)(P...), GDNati int32_t dvs = (int32_t)default_values.size(); #ifdef DEBUG_ENABLED if (missing > dvs) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_FEW_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -361,10 +361,10 @@ void call_with_variant_args_ret_dv(T *p_instance, R (T::*p_method)(P...), GDNati } template <class T, class R, class... P> -void call_with_variant_args_retc_dv(T *p_instance, R (T::*p_method)(P...) const, GDNativeConstVariantPtr *p_args, int p_argcount, Variant &r_ret, GDNativeCallError &r_error, const std::vector<Variant> &default_values) { +void call_with_variant_args_retc_dv(T *p_instance, R (T::*p_method)(P...) const, GDExtensionConstVariantPtr *p_args, int p_argcount, Variant &r_ret, GDExtensionCallError &r_error, const std::vector<Variant> &default_values) { #ifdef DEBUG_ENABLED if ((size_t)p_argcount > sizeof...(P)) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_MANY_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_MANY_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -375,7 +375,7 @@ void call_with_variant_args_retc_dv(T *p_instance, R (T::*p_method)(P...) const, int32_t dvs = (int32_t)default_values.size(); #ifdef DEBUG_ENABLED if (missing > dvs) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_FEW_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS; r_error.argument = (int32_t)sizeof...(P); return; } @@ -403,16 +403,16 @@ void call_with_variant_args_retc_dv(T *p_instance, R (T::*p_method)(P...) const, #endif template <class Q> -void call_get_argument_type_helper(int p_arg, int &index, GDNativeVariantType &type) { +void call_get_argument_type_helper(int p_arg, int &index, GDExtensionVariantType &type) { if (p_arg == index) { - type = GDNativeVariantType(GetTypeInfo<Q>::VARIANT_TYPE); + type = GDExtensionVariantType(GetTypeInfo<Q>::VARIANT_TYPE); } index++; } template <class... P> -GDNativeVariantType call_get_argument_type(int p_arg) { - GDNativeVariantType type = GDNATIVE_VARIANT_TYPE_NIL; +GDExtensionVariantType call_get_argument_type(int p_arg) { + GDExtensionVariantType type = GDEXTENSION_VARIANT_TYPE_NIL; int index = 0; // I think rocket science is simpler than modern C++. using expand_type = int[]; @@ -441,7 +441,7 @@ void call_get_argument_type_info(int p_arg, PropertyInfo &info) { } template <class Q> -void call_get_argument_metadata_helper(int p_arg, int &index, GDNativeExtensionClassMethodArgumentMetadata &md) { +void call_get_argument_metadata_helper(int p_arg, int &index, GDExtensionClassMethodArgumentMetadata &md) { if (p_arg == index) { md = GetTypeInfo<Q>::METADATA; } @@ -449,8 +449,8 @@ void call_get_argument_metadata_helper(int p_arg, int &index, GDNativeExtensionC } template <class... P> -GDNativeExtensionClassMethodArgumentMetadata call_get_argument_metadata(int p_arg) { - GDNativeExtensionClassMethodArgumentMetadata md = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; +GDExtensionClassMethodArgumentMetadata call_get_argument_metadata(int p_arg) { + GDExtensionClassMethodArgumentMetadata md = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; int index = 0; // I think rocket science is simpler than modern C++. @@ -462,8 +462,8 @@ GDNativeExtensionClassMethodArgumentMetadata call_get_argument_metadata(int p_ar } template <class... P, size_t... Is> -void call_with_variant_args_static(void (*p_method)(P...), const Variant **p_args, GDNativeCallError &r_error, IndexSequence<Is...>) { - r_error.error = GDNATIVE_CALL_OK; +void call_with_variant_args_static(void (*p_method)(P...), const Variant **p_args, GDExtensionCallError &r_error, IndexSequence<Is...>) { + r_error.error = GDEXTENSION_CALL_OK; #ifdef DEBUG_METHODS_ENABLED (p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); @@ -473,10 +473,10 @@ void call_with_variant_args_static(void (*p_method)(P...), const Variant **p_arg } template <class... P> -void call_with_variant_args_static_dv(void (*p_method)(P...), GDNativeConstVariantPtr *p_args, int p_argcount, GDNativeCallError &r_error, const std::vector<Variant> &default_values) { +void call_with_variant_args_static_dv(void (*p_method)(P...), GDExtensionConstVariantPtr *p_args, int p_argcount, GDExtensionCallError &r_error, const std::vector<Variant> &default_values) { #ifdef DEBUG_ENABLED if ((size_t)p_argcount > sizeof...(P)) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_MANY_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_MANY_ARGUMENTS; r_error.argument = sizeof...(P); return; } @@ -487,7 +487,7 @@ void call_with_variant_args_static_dv(void (*p_method)(P...), GDNativeConstVaria int32_t dvs = default_values.size(); #ifdef DEBUG_ENABLED if (missing > dvs) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_FEW_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS; r_error.argument = sizeof...(P); return; } @@ -508,18 +508,18 @@ void call_with_variant_args_static_dv(void (*p_method)(P...), GDNativeConstVaria } template <class... P, size_t... Is> -void call_with_ptr_args_static_method_helper(void (*p_method)(P...), GDNativeConstTypePtr *p_args, IndexSequence<Is...>) { +void call_with_ptr_args_static_method_helper(void (*p_method)(P...), GDExtensionConstTypePtr *p_args, IndexSequence<Is...>) { p_method(PtrToArg<P>::convert(p_args[Is])...); } template <class... P> -void call_with_ptr_args_static_method(void (*p_method)(P...), GDNativeConstTypePtr *p_args) { +void call_with_ptr_args_static_method(void (*p_method)(P...), GDExtensionConstTypePtr *p_args) { call_with_ptr_args_static_method_helper<P...>(p_method, p_args, BuildIndexSequence<sizeof...(P)>{}); } template <class R, class... P, size_t... Is> -void call_with_variant_args_static_ret(R (*p_method)(P...), const Variant **p_args, Variant &r_ret, GDNativeCallError &r_error, IndexSequence<Is...>) { - r_error.error = GDNATIVE_CALL_OK; +void call_with_variant_args_static_ret(R (*p_method)(P...), const Variant **p_args, Variant &r_ret, GDExtensionCallError &r_error, IndexSequence<Is...>) { + r_error.error = GDEXTENSION_CALL_OK; #ifdef DEBUG_METHODS_ENABLED r_ret = (p_method)(VariantCasterAndValidate<P>::cast(p_args, Is, r_error)...); @@ -529,10 +529,10 @@ void call_with_variant_args_static_ret(R (*p_method)(P...), const Variant **p_ar } template <class R, class... P> -void call_with_variant_args_static_ret_dv(R (*p_method)(P...), GDNativeConstVariantPtr *p_args, int p_argcount, Variant &r_ret, GDNativeCallError &r_error, const std::vector<Variant> &default_values) { +void call_with_variant_args_static_ret_dv(R (*p_method)(P...), GDExtensionConstVariantPtr *p_args, int p_argcount, Variant &r_ret, GDExtensionCallError &r_error, const std::vector<Variant> &default_values) { #ifdef DEBUG_ENABLED if ((size_t)p_argcount > sizeof...(P)) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_MANY_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_MANY_ARGUMENTS; r_error.argument = sizeof...(P); return; } @@ -543,7 +543,7 @@ void call_with_variant_args_static_ret_dv(R (*p_method)(P...), GDNativeConstVari int32_t dvs = default_values.size(); #ifdef DEBUG_ENABLED if (missing > dvs) { - r_error.error = GDNATIVE_CALL_ERROR_TOO_FEW_ARGUMENTS; + r_error.error = GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS; r_error.argument = sizeof...(P); return; } @@ -564,12 +564,12 @@ void call_with_variant_args_static_ret_dv(R (*p_method)(P...), GDNativeConstVari } template <class R, class... P, size_t... Is> -void call_with_ptr_args_static_method_ret_helper(R (*p_method)(P...), GDNativeConstTypePtr *p_args, void *r_ret, IndexSequence<Is...>) { +void call_with_ptr_args_static_method_ret_helper(R (*p_method)(P...), GDExtensionConstTypePtr *p_args, void *r_ret, IndexSequence<Is...>) { PtrToArg<R>::encode(p_method(PtrToArg<P>::convert(p_args[Is])...), r_ret); } template <class R, class... P> -void call_with_ptr_args_static_method_ret(R (*p_method)(P...), GDNativeConstTypePtr *p_args, void *r_ret) { +void call_with_ptr_args_static_method_ret(R (*p_method)(P...), GDExtensionConstTypePtr *p_args, void *r_ret) { call_with_ptr_args_static_method_ret_helper<R, P...>(p_method, p_args, r_ret, BuildIndexSequence<sizeof...(P)>{}); } diff --git a/include/godot_cpp/core/builtin_ptrcall.hpp b/include/godot_cpp/core/builtin_ptrcall.hpp index 848e86a..1b5aadd 100644 --- a/include/godot_cpp/core/builtin_ptrcall.hpp +++ b/include/godot_cpp/core/builtin_ptrcall.hpp @@ -31,7 +31,7 @@ #ifndef GODOT_BUILTIN_PTRCALL_HPP #define GODOT_BUILTIN_PTRCALL_HPP -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <array> @@ -40,34 +40,34 @@ namespace godot { namespace internal { template <class... Args> -void _call_builtin_constructor(const GDNativePtrConstructor constructor, GDNativeTypePtr base, Args... args) { - std::array<GDNativeConstTypePtr, sizeof...(Args)> call_args = { { (GDNativeConstTypePtr)args... } }; +void _call_builtin_constructor(const GDExtensionPtrConstructor constructor, GDExtensionTypePtr base, Args... args) { + std::array<GDExtensionConstTypePtr, sizeof...(Args)> call_args = { { (GDExtensionConstTypePtr)args... } }; constructor(base, call_args.data()); } template <class T, class... Args> -T _call_builtin_method_ptr_ret(const GDNativePtrBuiltInMethod method, GDNativeTypePtr base, Args... args) { +T _call_builtin_method_ptr_ret(const GDExtensionPtrBuiltInMethod method, GDExtensionTypePtr base, Args... args) { T ret; - std::array<GDNativeConstTypePtr, sizeof...(Args)> call_args = { { (GDNativeConstTypePtr)args... } }; + std::array<GDExtensionConstTypePtr, sizeof...(Args)> call_args = { { (GDExtensionConstTypePtr)args... } }; method(base, call_args.data(), &ret, sizeof...(Args)); return ret; } template <class... Args> -void _call_builtin_method_ptr_no_ret(const GDNativePtrBuiltInMethod method, GDNativeTypePtr base, Args... args) { - std::array<GDNativeConstTypePtr, sizeof...(Args)> call_args = { { (GDNativeConstTypePtr)args... } }; +void _call_builtin_method_ptr_no_ret(const GDExtensionPtrBuiltInMethod method, GDExtensionTypePtr base, Args... args) { + std::array<GDExtensionConstTypePtr, sizeof...(Args)> call_args = { { (GDExtensionConstTypePtr)args... } }; method(base, call_args.data(), nullptr, sizeof...(Args)); } template <class T> -T _call_builtin_operator_ptr(const GDNativePtrOperatorEvaluator op, GDNativeConstTypePtr left, GDNativeConstTypePtr right) { +T _call_builtin_operator_ptr(const GDExtensionPtrOperatorEvaluator op, GDExtensionConstTypePtr left, GDExtensionConstTypePtr right) { T ret; op(left, right, &ret); return ret; } template <class T> -T _call_builtin_ptr_getter(const GDNativePtrGetter getter, GDNativeConstTypePtr base) { +T _call_builtin_ptr_getter(const GDExtensionPtrGetter getter, GDExtensionConstTypePtr base) { T ret; getter(base, &ret); return ret; diff --git a/include/godot_cpp/core/class_db.hpp b/include/godot_cpp/core/class_db.hpp index 8fcedfa..8d7740f 100644 --- a/include/godot_cpp/core/class_db.hpp +++ b/include/godot_cpp/core/class_db.hpp @@ -31,7 +31,7 @@ #ifndef GODOT_CLASS_DB_HPP #define GODOT_CLASS_DB_HPP -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <godot_cpp/core/defs.hpp> #include <godot_cpp/core/error_macros.hpp> @@ -74,7 +74,7 @@ MethodDefinition D_METHOD(StringName p_name, StringName p_arg1, Args... args) { } class ClassDB { - static GDNativeInitializationLevel current_level; + static GDExtensionInitializationLevel current_level; friend class godot::GDExtensionBinding; @@ -91,10 +91,10 @@ public: struct ClassInfo { StringName name; StringName parent_name; - GDNativeInitializationLevel level = GDNATIVE_INITIALIZATION_SCENE; + GDExtensionInitializationLevel level = GDEXTENSION_INITIALIZATION_SCENE; std::unordered_map<StringName, MethodBind *> method_map; std::set<StringName> signal_names; - std::unordered_map<StringName, GDNativeExtensionClassCallVirtual> virtual_methods; + std::unordered_map<StringName, GDExtensionClassCallVirtual> virtual_methods; std::set<StringName> property_names; std::set<StringName> constant_names; // Pointer to the parent custom class, if any. Will be null if the parent class is a Godot class. @@ -131,15 +131,15 @@ public: static void add_property_subgroup(const StringName &p_class, const String &p_name, const String &p_prefix); static void add_property(const StringName &p_class, const PropertyInfo &p_pinfo, const StringName &p_setter, const StringName &p_getter, int p_index = -1); static void add_signal(const StringName &p_class, const MethodInfo &p_signal); - static void bind_integer_constant(const StringName &p_class_name, const StringName &p_enum_name, const StringName &p_constant_name, GDNativeInt p_constant_value, bool p_is_bitfield = false); - static void bind_virtual_method(const StringName &p_class, const StringName &p_method, GDNativeExtensionClassCallVirtual p_call); + static void bind_integer_constant(const StringName &p_class_name, const StringName &p_enum_name, const StringName &p_constant_name, GDExtensionInt p_constant_value, bool p_is_bitfield = false); + static void bind_virtual_method(const StringName &p_class, const StringName &p_method, GDExtensionClassCallVirtual p_call); static MethodBind *get_method(const StringName &p_class, const StringName &p_method); - static GDNativeExtensionClassCallVirtual get_virtual_func(void *p_userdata, GDNativeConstStringNamePtr p_name); + static GDExtensionClassCallVirtual get_virtual_func(void *p_userdata, GDExtensionConstStringNamePtr p_name); - static void initialize(GDNativeInitializationLevel p_level); - static void deinitialize(GDNativeInitializationLevel p_level); + static void initialize(GDExtensionInitializationLevel p_level); + static void deinitialize(GDExtensionInitializationLevel p_level); }; #define BIND_CONSTANT(m_constant) \ @@ -151,12 +151,12 @@ public: #define BIND_BITFIELD_FLAG(m_constant) \ godot::ClassDB::bind_integer_constant(get_class_static(), godot::__constant_get_bitfield_name(m_constant, #m_constant), #m_constant, m_constant, true); -#define BIND_VIRTUAL_METHOD(m_class, m_method) \ - { \ - auto ___call##m_method = [](GDNativeObjectPtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr p_ret) -> void { \ - call_with_ptr_args(reinterpret_cast<m_class *>(p_instance), &m_class::m_method, p_args, p_ret); \ - }; \ - godot::ClassDB::bind_virtual_method(m_class::get_class_static(), #m_method, ___call##m_method); \ +#define BIND_VIRTUAL_METHOD(m_class, m_method) \ + { \ + auto ___call##m_method = [](GDExtensionObjectPtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr p_ret) -> void { \ + call_with_ptr_args(reinterpret_cast<m_class *>(p_instance), &m_class::m_method, p_args, p_ret); \ + }; \ + godot::ClassDB::bind_virtual_method(m_class::get_class_static(), #m_method, ___call##m_method); \ } template <class T, bool is_abstract> @@ -174,27 +174,27 @@ void ClassDB::_register_class(bool p_virtual) { classes[cl.name] = cl; // Register this class with Godot - GDNativeExtensionClassCreationInfo class_info = { - p_virtual, // GDNativeBool is_virtual; - is_abstract, // GDNativeBool is_abstract; - T::set_bind, // GDNativeExtensionClassSet set_func; - T::get_bind, // GDNativeExtensionClassGet get_func; - T::get_property_list_bind, // GDNativeExtensionClassGetPropertyList get_property_list_func; - T::free_property_list_bind, // GDNativeExtensionClassFreePropertyList free_property_list_func; - T::property_can_revert_bind, // GDNativeExtensionClassPropertyCanRevert property_can_revert_func; - T::property_get_revert_bind, // GDNativeExtensionClassPropertyGetRevert property_get_revert_func; - T::notification_bind, // GDNativeExtensionClassNotification notification_func; - T::to_string_bind, // GDNativeExtensionClassToString to_string_func; - nullptr, // GDNativeExtensionClassReference reference_func; - nullptr, // GDNativeExtensionClassUnreference unreference_func; - T::create, // GDNativeExtensionClassCreateInstance create_instance_func; /* this one is mandatory */ - T::free, // GDNativeExtensionClassFreeInstance free_instance_func; /* this one is mandatory */ - &ClassDB::get_virtual_func, // GDNativeExtensionClassGetVirtual get_virtual_func; - nullptr, // GDNativeExtensionClassGetRID get_rid; + GDExtensionClassCreationInfo class_info = { + p_virtual, // GDExtensionBool is_virtual; + is_abstract, // GDExtensionBool is_abstract; + T::set_bind, // GDExtensionClassSet set_func; + T::get_bind, // GDExtensionClassGet get_func; + T::get_property_list_bind, // GDExtensionClassGetPropertyList get_property_list_func; + T::free_property_list_bind, // GDExtensionClassFreePropertyList free_property_list_func; + T::property_can_revert_bind, // GDExtensionClassPropertyCanRevert property_can_revert_func; + T::property_get_revert_bind, // GDExtensionClassPropertyGetRevert property_get_revert_func; + T::notification_bind, // GDExtensionClassNotification notification_func; + T::to_string_bind, // GDExtensionClassToString to_string_func; + nullptr, // GDExtensionClassReference reference_func; + nullptr, // GDExtensionClassUnreference unreference_func; + T::create, // GDExtensionClassCreateInstance create_instance_func; /* this one is mandatory */ + T::free, // GDExtensionClassFreeInstance free_instance_func; /* this one is mandatory */ + &ClassDB::get_virtual_func, // GDExtensionClassGetVirtual get_virtual_func; + nullptr, // GDExtensionClassGetRID get_rid; (void *)&T::get_class_static(), // void *class_userdata; }; - internal::gdn_interface->classdb_register_extension_class(internal::library, cl.name._native_ptr(), cl.parent_name._native_ptr(), &class_info); + internal::gde_interface->classdb_register_extension_class(internal::library, cl.name._native_ptr(), cl.parent_name._native_ptr(), &class_info); // call bind_methods etc. to register all members of the class T::initialize_class(); diff --git a/include/godot_cpp/core/defs.hpp b/include/godot_cpp/core/defs.hpp index fa96bc6..bc05523 100644 --- a/include/godot_cpp/core/defs.hpp +++ b/include/godot_cpp/core/defs.hpp @@ -35,13 +35,13 @@ #include <cstdint> #include <cstring> -#if !defined(GDN_EXPORT) +#if !defined(GDE_EXPORT) #if defined(_WIN32) -#define GDN_EXPORT __declspec(dllexport) +#define GDE_EXPORT __declspec(dllexport) #elif defined(__GNUC__) -#define GDN_EXPORT __attribute__((visibility("default"))) +#define GDE_EXPORT __attribute__((visibility("default"))) #else -#define GDN_EXPORT +#define GDE_EXPORT #endif #endif diff --git a/include/godot_cpp/core/engine_ptrcall.hpp b/include/godot_cpp/core/engine_ptrcall.hpp index 09e2fe1..9400cd8 100644 --- a/include/godot_cpp/core/engine_ptrcall.hpp +++ b/include/godot_cpp/core/engine_ptrcall.hpp @@ -31,7 +31,7 @@ #ifndef GODOT_ENGINE_PTRCALL_HPP #define GODOT_ENGINE_PTRCALL_HPP -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <godot_cpp/core/binder_common.hpp> #include <godot_cpp/core/object.hpp> @@ -44,49 +44,49 @@ namespace godot { namespace internal { template <class O, class... Args> -O *_call_native_mb_ret_obj(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) { +O *_call_native_mb_ret_obj(const GDExtensionMethodBindPtr mb, void *instance, const Args &...args) { GodotObject *ret = nullptr; - std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; - internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret); + std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } }; + internal::gde_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret); if (ret == nullptr) { return nullptr; } - return reinterpret_cast<O *>(internal::gdn_interface->object_get_instance_binding(ret, internal::token, &O::___binding_callbacks)); + return reinterpret_cast<O *>(internal::gde_interface->object_get_instance_binding(ret, internal::token, &O::___binding_callbacks)); } template <class R, class... Args> -R _call_native_mb_ret(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) { +R _call_native_mb_ret(const GDExtensionMethodBindPtr mb, void *instance, const Args &...args) { R ret; - std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; - internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret); + std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } }; + internal::gde_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), &ret); return ret; } template <class... Args> -void _call_native_mb_no_ret(const GDNativeMethodBindPtr mb, void *instance, const Args &...args) { - std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; - internal::gdn_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), nullptr); +void _call_native_mb_no_ret(const GDExtensionMethodBindPtr mb, void *instance, const Args &...args) { + std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } }; + internal::gde_interface->object_method_bind_ptrcall(mb, instance, mb_args.data(), nullptr); } template <class R, class... Args> -R _call_utility_ret(GDNativePtrUtilityFunction func, const Args &...args) { +R _call_utility_ret(GDExtensionPtrUtilityFunction func, const Args &...args) { R ret; - std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; + std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } }; func(&ret, mb_args.data(), mb_args.size()); return ret; } template <class... Args> -Object *_call_utility_ret_obj(const GDNativePtrUtilityFunction func, void *instance, const Args &...args) { +Object *_call_utility_ret_obj(const GDExtensionPtrUtilityFunction func, void *instance, const Args &...args) { GodotObject *ret = nullptr; - std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; + std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } }; func(&ret, mb_args.data(), mb_args.size()); - return (Object *)internal::gdn_interface->object_get_instance_binding(ret, internal::token, &Object::___binding_callbacks); + return (Object *)internal::gde_interface->object_get_instance_binding(ret, internal::token, &Object::___binding_callbacks); } template <class... Args> -void _call_utility_no_ret(const GDNativePtrUtilityFunction func, const Args &...args) { - std::array<GDNativeConstTypePtr, sizeof...(Args)> mb_args = { { (GDNativeConstTypePtr)args... } }; +void _call_utility_no_ret(const GDExtensionPtrUtilityFunction func, const Args &...args) { + std::array<GDExtensionConstTypePtr, sizeof...(Args)> mb_args = { { (GDExtensionConstTypePtr)args... } }; func(nullptr, mb_args.data(), mb_args.size()); } diff --git a/include/godot_cpp/core/math.hpp b/include/godot_cpp/core/math.hpp index 9f33196..1436f20 100644 --- a/include/godot_cpp/core/math.hpp +++ b/include/godot_cpp/core/math.hpp @@ -33,7 +33,7 @@ #include <godot_cpp/core/defs.hpp> -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <cmath> diff --git a/include/godot_cpp/core/memory.hpp b/include/godot_cpp/core/memory.hpp index 2dce44f..9090642 100644 --- a/include/godot_cpp/core/memory.hpp +++ b/include/godot_cpp/core/memory.hpp @@ -117,7 +117,7 @@ void memdelete(T *p_class, typename std::enable_if<!std::is_base_of_v<godot::Wra template <class T, std::enable_if_t<std::is_base_of_v<godot::Wrapped, T>, bool> = true> void memdelete(T *p_class) { - godot::internal::gdn_interface->object_destroy(p_class->_owner); + godot::internal::gde_interface->object_destroy(p_class->_owner); } template <class T, class A> diff --git a/include/godot_cpp/core/method_bind.hpp b/include/godot_cpp/core/method_bind.hpp index 16f0358..260500f 100644 --- a/include/godot_cpp/core/method_bind.hpp +++ b/include/godot_cpp/core/method_bind.hpp @@ -36,7 +36,7 @@ #include <godot_cpp/core/memory.hpp> -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <godot_cpp/classes/global_constants.hpp> @@ -59,11 +59,11 @@ class MethodBind { bool _vararg = false; std::vector<StringName> argument_names; - GDNativeVariantType *argument_types = nullptr; + GDExtensionVariantType *argument_types = nullptr; std::vector<Variant> default_arguments; protected: - virtual GDNativeVariantType gen_argument_type(int p_arg) const = 0; + virtual GDExtensionVariantType gen_argument_type(int p_arg) const = 0; virtual PropertyInfo gen_argument_type_info(int p_arg) const = 0; void generate_argument_types(int p_count); void set_const(bool p_const); @@ -103,19 +103,19 @@ public: _FORCE_INLINE_ bool is_static() const { return _static; } _FORCE_INLINE_ bool is_vararg() const { return _vararg; } _FORCE_INLINE_ bool has_return() const { return _has_return; } - _FORCE_INLINE_ uint32_t get_hint_flags() const { return hint_flags | (is_const() ? GDNATIVE_EXTENSION_METHOD_FLAG_CONST : 0) | (is_vararg() ? GDNATIVE_EXTENSION_METHOD_FLAG_VARARG : 0) | (is_static() ? GDNATIVE_EXTENSION_METHOD_FLAG_STATIC : 0); } + _FORCE_INLINE_ uint32_t get_hint_flags() const { return hint_flags | (is_const() ? GDEXTENSION_METHOD_FLAG_CONST : 0) | (is_vararg() ? GDEXTENSION_METHOD_FLAG_VARARG : 0) | (is_static() ? GDEXTENSION_METHOD_FLAG_STATIC : 0); } _FORCE_INLINE_ void set_hint_flags(uint32_t p_hint_flags) { hint_flags = p_hint_flags; } void set_argument_names(const std::vector<StringName> &p_names); std::vector<StringName> get_argument_names() const; void set_default_arguments(const std::vector<Variant> &p_default_arguments) { default_arguments = p_default_arguments; } - _FORCE_INLINE_ GDNativeVariantType get_argument_type(int p_argument) const { - ERR_FAIL_COND_V(p_argument < -1 || p_argument > argument_count, GDNATIVE_VARIANT_TYPE_NIL); + _FORCE_INLINE_ GDExtensionVariantType get_argument_type(int p_argument) const { + ERR_FAIL_COND_V(p_argument < -1 || p_argument > argument_count, GDEXTENSION_VARIANT_TYPE_NIL); return argument_types[p_argument + 1]; } PropertyInfo get_argument_info(int p_argument) const; - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const = 0; + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const = 0; std::vector<PropertyInfo> get_arguments_info_list() const { std::vector<PropertyInfo> vec; @@ -126,8 +126,8 @@ public: } return vec; } - std::vector<GDNativeExtensionClassMethodArgumentMetadata> get_arguments_metadata_list() const { - std::vector<GDNativeExtensionClassMethodArgumentMetadata> vec; + std::vector<GDExtensionClassMethodArgumentMetadata> get_arguments_metadata_list() const { + std::vector<GDExtensionClassMethodArgumentMetadata> vec; // First element is return value vec.reserve(argument_count + 1); for (int i = 0; i < argument_count; i++) { @@ -136,11 +136,11 @@ public: return vec; } - virtual Variant call(GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeCallError &r_error) const = 0; - virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_return) const = 0; + virtual Variant call(GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionCallError &r_error) const = 0; + virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_return) const = 0; - static void bind_call(void *p_method_userdata, GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeVariantPtr r_return, GDNativeCallError *r_error); - static void bind_ptrcall(void *p_method_userdata, GDExtensionClassInstancePtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_return); + static void bind_call(void *p_method_userdata, GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionVariantPtr r_return, GDExtensionCallError *r_error); + static void bind_ptrcall(void *p_method_userdata, GDExtensionClassInstancePtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_return); virtual ~MethodBind(); }; @@ -149,7 +149,7 @@ template <class Derived, class T, class R, bool should_returns> class MethodBindVarArgBase : public MethodBind { protected: R(T::*method) - (const Variant **, GDNativeInt, GDNativeCallError &); + (const Variant **, GDExtensionInt, GDExtensionCallError &); std::vector<PropertyInfo> arguments; public: @@ -163,20 +163,20 @@ public: } } - virtual GDNativeVariantType gen_argument_type(int p_arg) const { - return static_cast<GDNativeVariantType>(gen_argument_type_info(p_arg).type); + virtual GDExtensionVariantType gen_argument_type(int p_arg) const { + return static_cast<GDExtensionVariantType>(gen_argument_type_info(p_arg).type); } - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int) const { - return GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int) const { + return GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; } - virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_return) const { + virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_return) const { ERR_FAIL(); // Can't call. } MethodBindVarArgBase( - R (T::*p_method)(const Variant **, GDNativeInt, GDNativeCallError &), + R (T::*p_method)(const Variant **, GDExtensionInt, GDExtensionCallError &), const MethodInfo &p_method_info, bool p_return_nil_is_variant) : method(p_method) { @@ -211,13 +211,13 @@ class MethodBindVarArgT : public MethodBindVarArgBase<MethodBindVarArgT<T>, T, v friend class MethodBindVarArgBase<MethodBindVarArgT<T>, T, void, false>; public: - virtual Variant call(GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionCallError &r_error) const { (static_cast<T *>(p_instance)->*MethodBindVarArgBase<MethodBindVarArgT<T>, T, void, false>::method)((const Variant **)p_args, p_argument_count, r_error); return {}; } MethodBindVarArgT( - void (T::*p_method)(const Variant **, GDNativeInt, GDNativeCallError &), + void (T::*p_method)(const Variant **, GDExtensionInt, GDExtensionCallError &), const MethodInfo &p_method_info, bool p_return_nil_is_variant) : MethodBindVarArgBase<MethodBindVarArgT<T>, T, void, false>(p_method, p_method_info, p_return_nil_is_variant) { @@ -230,7 +230,7 @@ private: }; template <class T> -MethodBind *create_vararg_method_bind(void (T::*p_method)(const Variant **, GDNativeInt, GDNativeCallError &), const MethodInfo &p_info, bool p_return_nil_is_variant) { +MethodBind *create_vararg_method_bind(void (T::*p_method)(const Variant **, GDExtensionInt, GDExtensionCallError &), const MethodInfo &p_info, bool p_return_nil_is_variant) { MethodBind *a = memnew((MethodBindVarArgT<T>)(p_method, p_info, p_return_nil_is_variant)); a->set_instance_class(T::get_class_static()); return a; @@ -241,12 +241,12 @@ class MethodBindVarArgTR : public MethodBindVarArgBase<MethodBindVarArgTR<T, R>, friend class MethodBindVarArgBase<MethodBindVarArgTR<T, R>, T, R, true>; public: - virtual Variant call(GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionCallError &r_error) const { return (static_cast<T *>(p_instance)->*MethodBindVarArgBase<MethodBindVarArgTR<T, R>, T, R, true>::method)((const Variant **)p_args, p_argument_count, r_error); } MethodBindVarArgTR( - R (T::*p_method)(const Variant **, GDNativeInt, GDNativeCallError &), + R (T::*p_method)(const Variant **, GDExtensionInt, GDExtensionCallError &), const MethodInfo &p_info, bool p_return_nil_is_variant) : MethodBindVarArgBase<MethodBindVarArgTR<T, R>, T, R, true>(p_method, p_info, p_return_nil_is_variant) { @@ -259,7 +259,7 @@ private: }; template <class T, class R> -MethodBind *create_vararg_method_bind(R (T::*p_method)(const Variant **, GDNativeInt, GDNativeCallError &), const MethodInfo &p_info, bool p_return_nil_is_variant) { +MethodBind *create_vararg_method_bind(R (T::*p_method)(const Variant **, GDExtensionInt, GDExtensionCallError &), const MethodInfo &p_info, bool p_return_nil_is_variant) { MethodBind *a = memnew((MethodBindVarArgTR<T, R>)(p_method, p_info, p_return_nil_is_variant)); a->set_instance_class(T::get_class_static()); return a; @@ -288,11 +288,11 @@ protected: #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wlogical-op" #endif - virtual GDNativeVariantType gen_argument_type(int p_arg) const { + virtual GDExtensionVariantType gen_argument_type(int p_arg) const { if (p_arg >= 0 && p_arg < (int)sizeof...(P)) { return call_get_argument_type<P...>(p_arg); } else { - return GDNATIVE_VARIANT_TYPE_NIL; + return GDEXTENSION_VARIANT_TYPE_NIL; } } @@ -310,11 +310,11 @@ protected: #endif public: - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { return call_get_argument_metadata<P...>(p_argument); } - virtual Variant call(GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionCallError &r_error) const { #ifdef TYPED_METHOD_BIND call_with_variant_args_dv(static_cast<T *>(p_instance), method, p_args, (int)p_argument_count, r_error, get_default_arguments()); #else @@ -322,7 +322,7 @@ public: #endif return Variant(); } - virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_ret) const { + virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_ret) const { #ifdef TYPED_METHOD_BIND call_with_ptr_args<T, P...>(static_cast<T *>(p_instance), method, p_args, nullptr); #else @@ -364,11 +364,11 @@ protected: #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wlogical-op" #endif - virtual GDNativeVariantType gen_argument_type(int p_arg) const { + virtual GDExtensionVariantType gen_argument_type(int p_arg) const { if (p_arg >= 0 && p_arg < (int)sizeof...(P)) { return call_get_argument_type<P...>(p_arg); } else { - return GDNATIVE_VARIANT_TYPE_NIL; + return GDEXTENSION_VARIANT_TYPE_NIL; } } @@ -386,11 +386,11 @@ protected: #endif public: - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { return call_get_argument_metadata<P...>(p_argument); } - virtual Variant call(GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionCallError &r_error) const { #ifdef TYPED_METHOD_BIND call_with_variant_argsc_dv(static_cast<T *>(p_instance), method, p_args, (int)p_argument_count, r_error, get_default_arguments()); #else @@ -398,7 +398,7 @@ public: #endif return Variant(); } - virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_ret) const { + virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_ret) const { #ifdef TYPED_METHOD_BIND call_with_ptr_args<T, P...>(static_cast<T *>(p_instance), method, p_args, nullptr); #else @@ -441,11 +441,11 @@ protected: #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wlogical-op" #endif - virtual GDNativeVariantType gen_argument_type(int p_arg) const { + virtual GDExtensionVariantType gen_argument_type(int p_arg) const { if (p_arg >= 0 && p_arg < (int)sizeof...(P)) { return call_get_argument_type<P...>(p_arg); } else { - return GDNativeVariantType(GetTypeInfo<R>::VARIANT_TYPE); + return GDExtensionVariantType(GetTypeInfo<R>::VARIANT_TYPE); } } @@ -463,7 +463,7 @@ protected: #endif public: - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { if (p_argument >= 0) { return call_get_argument_metadata<P...>(p_argument); } else { @@ -471,7 +471,7 @@ public: } } - virtual Variant call(GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionCallError &r_error) const { Variant ret; #ifdef TYPED_METHOD_BIND call_with_variant_args_ret_dv(static_cast<T *>(p_instance), method, p_args, (int)p_argument_count, ret, r_error, get_default_arguments()); @@ -480,7 +480,7 @@ public: #endif return ret; } - virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_ret) const { + virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_ret) const { #ifdef TYPED_METHOD_BIND call_with_ptr_args<T, R, P...>(static_cast<T *>(p_instance), method, p_args, r_ret); #else @@ -524,11 +524,11 @@ protected: #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wlogical-op" #endif - virtual GDNativeVariantType gen_argument_type(int p_arg) const { + virtual GDExtensionVariantType gen_argument_type(int p_arg) const { if (p_arg >= 0 && p_arg < (int)sizeof...(P)) { return call_get_argument_type<P...>(p_arg); } else { - return GDNativeVariantType(GetTypeInfo<R>::VARIANT_TYPE); + return GDExtensionVariantType(GetTypeInfo<R>::VARIANT_TYPE); } } @@ -546,7 +546,7 @@ protected: #endif public: - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int p_argument) const { if (p_argument >= 0) { return call_get_argument_metadata<P...>(p_argument); } else { @@ -554,7 +554,7 @@ public: } } - virtual Variant call(GDExtensionClassInstancePtr p_instance, GDNativeConstVariantPtr *p_args, GDNativeInt p_argument_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_instance, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_argument_count, GDExtensionCallError &r_error) const { Variant ret; #ifdef TYPED_METHOD_BIND call_with_variant_args_retc_dv(static_cast<T *>(p_instance), method, p_args, (int)p_argument_count, ret, r_error, get_default_arguments()); @@ -563,7 +563,7 @@ public: #endif return ret; } - virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_ret) const { + virtual void ptrcall(GDExtensionClassInstancePtr p_instance, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_ret) const { #ifdef TYPED_METHOD_BIND call_with_ptr_args<T, R, P...>(static_cast<T *>(p_instance), method, p_args, r_ret); #else @@ -604,11 +604,11 @@ protected: #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wlogical-op" #endif - virtual GDNativeVariantType gen_argument_type(int p_arg) const { + virtual GDExtensionVariantType gen_argument_type(int p_arg) const { if (p_arg >= 0 && p_arg < (int)sizeof...(P)) { return call_get_argument_type<P...>(p_arg); } else { - return GDNATIVE_VARIANT_TYPE_NIL; + return GDEXTENSION_VARIANT_TYPE_NIL; } } @@ -626,17 +626,17 @@ protected: #endif public: - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int p_arg) const { + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int p_arg) const { return call_get_argument_metadata<P...>(p_arg); } - virtual Variant call(GDExtensionClassInstancePtr p_object, GDNativeConstVariantPtr *p_args, GDNativeInt p_arg_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_object, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_arg_count, GDExtensionCallError &r_error) const { (void)p_object; // unused call_with_variant_args_static_dv(function, p_args, p_arg_count, r_error, get_default_arguments()); return Variant(); } - virtual void ptrcall(GDExtensionClassInstancePtr p_object, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_ret) const { + virtual void ptrcall(GDExtensionClassInstancePtr p_object, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_ret) const { (void)p_object; (void)r_ret; call_with_ptr_args_static_method(function, p_args); @@ -669,11 +669,11 @@ protected: #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wlogical-op" #endif - virtual GDNativeVariantType gen_argument_type(int p_arg) const { + virtual GDExtensionVariantType gen_argument_type(int p_arg) const { if (p_arg >= 0 && p_arg < (int)sizeof...(P)) { return call_get_argument_type<P...>(p_arg); } else { - return GDNativeVariantType(GetTypeInfo<R>::VARIANT_TYPE); + return GDExtensionVariantType(GetTypeInfo<R>::VARIANT_TYPE); } } @@ -692,7 +692,7 @@ protected: #endif public: - virtual GDNativeExtensionClassMethodArgumentMetadata get_argument_metadata(int p_arg) const { + virtual GDExtensionClassMethodArgumentMetadata get_argument_metadata(int p_arg) const { if (p_arg >= 0) { return call_get_argument_metadata<P...>(p_arg); } else { @@ -700,13 +700,13 @@ public: } } - virtual Variant call(GDExtensionClassInstancePtr p_object, GDNativeConstVariantPtr *p_args, GDNativeInt p_arg_count, GDNativeCallError &r_error) const { + virtual Variant call(GDExtensionClassInstancePtr p_object, GDExtensionConstVariantPtr *p_args, GDExtensionInt p_arg_count, GDExtensionCallError &r_error) const { Variant ret; call_with_variant_args_static_ret_dv(function, p_args, p_arg_count, ret, r_error, get_default_arguments()); return ret; } - virtual void ptrcall(GDExtensionClassInstancePtr p_object, GDNativeConstTypePtr *p_args, GDNativeTypePtr r_ret) const { + virtual void ptrcall(GDExtensionClassInstancePtr p_object, GDExtensionConstTypePtr *p_args, GDExtensionTypePtr r_ret) const { (void)p_object; call_with_ptr_args_static_method_ret(function, p_args, r_ret); } diff --git a/include/godot_cpp/core/method_ptrcall.hpp b/include/godot_cpp/core/method_ptrcall.hpp index 5e17ea5..ec71590 100644 --- a/include/godot_cpp/core/method_ptrcall.hpp +++ b/include/godot_cpp/core/method_ptrcall.hpp @@ -168,7 +168,7 @@ MAKE_PTRARG_BY_REFERENCE(Variant); template <class T> struct PtrToArg<T *> { _FORCE_INLINE_ static T *convert(const void *p_ptr) { - return reinterpret_cast<T *>(godot::internal::gdn_interface->object_get_instance_binding(*reinterpret_cast<GDNativeObjectPtr *>(const_cast<void *>(p_ptr)), godot::internal::token, &T::___binding_callbacks)); + return reinterpret_cast<T *>(godot::internal::gde_interface->object_get_instance_binding(*reinterpret_cast<GDExtensionObjectPtr *>(const_cast<void *>(p_ptr)), godot::internal::token, &T::___binding_callbacks)); } typedef Object *EncodeT; _FORCE_INLINE_ static void encode(T *p_var, void *p_ptr) { @@ -179,7 +179,7 @@ struct PtrToArg<T *> { template <class T> struct PtrToArg<const T *> { _FORCE_INLINE_ static const T *convert(const void *p_ptr) { - return reinterpret_cast<const T *>(godot::internal::gdn_interface->object_get_instance_binding(*reinterpret_cast<GDNativeObjectPtr *>(const_cast<void *>(p_ptr)), godot::internal::token, &T::___binding_callbacks)); + return reinterpret_cast<const T *>(godot::internal::gde_interface->object_get_instance_binding(*reinterpret_cast<GDExtensionObjectPtr *>(const_cast<void *>(p_ptr)), godot::internal::token, &T::___binding_callbacks)); } typedef const Object *EncodeT; _FORCE_INLINE_ static void encode(T *p_var, void *p_ptr) { diff --git a/include/godot_cpp/core/object.hpp b/include/godot_cpp/core/object.hpp index e40f086..9fa2bb1 100644 --- a/include/godot_cpp/core/object.hpp +++ b/include/godot_cpp/core/object.hpp @@ -41,7 +41,7 @@ #include <godot_cpp/godot.hpp> -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> #include <vector> @@ -82,20 +82,20 @@ struct MethodInfo { template <class... Args> MethodInfo::MethodInfo(StringName p_name, const Args &...args) : - name(p_name), flags(GDNATIVE_EXTENSION_METHOD_FLAG_NORMAL) { + name(p_name), flags(GDEXTENSION_METHOD_FLAG_NORMAL) { arguments = { args... }; } template <class... Args> MethodInfo::MethodInfo(Variant::Type ret, StringName p_name, const Args &...args) : - name(p_name), flags(GDNATIVE_EXTENSION_METHOD_FLAG_NORMAL) { + name(p_name), flags(GDEXTENSION_METHOD_FLAG_NORMAL) { return_val.type = ret; arguments = { args... }; } template <class... Args> MethodInfo::MethodInfo(const PropertyInfo &p_ret, StringName p_name, const Args &...args) : - name(p_name), return_val(p_ret), flags(GDNATIVE_EXTENSION_METHOD_FLAG_NORMAL) { + name(p_name), return_val(p_ret), flags(GDEXTENSION_METHOD_FLAG_NORMAL) { arguments = { args... }; } @@ -124,11 +124,11 @@ public: class ObjectDB { public: static Object *get_instance(uint64_t p_object_id) { - GDNativeObjectPtr obj = internal::gdn_interface->object_get_instance_from_id(p_object_id); + GDExtensionObjectPtr obj = internal::gde_interface->object_get_instance_from_id(p_object_id); if (obj == nullptr) { return nullptr; } - return reinterpret_cast<Object *>(internal::gdn_interface->object_get_instance_binding(obj, internal::token, &Object::___binding_callbacks)); + return reinterpret_cast<Object *>(internal::gde_interface->object_get_instance_binding(obj, internal::token, &Object::___binding_callbacks)); } }; @@ -138,11 +138,11 @@ T *Object::cast_to(Object *p_object) { return nullptr; } StringName class_name = T::get_class_static(); - GDNativeObjectPtr casted = internal::gdn_interface->object_cast_to(p_object->_owner, internal::gdn_interface->classdb_get_class_tag(class_name._native_ptr())); + GDExtensionObjectPtr casted = internal::gde_interface->object_cast_to(p_object->_owner, internal::gde_interface->classdb_get_class_tag(class_name._native_ptr())); if (casted == nullptr) { return nullptr; } - return reinterpret_cast<T *>(internal::gdn_interface->object_get_instance_binding(casted, internal::token, &T::___binding_callbacks)); + return reinterpret_cast<T *>(internal::gde_interface->object_get_instance_binding(casted, internal::token, &T::___binding_callbacks)); } template <class T> @@ -151,11 +151,11 @@ const T *Object::cast_to(const Object *p_object) { return nullptr; } StringName class_name = T::get_class_static(); - GDNativeObjectPtr casted = internal::gdn_interface->object_cast_to(p_object->_owner, internal::gdn_interface->classdb_get_class_tag(class_name._native_ptr())); + GDExtensionObjectPtr casted = internal::gde_interface->object_cast_to(p_object->_owner, internal::gde_interface->classdb_get_class_tag(class_name._native_ptr())); if (casted == nullptr) { return nullptr; } - return reinterpret_cast<const T *>(internal::gdn_interface->object_get_instance_binding(casted, internal::token, &T::___binding_callbacks)); + return reinterpret_cast<const T *>(internal::gde_interface->object_get_instance_binding(casted, internal::token, &T::___binding_callbacks)); } } // namespace godot diff --git a/include/godot_cpp/core/property_info.hpp b/include/godot_cpp/core/property_info.hpp index 71343e9..a0c5126 100644 --- a/include/godot_cpp/core/property_info.hpp +++ b/include/godot_cpp/core/property_info.hpp @@ -39,7 +39,7 @@ #include <godot_cpp/godot.hpp> -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> namespace godot { @@ -66,7 +66,7 @@ struct PropertyInfo { } } - PropertyInfo(GDNativeVariantType p_type, const StringName &p_name, PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = "") : + PropertyInfo(GDExtensionVariantType p_type, const StringName &p_name, PropertyHint p_hint = PROPERTY_HINT_NONE, const String &p_hint_string = "", uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const StringName &p_class_name = "") : PropertyInfo((Variant::Type)p_type, p_name, p_hint, p_hint_string, p_usage, p_class_name) {} }; diff --git a/include/godot_cpp/core/type_info.hpp b/include/godot_cpp/core/type_info.hpp index 329231a..b5994e2 100644 --- a/include/godot_cpp/core/type_info.hpp +++ b/include/godot_cpp/core/type_info.hpp @@ -35,7 +35,7 @@ #include <godot_cpp/variant/typed_array.hpp> #include <godot_cpp/variant/variant.hpp> -#include <godot/gdnative_interface.h> +#include <godot/gdextension_interface.h> namespace godot { @@ -93,95 +93,95 @@ static PropertyInfo make_property_info(Variant::Type p_type, const StringName &p template <class T, typename = void> struct GetTypeInfo; -#define MAKE_TYPE_INFO(m_type, m_var_type) \ - template <> \ - struct GetTypeInfo<m_type> { \ - static constexpr GDNativeVariantType VARIANT_TYPE = m_var_type; \ - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ - static inline PropertyInfo get_class_info() { \ - return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ - } \ - }; \ - template <> \ - struct GetTypeInfo<const m_type &> { \ - static constexpr GDNativeVariantType VARIANT_TYPE = m_var_type; \ - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ - static inline PropertyInfo get_class_info() { \ - return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ - } \ +#define MAKE_TYPE_INFO(m_type, m_var_type) \ + template <> \ + struct GetTypeInfo<m_type> { \ + static constexpr GDExtensionVariantType VARIANT_TYPE = m_var_type; \ + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ + static inline PropertyInfo get_class_info() { \ + return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ + } \ + }; \ + template <> \ + struct GetTypeInfo<const m_type &> { \ + static constexpr GDExtensionVariantType VARIANT_TYPE = m_var_type; \ + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ + static inline PropertyInfo get_class_info() { \ + return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ + } \ }; -#define MAKE_TYPE_INFO_WITH_META(m_type, m_var_type, m_metadata) \ - template <> \ - struct GetTypeInfo<m_type> { \ - static constexpr GDNativeVariantType VARIANT_TYPE = m_var_type; \ - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = m_metadata; \ - static inline PropertyInfo get_class_info() { \ - return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ - } \ - }; \ - template <> \ - struct GetTypeInfo<const m_type &> { \ - static constexpr GDNativeVariantType VARIANT_TYPE = m_var_type; \ - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = m_metadata; \ - static inline PropertyInfo get_class_info() { \ - return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ - } \ +#define MAKE_TYPE_INFO_WITH_META(m_type, m_var_type, m_metadata) \ + template <> \ + struct GetTypeInfo<m_type> { \ + static constexpr GDExtensionVariantType VARIANT_TYPE = m_var_type; \ + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = m_metadata; \ + static inline PropertyInfo get_class_info() { \ + return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ + } \ + }; \ + template <> \ + struct GetTypeInfo<const m_type &> { \ + static constexpr GDExtensionVariantType VARIANT_TYPE = m_var_type; \ + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = m_metadata; \ + static inline PropertyInfo get_class_info() { \ + return make_property_info((Variant::Type)VARIANT_TYPE, ""); \ + } \ }; -MAKE_TYPE_INFO(bool, GDNATIVE_VARIANT_TYPE_BOOL) -MAKE_TYPE_INFO_WITH_META(uint8_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT8) -MAKE_TYPE_INFO_WITH_META(int8_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT8) -MAKE_TYPE_INFO_WITH_META(uint16_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT16) -MAKE_TYPE_INFO_WITH_META(int16_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT16) -MAKE_TYPE_INFO_WITH_META(uint32_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT32) -MAKE_TYPE_INFO_WITH_META(int32_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT32) -MAKE_TYPE_INFO_WITH_META(uint64_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT64) -MAKE_TYPE_INFO_WITH_META(int64_t, GDNATIVE_VARIANT_TYPE_INT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT64) -MAKE_TYPE_INFO(char16_t, GDNATIVE_VARIANT_TYPE_INT) -MAKE_TYPE_INFO(char32_t, GDNATIVE_VARIANT_TYPE_INT) -MAKE_TYPE_INFO_WITH_META(float, GDNATIVE_VARIANT_TYPE_FLOAT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_REAL_IS_FLOAT) -MAKE_TYPE_INFO_WITH_META(double, GDNATIVE_VARIANT_TYPE_FLOAT, GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_REAL_IS_DOUBLE) - -MAKE_TYPE_INFO(String, GDNATIVE_VARIANT_TYPE_STRING) -MAKE_TYPE_INFO(Vector2, GDNATIVE_VARIANT_TYPE_VECTOR2) -MAKE_TYPE_INFO(Vector2i, GDNATIVE_VARIANT_TYPE_VECTOR2I) -MAKE_TYPE_INFO(Rect2, GDNATIVE_VARIANT_TYPE_RECT2) -MAKE_TYPE_INFO(Rect2i, GDNATIVE_VARIANT_TYPE_RECT2I) -MAKE_TYPE_INFO(Vector3, GDNATIVE_VARIANT_TYPE_VECTOR3) -MAKE_TYPE_INFO(Vector3i, GDNATIVE_VARIANT_TYPE_VECTOR3I) -MAKE_TYPE_INFO(Transform2D, GDNATIVE_VARIANT_TYPE_TRANSFORM2D) -MAKE_TYPE_INFO(Vector4, GDNATIVE_VARIANT_TYPE_VECTOR4) -MAKE_TYPE_INFO(Vector4i, GDNATIVE_VARIANT_TYPE_VECTOR4I) -MAKE_TYPE_INFO(Plane, GDNATIVE_VARIANT_TYPE_PLANE) -MAKE_TYPE_INFO(Quaternion, GDNATIVE_VARIANT_TYPE_QUATERNION) -MAKE_TYPE_INFO(AABB, GDNATIVE_VARIANT_TYPE_AABB) -MAKE_TYPE_INFO(Basis, GDNATIVE_VARIANT_TYPE_BASIS) -MAKE_TYPE_INFO(Transform3D, GDNATIVE_VARIANT_TYPE_TRANSFORM3D) -MAKE_TYPE_INFO(Projection, GDNATIVE_VARIANT_TYPE_PROJECTION) -MAKE_TYPE_INFO(Color, GDNATIVE_VARIANT_TYPE_COLOR) -MAKE_TYPE_INFO(StringName, GDNATIVE_VARIANT_TYPE_STRING_NAME) -MAKE_TYPE_INFO(NodePath, GDNATIVE_VARIANT_TYPE_NODE_PATH) -MAKE_TYPE_INFO(RID, GDNATIVE_VARIANT_TYPE_RID) -MAKE_TYPE_INFO(Callable, GDNATIVE_VARIANT_TYPE_CALLABLE) -MAKE_TYPE_INFO(Signal, GDNATIVE_VARIANT_TYPE_SIGNAL) -MAKE_TYPE_INFO(Dictionary, GDNATIVE_VARIANT_TYPE_DICTIONARY) -MAKE_TYPE_INFO(Array, GDNATIVE_VARIANT_TYPE_ARRAY) -MAKE_TYPE_INFO(PackedByteArray, GDNATIVE_VARIANT_TYPE_PACKED_BYTE_ARRAY) -MAKE_TYPE_INFO(PackedInt32Array, GDNATIVE_VARIANT_TYPE_PACKED_INT32_ARRAY) -MAKE_TYPE_INFO(PackedInt64Array, GDNATIVE_VARIANT_TYPE_PACKED_INT64_ARRAY) -MAKE_TYPE_INFO(PackedFloat32Array, GDNATIVE_VARIANT_TYPE_PACKED_FLOAT32_ARRAY) -MAKE_TYPE_INFO(PackedFloat64Array, GDNATIVE_VARIANT_TYPE_PACKED_FLOAT64_ARRAY) -MAKE_TYPE_INFO(PackedStringArray, GDNATIVE_VARIANT_TYPE_PACKED_STRING_ARRAY) -MAKE_TYPE_INFO(PackedVector2Array, GDNATIVE_VARIANT_TYPE_PACKED_VECTOR2_ARRAY) -MAKE_TYPE_INFO(PackedVector3Array, GDNATIVE_VARIANT_TYPE_PACKED_VECTOR3_ARRAY) -MAKE_TYPE_INFO(PackedColorArray, GDNATIVE_VARIANT_TYPE_PACKED_COLOR_ARRAY) +MAKE_TYPE_INFO(bool, GDEXTENSION_VARIANT_TYPE_BOOL) +MAKE_TYPE_INFO_WITH_META(uint8_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT8) +MAKE_TYPE_INFO_WITH_META(int8_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT8) +MAKE_TYPE_INFO_WITH_META(uint16_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT16) +MAKE_TYPE_INFO_WITH_META(int16_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT16) +MAKE_TYPE_INFO_WITH_META(uint32_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT32) +MAKE_TYPE_INFO_WITH_META(int32_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT32) +MAKE_TYPE_INFO_WITH_META(uint64_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_UINT64) +MAKE_TYPE_INFO_WITH_META(int64_t, GDEXTENSION_VARIANT_TYPE_INT, GDEXTENSION_METHOD_ARGUMENT_METADATA_INT_IS_INT64) +MAKE_TYPE_INFO(char16_t, GDEXTENSION_VARIANT_TYPE_INT) +MAKE_TYPE_INFO(char32_t, GDEXTENSION_VARIANT_TYPE_INT) +MAKE_TYPE_INFO_WITH_META(float, GDEXTENSION_VARIANT_TYPE_FLOAT, GDEXTENSION_METHOD_ARGUMENT_METADATA_REAL_IS_FLOAT) +MAKE_TYPE_INFO_WITH_META(double, GDEXTENSION_VARIANT_TYPE_FLOAT, GDEXTENSION_METHOD_ARGUMENT_METADATA_REAL_IS_DOUBLE) + +MAKE_TYPE_INFO(String, GDEXTENSION_VARIANT_TYPE_STRING) +MAKE_TYPE_INFO(Vector2, GDEXTENSION_VARIANT_TYPE_VECTOR2) +MAKE_TYPE_INFO(Vector2i, GDEXTENSION_VARIANT_TYPE_VECTOR2I) +MAKE_TYPE_INFO(Rect2, GDEXTENSION_VARIANT_TYPE_RECT2) +MAKE_TYPE_INFO(Rect2i, GDEXTENSION_VARIANT_TYPE_RECT2I) +MAKE_TYPE_INFO(Vector3, GDEXTENSION_VARIANT_TYPE_VECTOR3) +MAKE_TYPE_INFO(Vector3i, GDEXTENSION_VARIANT_TYPE_VECTOR3I) +MAKE_TYPE_INFO(Transform2D, GDEXTENSION_VARIANT_TYPE_TRANSFORM2D) +MAKE_TYPE_INFO(Vector4, GDEXTENSION_VARIANT_TYPE_VECTOR4) +MAKE_TYPE_INFO(Vector4i, GDEXTENSION_VARIANT_TYPE_VECTOR4I) +MAKE_TYPE_INFO(Plane, GDEXTENSION_VARIANT_TYPE_PLANE) +MAKE_TYPE_INFO(Quaternion, GDEXTENSION_VARIANT_TYPE_QUATERNION) +MAKE_TYPE_INFO(AABB, GDEXTENSION_VARIANT_TYPE_AABB) +MAKE_TYPE_INFO(Basis, GDEXTENSION_VARIANT_TYPE_BASIS) +MAKE_TYPE_INFO(Transform3D, GDEXTENSION_VARIANT_TYPE_TRANSFORM3D) +MAKE_TYPE_INFO(Projection, GDEXTENSION_VARIANT_TYPE_PROJECTION) +MAKE_TYPE_INFO(Color, GDEXTENSION_VARIANT_TYPE_COLOR) +MAKE_TYPE_INFO(StringName, GDEXTENSION_VARIANT_TYPE_STRING_NAME) +MAKE_TYPE_INFO(NodePath, GDEXTENSION_VARIANT_TYPE_NODE_PATH) +MAKE_TYPE_INFO(RID, GDEXTENSION_VARIANT_TYPE_RID) +MAKE_TYPE_INFO(Callable, GDEXTENSION_VARIANT_TYPE_CALLABLE) +MAKE_TYPE_INFO(Signal, GDEXTENSION_VARIANT_TYPE_SIGNAL) +MAKE_TYPE_INFO(Dictionary, GDEXTENSION_VARIANT_TYPE_DICTIONARY) +MAKE_TYPE_INFO(Array, GDEXTENSION_VARIANT_TYPE_ARRAY) +MAKE_TYPE_INFO(PackedByteArray, GDEXTENSION_VARIANT_TYPE_PACKED_BYTE_ARRAY) +MAKE_TYPE_INFO(PackedInt32Array, GDEXTENSION_VARIANT_TYPE_PACKED_INT32_ARRAY) +MAKE_TYPE_INFO(PackedInt64Array, GDEXTENSION_VARIANT_TYPE_PACKED_INT64_ARRAY) +MAKE_TYPE_INFO(PackedFloat32Array, GDEXTENSION_VARIANT_TYPE_PACKED_FLOAT32_ARRAY) +MAKE_TYPE_INFO(PackedFloat64Array, GDEXTENSION_VARIANT_TYPE_PACKED_FLOAT64_ARRAY) +MAKE_TYPE_INFO(PackedStringArray, GDEXTENSION_VARIANT_TYPE_PACKED_STRING_ARRAY) +MAKE_TYPE_INFO(PackedVector2Array, GDEXTENSION_VARIANT_TYPE_PACKED_VECTOR2_ARRAY) +MAKE_TYPE_INFO(PackedVector3Array, GDEXTENSION_VARIANT_TYPE_PACKED_VECTOR3_ARRAY) +MAKE_TYPE_INFO(PackedColorArray, GDEXTENSION_VARIANT_TYPE_PACKED_COLOR_ARRAY) // For variant. template <> struct GetTypeInfo<Variant> { - static constexpr GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_NIL; - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; + static constexpr GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_NIL; + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; static inline PropertyInfo get_class_info() { return make_property_info(Variant::Type::NIL, "", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT); } @@ -189,8 +189,8 @@ struct GetTypeInfo<Variant> { template <> struct GetTypeInfo<const Variant &> { - static constexpr GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_NIL; - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; + static constexpr GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_NIL; + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; static inline PropertyInfo get_class_info() { return make_property_info(Variant::Type::NIL, "", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_NIL_IS_VARIANT); } @@ -198,8 +198,8 @@ struct GetTypeInfo<const Variant &> { template <typename T> struct GetTypeInfo<T *, typename EnableIf<TypeInherits<Object, T>::value>::type> { - static const GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_OBJECT; - static const GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; + static const GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_OBJECT; + static const GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; static inline PropertyInfo get_class_info() { return make_property_info(Variant::Type::OBJECT, T::get_class_static()); } @@ -207,8 +207,8 @@ struct GetTypeInfo<T *, typename EnableIf<TypeInherits<Object, T>::value>::type> template <typename T> struct GetTypeInfo<const T *, typename EnableIf<TypeInherits<Object, T>::value>::type> { - static const GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_OBJECT; - static const GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; + static const GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_OBJECT; + static const GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; static inline PropertyInfo get_class_info() { return make_property_info(Variant::Type::OBJECT, T::get_class_static()); } @@ -218,7 +218,7 @@ struct GetTypeInfo<const T *, typename EnableIf<TypeInherits<Object, T>::value>: template <> \ struct GetTypeInfo<m_impl> { \ static const Variant::Type VARIANT_TYPE = Variant::INT; \ - static const GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ + static const GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return make_property_info(Variant::Type::INT, "", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_ENUM, #m_class "." #m_enum); \ } \ @@ -255,7 +255,7 @@ public: template <> \ struct GetTypeInfo<m_impl> { \ static const Variant::Type VARIANT_TYPE = Variant::INT; \ - static const GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ + static const GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return make_property_info(Variant::Type::INT, "", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_BITFIELD, \ #m_class "." #m_enum); \ @@ -264,7 +264,7 @@ public: template <> \ struct GetTypeInfo<BitField<m_impl>> { \ static const Variant::Type VARIANT_TYPE = Variant::INT; \ - static const GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ + static const GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return make_property_info(Variant::Type::INT, "", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_CLASS_IS_BITFIELD, \ #m_class "." #m_enum); \ @@ -307,8 +307,8 @@ struct PtrToArg<const TypedArray<T> &> { template <typename T> struct GetTypeInfo<TypedArray<T>> { - static constexpr GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_ARRAY; - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; + static constexpr GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_ARRAY; + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; static inline PropertyInfo get_class_info() { return make_property_info(Variant::Type::ARRAY, "", PROPERTY_HINT_ARRAY_TYPE, T::get_class_static()); } @@ -316,8 +316,8 @@ struct GetTypeInfo<TypedArray<T>> { template <typename T> struct GetTypeInfo<const TypedArray<T> &> { - static constexpr GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_ARRAY; - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; + static constexpr GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_ARRAY; + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; static inline PropertyInfo get_class_info() { return make_property_info(Variant::Type::ARRAY, "", PROPERTY_HINT_ARRAY_TYPE, T::get_class_static()); } @@ -326,16 +326,16 @@ struct GetTypeInfo<const TypedArray<T> &> { #define MAKE_TYPED_ARRAY_INFO(m_type, m_variant_type) \ template <> \ struct GetTypeInfo<TypedArray<m_type>> { \ - static constexpr GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_ARRAY; \ - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ + static constexpr GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_ARRAY; \ + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return make_property_info(Variant::Type::ARRAY, "", PROPERTY_HINT_ARRAY_TYPE, Variant::get_type_name(m_variant_type).utf8().get_data()); \ } \ }; \ template <> \ struct GetTypeInfo<const TypedArray<m_type> &> { \ - static constexpr GDNativeVariantType VARIANT_TYPE = GDNATIVE_VARIANT_TYPE_ARRAY; \ - static constexpr GDNativeExtensionClassMethodArgumentMetadata METADATA = GDNATIVE_EXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ + static constexpr GDExtensionVariantType VARIANT_TYPE = GDEXTENSION_VARIANT_TYPE_ARRAY; \ + static constexpr GDExtensionClassMethodArgumentMetadata METADATA = GDEXTENSION_METHOD_ARGUMENT_METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return make_property_info(Variant::Type::ARRAY, "", PROPERTY_HINT_ARRAY_TYPE, Variant::get_type_name(m_variant_type).utf8().get_data()); \ } \ |