diff options
author | Gilles Roudière <gilles.roudiere@gmail.com> | 2022-12-07 14:11:44 +0100 |
---|---|---|
committer | Gilles Roudière <gilles.roudiere@gmail.com> | 2022-12-12 11:06:38 +0100 |
commit | c02e644679655e842dcff543f0defef973cf946c (patch) | |
tree | 67875626a128c08eca565bc3693e2dfbe36fce75 /src/variant | |
parent | f74c47220382a8e1a347c8dda942a95caea13a0e (diff) | |
download | redot-cpp-c02e644679655e842dcff543f0defef973cf946c.tar.gz |
Rename GDNative to GDExtension
Non-exhaustive list of case-sensitive renames:
GDExtension -> GDNative
GDNATIVE -> GDEXTENSION
gdextension -> gdnative
ExtensionExtension -> Extension (for where there was GDNativeExtension)
EXTENSION_EXTENSION -> EXTENSION (for where there was GDNATIVE_EXTENSION)
gdnlib -> gdextension
gdn_interface -> gde_interface
gdni -> gde_interface
Diffstat (limited to 'src/variant')
-rw-r--r-- | src/variant/char_string.cpp | 40 | ||||
-rw-r--r-- | src/variant/packed_arrays.cpp | 80 | ||||
-rw-r--r-- | src/variant/variant.cpp | 190 |
3 files changed, 155 insertions, 155 deletions
diff --git a/src/variant/char_string.cpp b/src/variant/char_string.cpp index 33e10db..7229823 100644 --- a/src/variant/char_string.cpp +++ b/src/variant/char_string.cpp @@ -153,19 +153,19 @@ CharWideString::~CharWideString() { // It's easier to have them written in C++ directly than in a Python script that generates them. String::String(const char *from) { - internal::gdn_interface->string_new_with_latin1_chars(_native_ptr(), from); + internal::gde_interface->string_new_with_latin1_chars(_native_ptr(), from); } String::String(const wchar_t *from) { - internal::gdn_interface->string_new_with_wide_chars(_native_ptr(), from); + internal::gde_interface->string_new_with_wide_chars(_native_ptr(), from); } String::String(const char16_t *from) { - internal::gdn_interface->string_new_with_utf16_chars(_native_ptr(), from); + internal::gde_interface->string_new_with_utf16_chars(_native_ptr(), from); } String::String(const char32_t *from) { - internal::gdn_interface->string_new_with_utf32_chars(_native_ptr(), from); + internal::gde_interface->string_new_with_utf32_chars(_native_ptr(), from); } String String::utf8(const char *from, int len) { @@ -175,7 +175,7 @@ String String::utf8(const char *from, int len) { } void String::parse_utf8(const char *from, int len) { - internal::gdn_interface->string_new_with_utf8_chars_and_len(_native_ptr(), from, len); + internal::gde_interface->string_new_with_utf8_chars_and_len(_native_ptr(), from, len); } String String::utf16(const char16_t *from, int len) { @@ -185,7 +185,7 @@ String String::utf16(const char16_t *from, int len) { } void String::parse_utf16(const char16_t *from, int len) { - internal::gdn_interface->string_new_with_utf16_chars_and_len(_native_ptr(), from, len); + internal::gde_interface->string_new_with_utf16_chars_and_len(_native_ptr(), from, len); } String String::num_real(double p_num, bool p_trailing) { @@ -226,9 +226,9 @@ String rtoss(double p_val) { } CharString String::utf8() const { - int size = internal::gdn_interface->string_to_utf8_chars(_native_ptr(), nullptr, 0); + int size = internal::gde_interface->string_to_utf8_chars(_native_ptr(), nullptr, 0); char *cstr = memnew_arr(char, size + 1); - internal::gdn_interface->string_to_utf8_chars(_native_ptr(), cstr, size + 1); + internal::gde_interface->string_to_utf8_chars(_native_ptr(), cstr, size + 1); cstr[size] = '\0'; @@ -236,9 +236,9 @@ CharString String::utf8() const { } CharString String::ascii() const { - int size = internal::gdn_interface->string_to_latin1_chars(_native_ptr(), nullptr, 0); + int size = internal::gde_interface->string_to_latin1_chars(_native_ptr(), nullptr, 0); char *cstr = memnew_arr(char, size + 1); - internal::gdn_interface->string_to_latin1_chars(_native_ptr(), cstr, size + 1); + internal::gde_interface->string_to_latin1_chars(_native_ptr(), cstr, size + 1); cstr[size] = '\0'; @@ -246,9 +246,9 @@ CharString String::ascii() const { } Char16String String::utf16() const { - int size = internal::gdn_interface->string_to_utf16_chars(_native_ptr(), nullptr, 0); + int size = internal::gde_interface->string_to_utf16_chars(_native_ptr(), nullptr, 0); char16_t *cstr = memnew_arr(char16_t, size + 1); - internal::gdn_interface->string_to_utf16_chars(_native_ptr(), cstr, size + 1); + internal::gde_interface->string_to_utf16_chars(_native_ptr(), cstr, size + 1); cstr[size] = '\0'; @@ -256,9 +256,9 @@ Char16String String::utf16() const { } Char32String String::utf32() const { - int size = internal::gdn_interface->string_to_utf32_chars(_native_ptr(), nullptr, 0); + int size = internal::gde_interface->string_to_utf32_chars(_native_ptr(), nullptr, 0); char32_t *cstr = memnew_arr(char32_t, size + 1); - internal::gdn_interface->string_to_utf32_chars(_native_ptr(), cstr, size + 1); + internal::gde_interface->string_to_utf32_chars(_native_ptr(), cstr, size + 1); cstr[size] = '\0'; @@ -266,9 +266,9 @@ Char32String String::utf32() const { } CharWideString String::wide_string() const { - int size = internal::gdn_interface->string_to_wide_chars(_native_ptr(), nullptr, 0); + int size = internal::gde_interface->string_to_wide_chars(_native_ptr(), nullptr, 0); wchar_t *cstr = memnew_arr(wchar_t, size + 1); - internal::gdn_interface->string_to_wide_chars(_native_ptr(), cstr, size + 1); + internal::gde_interface->string_to_wide_chars(_native_ptr(), cstr, size + 1); cstr[size] = '\0'; @@ -344,19 +344,19 @@ String String::operator+(const char32_t *p_chr) { } const char32_t &String::operator[](int p_index) const { - return *internal::gdn_interface->string_operator_index_const((GDNativeStringPtr)this, p_index); + return *internal::gde_interface->string_operator_index_const((GDExtensionStringPtr)this, p_index); } char32_t &String::operator[](int p_index) { - return *internal::gdn_interface->string_operator_index((GDNativeStringPtr)this, p_index); + return *internal::gde_interface->string_operator_index((GDExtensionStringPtr)this, p_index); } const char32_t *String::ptr() const { - return internal::gdn_interface->string_operator_index_const((GDNativeStringPtr)this, 0); + return internal::gde_interface->string_operator_index_const((GDExtensionStringPtr)this, 0); } char32_t *String::ptrw() { - return internal::gdn_interface->string_operator_index((GDNativeStringPtr)this, 0); + return internal::gde_interface->string_operator_index((GDExtensionStringPtr)this, 0); } bool operator==(const char *p_chr, const String &p_str) { diff --git a/src/variant/packed_arrays.cpp b/src/variant/packed_arrays.cpp index 9b9bafb..e07a41b 100644 --- a/src/variant/packed_arrays.cpp +++ b/src/variant/packed_arrays.cpp @@ -47,174 +47,174 @@ namespace godot { const uint8_t &PackedByteArray::operator[](int p_index) const { - return *internal::gdn_interface->packed_byte_array_operator_index_const((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_byte_array_operator_index_const((GDExtensionTypePtr *)this, p_index); } uint8_t &PackedByteArray::operator[](int p_index) { - return *internal::gdn_interface->packed_byte_array_operator_index((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_byte_array_operator_index((GDExtensionTypePtr *)this, p_index); } const uint8_t *PackedByteArray::ptr() const { - return internal::gdn_interface->packed_byte_array_operator_index_const((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_byte_array_operator_index_const((GDExtensionTypePtr *)this, 0); } uint8_t *PackedByteArray::ptrw() { - return internal::gdn_interface->packed_byte_array_operator_index((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_byte_array_operator_index((GDExtensionTypePtr *)this, 0); } const Color &PackedColorArray::operator[](int p_index) const { - const Color *color = (const Color *)internal::gdn_interface->packed_color_array_operator_index_const((GDNativeTypePtr *)this, p_index); + const Color *color = (const Color *)internal::gde_interface->packed_color_array_operator_index_const((GDExtensionTypePtr *)this, p_index); return *color; } Color &PackedColorArray::operator[](int p_index) { - Color *color = (Color *)internal::gdn_interface->packed_color_array_operator_index((GDNativeTypePtr *)this, p_index); + Color *color = (Color *)internal::gde_interface->packed_color_array_operator_index((GDExtensionTypePtr *)this, p_index); return *color; } const Color *PackedColorArray::ptr() const { - return (const Color *)internal::gdn_interface->packed_color_array_operator_index_const((GDNativeTypePtr *)this, 0); + return (const Color *)internal::gde_interface->packed_color_array_operator_index_const((GDExtensionTypePtr *)this, 0); } Color *PackedColorArray::ptrw() { - return (Color *)internal::gdn_interface->packed_color_array_operator_index((GDNativeTypePtr *)this, 0); + return (Color *)internal::gde_interface->packed_color_array_operator_index((GDExtensionTypePtr *)this, 0); } const float &PackedFloat32Array::operator[](int p_index) const { - return *internal::gdn_interface->packed_float32_array_operator_index_const((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_float32_array_operator_index_const((GDExtensionTypePtr *)this, p_index); } float &PackedFloat32Array::operator[](int p_index) { - return *internal::gdn_interface->packed_float32_array_operator_index((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_float32_array_operator_index((GDExtensionTypePtr *)this, p_index); } const float *PackedFloat32Array::ptr() const { - return internal::gdn_interface->packed_float32_array_operator_index_const((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_float32_array_operator_index_const((GDExtensionTypePtr *)this, 0); } float *PackedFloat32Array::ptrw() { - return internal::gdn_interface->packed_float32_array_operator_index((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_float32_array_operator_index((GDExtensionTypePtr *)this, 0); } const double &PackedFloat64Array::operator[](int p_index) const { - return *internal::gdn_interface->packed_float64_array_operator_index_const((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_float64_array_operator_index_const((GDExtensionTypePtr *)this, p_index); } double &PackedFloat64Array::operator[](int p_index) { - return *internal::gdn_interface->packed_float64_array_operator_index((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_float64_array_operator_index((GDExtensionTypePtr *)this, p_index); } const double *PackedFloat64Array::ptr() const { - return internal::gdn_interface->packed_float64_array_operator_index_const((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_float64_array_operator_index_const((GDExtensionTypePtr *)this, 0); } double *PackedFloat64Array::ptrw() { - return internal::gdn_interface->packed_float64_array_operator_index((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_float64_array_operator_index((GDExtensionTypePtr *)this, 0); } const int32_t &PackedInt32Array::operator[](int p_index) const { - return *internal::gdn_interface->packed_int32_array_operator_index_const((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_int32_array_operator_index_const((GDExtensionTypePtr *)this, p_index); } int32_t &PackedInt32Array::operator[](int p_index) { - return *internal::gdn_interface->packed_int32_array_operator_index((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_int32_array_operator_index((GDExtensionTypePtr *)this, p_index); } const int32_t *PackedInt32Array::ptr() const { - return internal::gdn_interface->packed_int32_array_operator_index_const((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_int32_array_operator_index_const((GDExtensionTypePtr *)this, 0); } int32_t *PackedInt32Array::ptrw() { - return internal::gdn_interface->packed_int32_array_operator_index((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_int32_array_operator_index((GDExtensionTypePtr *)this, 0); } const int64_t &PackedInt64Array::operator[](int p_index) const { - return *internal::gdn_interface->packed_int64_array_operator_index_const((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_int64_array_operator_index_const((GDExtensionTypePtr *)this, p_index); } int64_t &PackedInt64Array::operator[](int p_index) { - return *internal::gdn_interface->packed_int64_array_operator_index((GDNativeTypePtr *)this, p_index); + return *internal::gde_interface->packed_int64_array_operator_index((GDExtensionTypePtr *)this, p_index); } const int64_t *PackedInt64Array::ptr() const { - return internal::gdn_interface->packed_int64_array_operator_index_const((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_int64_array_operator_index_const((GDExtensionTypePtr *)this, 0); } int64_t *PackedInt64Array::ptrw() { - return internal::gdn_interface->packed_int64_array_operator_index((GDNativeTypePtr *)this, 0); + return internal::gde_interface->packed_int64_array_operator_index((GDExtensionTypePtr *)this, 0); } const String &PackedStringArray::operator[](int p_index) const { - const String *string = (const String *)internal::gdn_interface->packed_string_array_operator_index_const((GDNativeTypePtr *)this, p_index); + const String *string = (const String *)internal::gde_interface->packed_string_array_operator_index_const((GDExtensionTypePtr *)this, p_index); return *string; } String &PackedStringArray::operator[](int p_index) { - String *string = (String *)internal::gdn_interface->packed_string_array_operator_index((GDNativeTypePtr *)this, p_index); + String *string = (String *)internal::gde_interface->packed_string_array_operator_index((GDExtensionTypePtr *)this, p_index); return *string; } const String *PackedStringArray::ptr() const { - return (const String *)internal::gdn_interface->packed_string_array_operator_index_const((GDNativeTypePtr *)this, 0); + return (const String *)internal::gde_interface->packed_string_array_operator_index_const((GDExtensionTypePtr *)this, 0); } String *PackedStringArray::ptrw() { - return (String *)internal::gdn_interface->packed_string_array_operator_index((GDNativeTypePtr *)this, 0); + return (String *)internal::gde_interface->packed_string_array_operator_index((GDExtensionTypePtr *)this, 0); } const Vector2 &PackedVector2Array::operator[](int p_index) const { - const Vector2 *vec = (const Vector2 *)internal::gdn_interface->packed_vector2_array_operator_index_const((GDNativeTypePtr *)this, p_index); + const Vector2 *vec = (const Vector2 *)internal::gde_interface->packed_vector2_array_operator_index_const((GDExtensionTypePtr *)this, p_index); return *vec; } Vector2 &PackedVector2Array::operator[](int p_index) { - Vector2 *vec = (Vector2 *)internal::gdn_interface->packed_vector2_array_operator_index((GDNativeTypePtr *)this, p_index); + Vector2 *vec = (Vector2 *)internal::gde_interface->packed_vector2_array_operator_index((GDExtensionTypePtr *)this, p_index); return *vec; } const Vector2 *PackedVector2Array::ptr() const { - return (const Vector2 *)internal::gdn_interface->packed_vector2_array_operator_index_const((GDNativeTypePtr *)this, 0); + return (const Vector2 *)internal::gde_interface->packed_vector2_array_operator_index_const((GDExtensionTypePtr *)this, 0); } Vector2 *PackedVector2Array::ptrw() { - return (Vector2 *)internal::gdn_interface->packed_vector2_array_operator_index((GDNativeTypePtr *)this, 0); + return (Vector2 *)internal::gde_interface->packed_vector2_array_operator_index((GDExtensionTypePtr *)this, 0); } const Vector3 &PackedVector3Array::operator[](int p_index) const { - const Vector3 *vec = (const Vector3 *)internal::gdn_interface->packed_vector3_array_operator_index_const((GDNativeTypePtr *)this, p_index); + const Vector3 *vec = (const Vector3 *)internal::gde_interface->packed_vector3_array_operator_index_const((GDExtensionTypePtr *)this, p_index); return *vec; } Vector3 &PackedVector3Array::operator[](int p_index) { - Vector3 *vec = (Vector3 *)internal::gdn_interface->packed_vector3_array_operator_index((GDNativeTypePtr *)this, p_index); + Vector3 *vec = (Vector3 *)internal::gde_interface->packed_vector3_array_operator_index((GDExtensionTypePtr *)this, p_index); return *vec; } const Vector3 *PackedVector3Array::ptr() const { - return (const Vector3 *)internal::gdn_interface->packed_vector3_array_operator_index_const((GDNativeTypePtr *)this, 0); + return (const Vector3 *)internal::gde_interface->packed_vector3_array_operator_index_const((GDExtensionTypePtr *)this, 0); } Vector3 *PackedVector3Array::ptrw() { - return (Vector3 *)internal::gdn_interface->packed_vector3_array_operator_index((GDNativeTypePtr *)this, 0); + return (Vector3 *)internal::gde_interface->packed_vector3_array_operator_index((GDExtensionTypePtr *)this, 0); } const Variant &Array::operator[](int p_index) const { - const Variant *var = (const Variant *)internal::gdn_interface->array_operator_index_const((GDNativeTypePtr *)this, p_index); + const Variant *var = (const Variant *)internal::gde_interface->array_operator_index_const((GDExtensionTypePtr *)this, p_index); return *var; } Variant &Array::operator[](int p_index) { - Variant *var = (Variant *)internal::gdn_interface->array_operator_index((GDNativeTypePtr *)this, p_index); + Variant *var = (Variant *)internal::gde_interface->array_operator_index((GDExtensionTypePtr *)this, p_index); return *var; } const Variant &Dictionary::operator[](const Variant &p_key) const { - const Variant *var = (const Variant *)internal::gdn_interface->dictionary_operator_index_const((GDNativeTypePtr *)this, (GDNativeVariantPtr)&p_key); + const Variant *var = (const Variant *)internal::gde_interface->dictionary_operator_index_const((GDExtensionTypePtr *)this, (GDExtensionVariantPtr)&p_key); return *var; } Variant &Dictionary::operator[](const Variant &p_key) { - Variant *var = (Variant *)internal::gdn_interface->dictionary_operator_index((GDNativeTypePtr *)this, (GDNativeVariantPtr)&p_key); + Variant *var = (Variant *)internal::gde_interface->dictionary_operator_index((GDExtensionTypePtr *)this, (GDExtensionVariantPtr)&p_key); return *var; } diff --git a/src/variant/variant.cpp b/src/variant/variant.cpp index efb7d55..21b17b3 100644 --- a/src/variant/variant.cpp +++ b/src/variant/variant.cpp @@ -39,14 +39,14 @@ namespace godot { -GDNativeVariantFromTypeConstructorFunc Variant::from_type_constructor[Variant::VARIANT_MAX]{}; -GDNativeTypeFromVariantConstructorFunc Variant::to_type_constructor[Variant::VARIANT_MAX]{}; +GDExtensionVariantFromTypeConstructorFunc Variant::from_type_constructor[Variant::VARIANT_MAX]{}; +GDExtensionTypeFromVariantConstructorFunc Variant::to_type_constructor[Variant::VARIANT_MAX]{}; void Variant::init_bindings() { // Start from 1 to skip NIL. for (int i = 1; i < VARIANT_MAX; i++) { - from_type_constructor[i] = internal::gdn_interface->get_variant_from_type_constructor((GDNativeVariantType)i); - to_type_constructor[i] = internal::gdn_interface->get_variant_to_type_constructor((GDNativeVariantType)i); + from_type_constructor[i] = internal::gde_interface->get_variant_from_type_constructor((GDExtensionVariantType)i); + to_type_constructor[i] = internal::gde_interface->get_variant_to_type_constructor((GDExtensionVariantType)i); } StringName::init_bindings(); @@ -69,15 +69,15 @@ void Variant::init_bindings() { } Variant::Variant() { - internal::gdn_interface->variant_new_nil(_native_ptr()); + internal::gde_interface->variant_new_nil(_native_ptr()); } -Variant::Variant(GDNativeConstVariantPtr native_ptr) { - internal::gdn_interface->variant_new_copy(_native_ptr(), native_ptr); +Variant::Variant(GDExtensionConstVariantPtr native_ptr) { + internal::gde_interface->variant_new_copy(_native_ptr(), native_ptr); } Variant::Variant(const Variant &other) { - internal::gdn_interface->variant_new_copy(_native_ptr(), other._native_ptr()); + internal::gde_interface->variant_new_copy(_native_ptr(), other._native_ptr()); } Variant::Variant(Variant &&other) { @@ -85,13 +85,13 @@ Variant::Variant(Variant &&other) { } Variant::Variant(bool v) { - GDNativeBool encoded; + GDExtensionBool encoded; PtrToArg<bool>::encode(v, &encoded); from_type_constructor[BOOL](_native_ptr(), &encoded); } Variant::Variant(int64_t v) { - GDNativeInt encoded; + GDExtensionInt encoded; PtrToArg<int64_t>::encode(v, &encoded); from_type_constructor[INT](_native_ptr(), &encoded); } @@ -107,67 +107,67 @@ Variant::Variant(const String &v) { } Variant::Variant(const Vector2 &v) { - from_type_constructor[VECTOR2](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[VECTOR2](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Vector2i &v) { - from_type_constructor[VECTOR2I](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[VECTOR2I](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Rect2 &v) { - from_type_constructor[RECT2](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[RECT2](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Rect2i &v) { - from_type_constructor[RECT2I](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[RECT2I](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Vector3 &v) { - from_type_constructor[VECTOR3](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[VECTOR3](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Vector3i &v) { - from_type_constructor[VECTOR3I](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[VECTOR3I](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Transform2D &v) { - from_type_constructor[TRANSFORM2D](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[TRANSFORM2D](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Vector4 &v) { - from_type_constructor[VECTOR4](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[VECTOR4](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Vector4i &v) { - from_type_constructor[VECTOR4I](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[VECTOR4I](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Plane &v) { - from_type_constructor[PLANE](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[PLANE](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Quaternion &v) { - from_type_constructor[QUATERNION](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[QUATERNION](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const godot::AABB &v) { - from_type_constructor[AABB](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[AABB](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Basis &v) { - from_type_constructor[BASIS](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[BASIS](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Transform3D &v) { - from_type_constructor[TRANSFORM3D](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[TRANSFORM3D](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Projection &v) { - from_type_constructor[PROJECTION](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[PROJECTION](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const Color &v) { - from_type_constructor[COLOR](_native_ptr(), (GDNativeTypePtr)&v); + from_type_constructor[COLOR](_native_ptr(), (GDExtensionTypePtr)&v); } Variant::Variant(const StringName &v) { @@ -244,17 +244,17 @@ Variant::Variant(const PackedColorArray &v) { } Variant::~Variant() { - internal::gdn_interface->variant_destroy(_native_ptr()); + internal::gde_interface->variant_destroy(_native_ptr()); } Variant::operator bool() const { - GDNativeBool result; + GDExtensionBool result; to_type_constructor[BOOL](&result, _native_ptr()); return PtrToArg<bool>::convert(&result); } Variant::operator int64_t() const { - GDNativeInt result; + GDExtensionInt result; to_type_constructor[INT](&result, _native_ptr()); return PtrToArg<int64_t>::convert(&result); } @@ -289,97 +289,97 @@ Variant::operator String() const { Variant::operator Vector2() const { Vector2 result; - to_type_constructor[VECTOR2]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[VECTOR2]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Vector2i() const { Vector2i result; - to_type_constructor[VECTOR2I]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[VECTOR2I]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Rect2() const { Rect2 result; - to_type_constructor[RECT2]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[RECT2]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Rect2i() const { Rect2i result; - to_type_constructor[RECT2I]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[RECT2I]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Vector3() const { Vector3 result; - to_type_constructor[VECTOR3]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[VECTOR3]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Vector3i() const { Vector3i result; - to_type_constructor[VECTOR3I]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[VECTOR3I]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Transform2D() const { Transform2D result; - to_type_constructor[TRANSFORM2D]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[TRANSFORM2D]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Vector4() const { Vector4 result; - to_type_constructor[VECTOR4]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[VECTOR4]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Vector4i() const { Vector4i result; - to_type_constructor[VECTOR4I]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[VECTOR4I]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Plane() const { Plane result; - to_type_constructor[PLANE]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[PLANE]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Quaternion() const { Quaternion result; - to_type_constructor[QUATERNION]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[QUATERNION]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator godot::AABB() const { godot::AABB result; - to_type_constructor[AABB]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[AABB]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Basis() const { Basis result; - to_type_constructor[BASIS]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[BASIS]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Transform3D() const { Transform3D result; - to_type_constructor[TRANSFORM3D]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[TRANSFORM3D]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Projection() const { Projection result; - to_type_constructor[PROJECTION]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[PROJECTION]((GDExtensionTypePtr)&result, _native_ptr()); return result; } Variant::operator Color() const { Color result; - to_type_constructor[COLOR]((GDNativeTypePtr)&result, _native_ptr()); + to_type_constructor[COLOR]((GDExtensionTypePtr)&result, _native_ptr()); return result; } @@ -407,7 +407,7 @@ Variant::operator Object *() const { 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)); } Variant::operator Callable() const { @@ -490,7 +490,7 @@ Variant::operator PackedColorArray() const { Variant &Variant::operator=(const Variant &other) { clear(); - internal::gdn_interface->variant_new_copy(_native_ptr(), other._native_ptr()); + internal::gde_interface->variant_new_copy(_native_ptr(), other._native_ptr()); return *this; } @@ -529,51 +529,51 @@ bool Variant::operator<(const Variant &other) const { return result.operator bool(); } -void Variant::call(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDNativeCallError &r_error) { - internal::gdn_interface->variant_call(_native_ptr(), method._native_ptr(), reinterpret_cast<GDNativeConstVariantPtr *>(args), argcount, r_ret._native_ptr(), &r_error); +void Variant::call(const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error) { + internal::gde_interface->variant_call(_native_ptr(), method._native_ptr(), reinterpret_cast<GDExtensionConstVariantPtr *>(args), argcount, r_ret._native_ptr(), &r_error); } -void Variant::call_static(Variant::Type type, const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDNativeCallError &r_error) { - internal::gdn_interface->variant_call_static(static_cast<GDNativeVariantType>(type), method._native_ptr(), reinterpret_cast<GDNativeConstVariantPtr *>(args), argcount, r_ret._native_ptr(), &r_error); +void Variant::call_static(Variant::Type type, const StringName &method, const Variant **args, int argcount, Variant &r_ret, GDExtensionCallError &r_error) { + internal::gde_interface->variant_call_static(static_cast<GDExtensionVariantType>(type), method._native_ptr(), reinterpret_cast<GDExtensionConstVariantPtr *>(args), argcount, r_ret._native_ptr(), &r_error); } void Variant::evaluate(const Operator &op, const Variant &a, const Variant &b, Variant &r_ret, bool &r_valid) { - GDNativeBool valid; - internal::gdn_interface->variant_evaluate(static_cast<GDNativeVariantOperator>(op), a._native_ptr(), b._native_ptr(), r_ret._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_evaluate(static_cast<GDExtensionVariantOperator>(op), a._native_ptr(), b._native_ptr(), r_ret._native_ptr(), &valid); r_valid = PtrToArg<bool>::convert(&valid); } void Variant::set(const Variant &key, const Variant &value, bool *r_valid) { - GDNativeBool valid; - internal::gdn_interface->variant_set(_native_ptr(), key._native_ptr(), value._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_set(_native_ptr(), key._native_ptr(), value._native_ptr(), &valid); if (r_valid) { *r_valid = PtrToArg<bool>::convert(&valid); } } void Variant::set_named(const StringName &name, const Variant &value, bool &r_valid) { - GDNativeBool valid; - internal::gdn_interface->variant_set_named(_native_ptr(), name._native_ptr(), value._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_set_named(_native_ptr(), name._native_ptr(), value._native_ptr(), &valid); r_valid = PtrToArg<bool>::convert(&valid); } void Variant::set_indexed(int64_t index, const Variant &value, bool &r_valid, bool &r_oob) { - GDNativeBool valid, oob; - internal::gdn_interface->variant_set_indexed(_native_ptr(), index, value._native_ptr(), &valid, &oob); + GDExtensionBool valid, oob; + internal::gde_interface->variant_set_indexed(_native_ptr(), index, value._native_ptr(), &valid, &oob); r_valid = PtrToArg<bool>::convert(&valid); r_oob = PtrToArg<bool>::convert(&oob); } void Variant::set_keyed(const Variant &key, const Variant &value, bool &r_valid) { - GDNativeBool valid; - internal::gdn_interface->variant_set_keyed(_native_ptr(), key._native_ptr(), value._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_set_keyed(_native_ptr(), key._native_ptr(), value._native_ptr(), &valid); r_valid = PtrToArg<bool>::convert(&valid); } Variant Variant::get(const Variant &key, bool *r_valid) const { Variant result; - GDNativeBool valid; - internal::gdn_interface->variant_get(_native_ptr(), key._native_ptr(), result._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_get(_native_ptr(), key._native_ptr(), result._native_ptr(), &valid); if (r_valid) { *r_valid = PtrToArg<bool>::convert(&valid); } @@ -582,17 +582,17 @@ Variant Variant::get(const Variant &key, bool *r_valid) const { Variant Variant::get_named(const StringName &name, bool &r_valid) const { Variant result; - GDNativeBool valid; - internal::gdn_interface->variant_get_named(_native_ptr(), name._native_ptr(), result._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_get_named(_native_ptr(), name._native_ptr(), result._native_ptr(), &valid); r_valid = PtrToArg<bool>::convert(&valid); return result; } Variant Variant::get_indexed(int64_t index, bool &r_valid, bool &r_oob) const { Variant result; - GDNativeBool valid; - GDNativeBool oob; - internal::gdn_interface->variant_get_indexed(_native_ptr(), index, result._native_ptr(), &valid, &oob); + GDExtensionBool valid; + GDExtensionBool oob; + internal::gde_interface->variant_get_indexed(_native_ptr(), index, result._native_ptr(), &valid, &oob); r_valid = PtrToArg<bool>::convert(&valid); r_oob = PtrToArg<bool>::convert(&oob); return result; @@ -600,8 +600,8 @@ Variant Variant::get_indexed(int64_t index, bool &r_valid, bool &r_oob) const { Variant Variant::get_keyed(const Variant &key, bool &r_valid) const { Variant result; - GDNativeBool valid; - internal::gdn_interface->variant_get_keyed(_native_ptr(), key._native_ptr(), result._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_get_keyed(_native_ptr(), key._native_ptr(), result._native_ptr(), &valid); r_valid = PtrToArg<bool>::convert(&valid); return result; } @@ -617,37 +617,37 @@ bool Variant::in(const Variant &index, bool *r_valid) const { } bool Variant::iter_init(Variant &r_iter, bool &r_valid) const { - GDNativeBool valid; - internal::gdn_interface->variant_iter_init(_native_ptr(), r_iter._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_iter_init(_native_ptr(), r_iter._native_ptr(), &valid); return PtrToArg<bool>::convert(&valid); } bool Variant::iter_next(Variant &r_iter, bool &r_valid) const { - GDNativeBool valid; - internal::gdn_interface->variant_iter_next(_native_ptr(), r_iter._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_iter_next(_native_ptr(), r_iter._native_ptr(), &valid); return PtrToArg<bool>::convert(&valid); } Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const { Variant result; - GDNativeBool valid; - internal::gdn_interface->variant_iter_get(_native_ptr(), r_iter._native_ptr(), result._native_ptr(), &valid); + GDExtensionBool valid; + internal::gde_interface->variant_iter_get(_native_ptr(), r_iter._native_ptr(), result._native_ptr(), &valid); r_valid = PtrToArg<bool>::convert(&valid); return result; } Variant::Type Variant::get_type() const { - return static_cast<Variant::Type>(internal::gdn_interface->variant_get_type(_native_ptr())); + return static_cast<Variant::Type>(internal::gde_interface->variant_get_type(_native_ptr())); } bool Variant::has_method(const StringName &method) const { - GDNativeBool has = internal::gdn_interface->variant_has_method(_native_ptr(), method._native_ptr()); + GDExtensionBool has = internal::gde_interface->variant_has_method(_native_ptr(), method._native_ptr()); return PtrToArg<bool>::convert(&has); } bool Variant::has_key(const Variant &key, bool *r_valid) const { - GDNativeBool valid; - GDNativeBool has = internal::gdn_interface->variant_has_key(_native_ptr(), key._native_ptr(), &valid); + GDExtensionBool valid; + GDExtensionBool has = internal::gde_interface->variant_has_key(_native_ptr(), key._native_ptr(), &valid); if (r_valid) { *r_valid = PtrToArg<bool>::convert(&valid); } @@ -655,59 +655,59 @@ bool Variant::has_key(const Variant &key, bool *r_valid) const { } bool Variant::has_member(Variant::Type type, const StringName &member) { - GDNativeBool has = internal::gdn_interface->variant_has_member(static_cast<GDNativeVariantType>(type), member._native_ptr()); + GDExtensionBool has = internal::gde_interface->variant_has_member(static_cast<GDExtensionVariantType>(type), member._native_ptr()); return PtrToArg<bool>::convert(&has); } uint32_t Variant::hash() const { - GDNativeInt hash = internal::gdn_interface->variant_hash(_native_ptr()); + GDExtensionInt hash = internal::gde_interface->variant_hash(_native_ptr()); return PtrToArg<uint32_t>::convert(&hash); } uint32_t Variant::recursive_hash(int recursion_count) const { - GDNativeInt hash = internal::gdn_interface->variant_recursive_hash(_native_ptr(), recursion_count); + GDExtensionInt hash = internal::gde_interface->variant_recursive_hash(_native_ptr(), recursion_count); return PtrToArg<uint32_t>::convert(&hash); } bool Variant::hash_compare(const Variant &variant) const { - GDNativeBool compare = internal::gdn_interface->variant_hash_compare(_native_ptr(), variant._native_ptr()); + GDExtensionBool compare = internal::gde_interface->variant_hash_compare(_native_ptr(), variant._native_ptr()); return PtrToArg<bool>::convert(&compare); } bool Variant::booleanize() const { - GDNativeBool booleanized = internal::gdn_interface->variant_booleanize(_native_ptr()); + GDExtensionBool booleanized = internal::gde_interface->variant_booleanize(_native_ptr()); return PtrToArg<bool>::convert(&booleanized); } String Variant::stringify() const { String result; - internal::gdn_interface->variant_stringify(_native_ptr(), result._native_ptr()); + internal::gde_interface->variant_stringify(_native_ptr(), result._native_ptr()); return result; } Variant Variant::duplicate(bool deep) const { Variant result; - GDNativeBool _deep; + GDExtensionBool _deep; PtrToArg<bool>::encode(deep, &_deep); - internal::gdn_interface->variant_duplicate(_native_ptr(), result._native_ptr(), _deep); + internal::gde_interface->variant_duplicate(_native_ptr(), result._native_ptr(), _deep); return result; } String Variant::get_type_name(Variant::Type type) { String result; - internal::gdn_interface->variant_get_type_name(static_cast<GDNativeVariantType>(type), result._native_ptr()); + internal::gde_interface->variant_get_type_name(static_cast<GDExtensionVariantType>(type), result._native_ptr()); return result; } bool Variant::can_convert(Variant::Type from, Variant::Type to) { - GDNativeBool can; - internal::gdn_interface->variant_can_convert(static_cast<GDNativeVariantType>(from), static_cast<GDNativeVariantType>(to)); + GDExtensionBool can; + internal::gde_interface->variant_can_convert(static_cast<GDExtensionVariantType>(from), static_cast<GDExtensionVariantType>(to)); return PtrToArg<bool>::convert(&can); } bool Variant::can_convert_strict(Variant::Type from, Variant::Type to) { - GDNativeBool can; - internal::gdn_interface->variant_can_convert_strict(static_cast<GDNativeVariantType>(from), static_cast<GDNativeVariantType>(to)); + GDExtensionBool can; + internal::gde_interface->variant_can_convert_strict(static_cast<GDExtensionVariantType>(from), static_cast<GDExtensionVariantType>(to)); return PtrToArg<bool>::convert(&can); } @@ -758,9 +758,9 @@ void Variant::clear() { }; if (unlikely(needs_deinit[get_type()])) { // Make it fast for types that don't need deinit. - internal::gdn_interface->variant_destroy(_native_ptr()); + internal::gde_interface->variant_destroy(_native_ptr()); } - internal::gdn_interface->variant_new_nil(_native_ptr()); + internal::gde_interface->variant_new_nil(_native_ptr()); } } // namespace godot |