Skip to content

Commit 480e397

Browse files
committed
Added newer Variant types to typed_array.hpp
This is a companion commit to the godot PR godotengine/godot#87992 which fixes godotengine/godot#87991 Also syncs up change from godot to undefine typed array templates after use.
1 parent 36847f6 commit 480e397

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

include/godot_cpp/core/type_info.hpp

+2
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,8 @@ MAKE_TYPED_ARRAY_INFO(Vector<Vector3>, Variant::PACKED_VECTOR3_ARRAY)
395395
MAKE_TYPED_ARRAY_INFO(Vector<Color>, Variant::PACKED_COLOR_ARRAY)
396396
*/
397397

398+
#undef MAKE_TYPED_ARRAY_INFO
399+
398400
#define CLASS_INFO(m_type) (GetTypeInfo<m_type *>::get_class_info())
399401

400402
} // namespace godot

include/godot_cpp/variant/typed_array.hpp

+9
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ class TypedArray : public Array {
7575
} \
7676
};
7777

78+
// All Variant::OBJECT types are intentionally omitted from this list because they are handled by
79+
// the unspecialized TypedArray definition.
7880
MAKE_TYPED_ARRAY(bool, Variant::BOOL)
7981
MAKE_TYPED_ARRAY(uint8_t, Variant::INT)
8082
MAKE_TYPED_ARRAY(int8_t, Variant::INT)
@@ -94,11 +96,14 @@ MAKE_TYPED_ARRAY(Rect2i, Variant::RECT2I)
9496
MAKE_TYPED_ARRAY(Vector3, Variant::VECTOR3)
9597
MAKE_TYPED_ARRAY(Vector3i, Variant::VECTOR3I)
9698
MAKE_TYPED_ARRAY(Transform2D, Variant::TRANSFORM2D)
99+
MAKE_TYPED_ARRAY(Vector4, Variant::VECTOR4)
100+
MAKE_TYPED_ARRAY(Vector4i, Variant::VECTOR4I)
97101
MAKE_TYPED_ARRAY(Plane, Variant::PLANE)
98102
MAKE_TYPED_ARRAY(Quaternion, Variant::QUATERNION)
99103
MAKE_TYPED_ARRAY(AABB, Variant::AABB)
100104
MAKE_TYPED_ARRAY(Basis, Variant::BASIS)
101105
MAKE_TYPED_ARRAY(Transform3D, Variant::TRANSFORM3D)
106+
MAKE_TYPED_ARRAY(Projection, Variant::PROJECTION)
102107
MAKE_TYPED_ARRAY(Color, Variant::COLOR)
103108
MAKE_TYPED_ARRAY(StringName, Variant::STRING_NAME)
104109
MAKE_TYPED_ARRAY(NodePath, Variant::NODE_PATH)
@@ -116,6 +121,10 @@ MAKE_TYPED_ARRAY(PackedStringArray, Variant::PACKED_STRING_ARRAY)
116121
MAKE_TYPED_ARRAY(PackedVector2Array, Variant::PACKED_VECTOR2_ARRAY)
117122
MAKE_TYPED_ARRAY(PackedVector3Array, Variant::PACKED_VECTOR3_ARRAY)
118123
MAKE_TYPED_ARRAY(PackedColorArray, Variant::PACKED_COLOR_ARRAY)
124+
// If the IPAddress struct is added to godot-cpp, the following could also be added:
125+
//MAKE_TYPED_ARRAY(IPAddress, Variant::STRING)
126+
127+
#undef MAKE_TYPED_ARRAY
119128

120129
} // namespace godot
121130

0 commit comments

Comments
 (0)