Skip to content

Commit 10c3d1b

Browse files
committed
Fix missing MAKE_TYPED_ARRAY_INFO for Packed*Arrays
1 parent 19c83a8 commit 10c3d1b

File tree

3 files changed

+25
-9
lines changed

3 files changed

+25
-9
lines changed

include/godot_cpp/core/type_info.hpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -397,16 +397,17 @@ MAKE_TYPED_ARRAY_INFO(Callable, Variant::CALLABLE)
397397
MAKE_TYPED_ARRAY_INFO(Signal, Variant::SIGNAL)
398398
MAKE_TYPED_ARRAY_INFO(Dictionary, Variant::DICTIONARY)
399399
MAKE_TYPED_ARRAY_INFO(Array, Variant::ARRAY)
400+
MAKE_TYPED_ARRAY_INFO(PackedByteArray, Variant::PACKED_BYTE_ARRAY)
401+
MAKE_TYPED_ARRAY_INFO(PackedInt32Array, Variant::PACKED_INT32_ARRAY)
402+
MAKE_TYPED_ARRAY_INFO(PackedInt64Array, Variant::PACKED_INT64_ARRAY)
403+
MAKE_TYPED_ARRAY_INFO(PackedFloat32Array, Variant::PACKED_FLOAT32_ARRAY)
404+
MAKE_TYPED_ARRAY_INFO(PackedFloat64Array, Variant::PACKED_FLOAT64_ARRAY)
405+
MAKE_TYPED_ARRAY_INFO(PackedStringArray, Variant::PACKED_STRING_ARRAY)
406+
MAKE_TYPED_ARRAY_INFO(PackedVector2Array, Variant::PACKED_VECTOR2_ARRAY)
407+
MAKE_TYPED_ARRAY_INFO(PackedVector3Array, Variant::PACKED_VECTOR3_ARRAY)
408+
MAKE_TYPED_ARRAY_INFO(PackedVector4Array, Variant::PACKED_VECTOR4_ARRAY)
409+
MAKE_TYPED_ARRAY_INFO(PackedColorArray, Variant::PACKED_COLOR_ARRAY)
400410
/*
401-
MAKE_TYPED_ARRAY_INFO(Vector<uint8_t>, Variant::PACKED_BYTE_ARRAY)
402-
MAKE_TYPED_ARRAY_INFO(Vector<int32_t>, Variant::PACKED_INT32_ARRAY)
403-
MAKE_TYPED_ARRAY_INFO(Vector<int64_t>, Variant::PACKED_INT64_ARRAY)
404-
MAKE_TYPED_ARRAY_INFO(Vector<float>, Variant::PACKED_FLOAT32_ARRAY)
405-
MAKE_TYPED_ARRAY_INFO(Vector<double>, Variant::PACKED_FLOAT64_ARRAY)
406-
MAKE_TYPED_ARRAY_INFO(Vector<String>, Variant::PACKED_STRING_ARRAY)
407-
MAKE_TYPED_ARRAY_INFO(Vector<Vector2>, Variant::PACKED_VECTOR2_ARRAY)
408-
MAKE_TYPED_ARRAY_INFO(Vector<Vector3>, Variant::PACKED_VECTOR3_ARRAY)
409-
MAKE_TYPED_ARRAY_INFO(Vector<Color>, Variant::PACKED_COLOR_ARRAY)
410411
MAKE_TYPED_ARRAY_INFO(IPAddress, Variant::STRING)
411412
*/
412413

test/src/example.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ void Example::_bind_methods() {
204204
ClassDB::bind_method(D_METHOD("test_str_utility"), &Example::test_str_utility);
205205
ClassDB::bind_method(D_METHOD("test_string_is_forty_two"), &Example::test_string_is_forty_two);
206206
ClassDB::bind_method(D_METHOD("test_string_resize"), &Example::test_string_resize);
207+
ClassDB::bind_method(D_METHOD("test_typed_array_of_packed"), &Example::test_typed_array_of_packed);
207208
ClassDB::bind_method(D_METHOD("test_vector_ops"), &Example::test_vector_ops);
208209
ClassDB::bind_method(D_METHOD("test_vector_init_list"), &Example::test_vector_init_list);
209210

@@ -424,6 +425,19 @@ String Example::test_string_resize(String p_string) const {
424425
return p_string;
425426
}
426427

428+
TypedArray<PackedInt32Array> Example::test_typed_array_of_packed() const {
429+
TypedArray<PackedInt32Array> arr;
430+
PackedInt32Array packed_arr1;
431+
packed_arr1.push_back(1);
432+
packed_arr1.push_back(2);
433+
arr.push_back(packed_arr1);
434+
PackedInt32Array packed_arr2;
435+
packed_arr2.push_back(3);
436+
packed_arr2.push_back(4);
437+
arr.push_back(packed_arr2);
438+
return arr;
439+
}
440+
427441
int Example::test_vector_ops() const {
428442
PackedInt32Array arr;
429443
arr.push_back(10);

test/src/example.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ class Example : public Control {
134134
String test_str_utility() const;
135135
bool test_string_is_forty_two(const String &p_str) const;
136136
String test_string_resize(String p_original) const;
137+
TypedArray<PackedInt32Array> test_typed_array_of_packed() const;
137138
int test_vector_ops() const;
138139
int test_vector_init_list() const;
139140

0 commit comments

Comments
 (0)