[4.2] Fix missing MAKE_TYPED_ARRAY_INFO for Packed*Arrays
(cherry picked from commit a0d56336c3
)
pull/1572/head
parent
76c0a4b4ae
commit
592a7762cd
|
@ -393,17 +393,15 @@ MAKE_TYPED_ARRAY_INFO(Callable, Variant::CALLABLE)
|
||||||
MAKE_TYPED_ARRAY_INFO(Signal, Variant::SIGNAL)
|
MAKE_TYPED_ARRAY_INFO(Signal, Variant::SIGNAL)
|
||||||
MAKE_TYPED_ARRAY_INFO(Dictionary, Variant::DICTIONARY)
|
MAKE_TYPED_ARRAY_INFO(Dictionary, Variant::DICTIONARY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Array, Variant::ARRAY)
|
MAKE_TYPED_ARRAY_INFO(Array, Variant::ARRAY)
|
||||||
/*
|
MAKE_TYPED_ARRAY_INFO(PackedByteArray, Variant::PACKED_BYTE_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<uint8_t>, Variant::PACKED_BYTE_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedInt32Array, Variant::PACKED_INT32_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<int32_t>, Variant::PACKED_INT32_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedInt64Array, Variant::PACKED_INT64_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<int64_t>, Variant::PACKED_INT64_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedFloat32Array, Variant::PACKED_FLOAT32_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<float>, Variant::PACKED_FLOAT32_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedFloat64Array, Variant::PACKED_FLOAT64_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<double>, Variant::PACKED_FLOAT64_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedStringArray, Variant::PACKED_STRING_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<String>, Variant::PACKED_STRING_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedVector2Array, Variant::PACKED_VECTOR2_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<Vector2>, Variant::PACKED_VECTOR2_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedVector3Array, Variant::PACKED_VECTOR3_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<Vector3>, Variant::PACKED_VECTOR3_ARRAY)
|
MAKE_TYPED_ARRAY_INFO(PackedColorArray, Variant::PACKED_COLOR_ARRAY)
|
||||||
MAKE_TYPED_ARRAY_INFO(Vector<Color>, Variant::PACKED_COLOR_ARRAY)
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define CLASS_INFO(m_type) (GetTypeInfo<m_type *>::get_class_info())
|
#define CLASS_INFO(m_type) (GetTypeInfo<m_type *>::get_class_info())
|
||||||
|
|
||||||
|
|
|
@ -147,6 +147,7 @@ void Example::_bind_methods() {
|
||||||
ClassDB::bind_method(D_METHOD("test_string_ops"), &Example::test_string_ops);
|
ClassDB::bind_method(D_METHOD("test_string_ops"), &Example::test_string_ops);
|
||||||
ClassDB::bind_method(D_METHOD("test_str_utility"), &Example::test_str_utility);
|
ClassDB::bind_method(D_METHOD("test_str_utility"), &Example::test_str_utility);
|
||||||
ClassDB::bind_method(D_METHOD("test_string_is_forty_two"), &Example::test_string_is_forty_two);
|
ClassDB::bind_method(D_METHOD("test_string_is_forty_two"), &Example::test_string_is_forty_two);
|
||||||
|
ClassDB::bind_method(D_METHOD("test_typed_array_of_packed"), &Example::test_typed_array_of_packed);
|
||||||
ClassDB::bind_method(D_METHOD("test_vector_ops"), &Example::test_vector_ops);
|
ClassDB::bind_method(D_METHOD("test_vector_ops"), &Example::test_vector_ops);
|
||||||
ClassDB::bind_method(D_METHOD("test_vector_init_list"), &Example::test_vector_init_list);
|
ClassDB::bind_method(D_METHOD("test_vector_init_list"), &Example::test_vector_init_list);
|
||||||
|
|
||||||
|
@ -327,6 +328,19 @@ bool Example::test_string_is_forty_two(const String &p_string) const {
|
||||||
return strcmp(p_string.utf8().ptr(), "forty two") == 0;
|
return strcmp(p_string.utf8().ptr(), "forty two") == 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TypedArray<PackedInt32Array> Example::test_typed_array_of_packed() const {
|
||||||
|
TypedArray<PackedInt32Array> arr;
|
||||||
|
PackedInt32Array packed_arr1;
|
||||||
|
packed_arr1.push_back(1);
|
||||||
|
packed_arr1.push_back(2);
|
||||||
|
arr.push_back(packed_arr1);
|
||||||
|
PackedInt32Array packed_arr2;
|
||||||
|
packed_arr2.push_back(3);
|
||||||
|
packed_arr2.push_back(4);
|
||||||
|
arr.push_back(packed_arr2);
|
||||||
|
return arr;
|
||||||
|
}
|
||||||
|
|
||||||
int Example::test_vector_ops() const {
|
int Example::test_vector_ops() const {
|
||||||
PackedInt32Array arr;
|
PackedInt32Array arr;
|
||||||
arr.push_back(10);
|
arr.push_back(10);
|
||||||
|
|
|
@ -126,6 +126,7 @@ public:
|
||||||
String test_string_ops() const;
|
String test_string_ops() const;
|
||||||
String test_str_utility() const;
|
String test_str_utility() const;
|
||||||
bool test_string_is_forty_two(const String &p_str) const;
|
bool test_string_is_forty_two(const String &p_str) const;
|
||||||
|
TypedArray<PackedInt32Array> test_typed_array_of_packed() const;
|
||||||
int test_vector_ops() const;
|
int test_vector_ops() const;
|
||||||
int test_vector_init_list() const;
|
int test_vector_init_list() const;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue