diff options
| author | David Snopek <dsnopek@gmail.com> | 2024-06-25 09:42:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-25 09:42:41 -0500 |
| commit | 90c6ea2a126a4238d87b3f9472ca16cf84e76102 (patch) | |
| tree | 3f72d0d337f65d6e58b0e433397371c5d7088902 | |
| parent | c414c2b37d0563456a2fe194b16f8c4aa442e865 (diff) | |
| parent | 78b63203d437c84802a13d558201f78bfefb823f (diff) | |
| download | redot-cpp-90c6ea2a126a4238d87b3f9472ca16cf84e76102.tar.gz | |
Merge pull request #1497 from Naros/fix-variant-hpp-packed-vector4-array
Add missing enum & ctor for PackedVector4Array implementation
| -rw-r--r-- | include/godot_cpp/variant/variant.hpp | 3 | ||||
| -rw-r--r-- | src/variant/variant.cpp | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/include/godot_cpp/variant/variant.hpp b/include/godot_cpp/variant/variant.hpp index 5b09a15..b0d57fb 100644 --- a/include/godot_cpp/variant/variant.hpp +++ b/include/godot_cpp/variant/variant.hpp @@ -100,6 +100,7 @@ public: PACKED_VECTOR2_ARRAY, PACKED_VECTOR3_ARRAY, PACKED_COLOR_ARRAY, + PACKED_VECTOR4_ARRAY, VARIANT_MAX }; @@ -212,6 +213,7 @@ public: Variant(const PackedVector2Array &v); Variant(const PackedVector3Array &v); Variant(const PackedColorArray &v); + Variant(const PackedVector4Array &v); ~Variant(); operator bool() const; @@ -260,6 +262,7 @@ public: operator PackedVector2Array() const; operator PackedVector3Array() const; operator PackedColorArray() const; + operator PackedVector4Array() const; Variant &operator=(const Variant &other); Variant &operator=(Variant &&other); diff --git a/src/variant/variant.cpp b/src/variant/variant.cpp index 161362b..e2ed8ba 100644 --- a/src/variant/variant.cpp +++ b/src/variant/variant.cpp @@ -248,6 +248,10 @@ Variant::Variant(const PackedColorArray &v) { from_type_constructor[PACKED_COLOR_ARRAY](_native_ptr(), v._native_ptr()); } +Variant::Variant(const PackedVector4Array &v) { + from_type_constructor[PACKED_VECTOR4_ARRAY](_native_ptr(), v._native_ptr()); +} + Variant::~Variant() { internal::gdextension_interface_variant_destroy(_native_ptr()); } @@ -506,6 +510,10 @@ Variant::operator PackedColorArray() const { return PackedColorArray(this); } +Variant::operator PackedVector4Array() const { + return PackedVector4Array(this); +} + Variant &Variant::operator=(const Variant &other) { clear(); internal::gdextension_interface_variant_new_copy(_native_ptr(), other._native_ptr()); |