Sara.Sync
/
godot-cpp
mirror of https://github.com/godotengine/godot-cpp
0
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1483 from AThousandShips/arr_typed_fix 

Fix sharing of typed arrays from constructor
pull/1519/head
David Snopek 2024-06-28 07:26:44 -05:00 committed by GitHub
parent 53b546e1df 41aa71f8c3
commit 99926d8e20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/godot_cpp/variant/typed_array.hpp
View File

@ -44,10 +44,15 @@ public:
_ref(p_array); _ref(p_array);
} }
_FORCE_INLINE_ TypedArray(const Variant &p_variant) : _FORCE_INLINE_ TypedArray(const Variant &p_variant) :
Array(p_variant.operator Array(), Variant::OBJECT, T::get_class_static(), Variant()) { TypedArray(Array(p_variant)) {
} }
_FORCE_INLINE_ TypedArray(const Array &p_array) : _FORCE_INLINE_ TypedArray(const Array &p_array) {
Array(p_array, Variant::OBJECT, T::get_class_static(), Variant()) { set_typed(Variant::OBJECT, T::get_class_static(), Variant());
if (is_same_typed(p_array)) {
_ref(p_array);
} else {
assign(p_array);
}
} }
_FORCE_INLINE_ TypedArray() { _FORCE_INLINE_ TypedArray() {
set_typed(Variant::OBJECT, T::get_class_static(), Variant()); set_typed(Variant::OBJECT, T::get_class_static(), Variant());
@ -65,10 +70,15 @@ public:
_ref(p_array); \ _ref(p_array); \
} \ } \
_FORCE_INLINE_ TypedArray(const Variant &p_variant) : \ _FORCE_INLINE_ TypedArray(const Variant &p_variant) : \
Array(p_variant.operator Array(), m_variant_type, StringName(), Variant()) { \ TypedArray(Array(p_variant)) { \
} \ } \
_FORCE_INLINE_ TypedArray(const Array &p_array) : \ _FORCE_INLINE_ TypedArray(const Array &p_array) { \
Array(p_array, m_variant_type, StringName(), Variant()) { \ set_typed(m_variant_type, StringName(), Variant()); \
if (is_same_typed(p_array)) { \
_ref(p_array); \
} else { \
assign(p_array); \
} \
} \ } \
_FORCE_INLINE_ TypedArray() { \ _FORCE_INLINE_ TypedArray() { \
set_typed(m_variant_type, StringName(), Variant()); \ set_typed(m_variant_type, StringName(), Variant()); \