Skip to content

Commit b3ae8a2

Browse files
committed
Add support for PackedVector4Array
1 parent e93e0c8 commit b3ae8a2

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

src/luaopen/variant.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ extern "C" int luaopen_godot_variant(lua_State *L) {
273273
state.set("PackedVector2Array", VariantType(Variant::PACKED_VECTOR2_ARRAY));
274274
state.set("PackedVector3Array", VariantType(Variant::PACKED_VECTOR3_ARRAY));
275275
state.set("PackedColorArray", VariantType(Variant::PACKED_COLOR_ARRAY));
276+
state.set("PackedVector4Array", VariantType(Variant::PACKED_VECTOR4_ARRAY));
276277

277278
return 0;
278279
}

src/utils/IndexedIterator.cpp

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
namespace luagdextension {
2727

2828
IndexedIterator::IndexedIterator(const Variant& variant)
29-
: variant(variant), index(-1) {}
29+
: variant(variant)
30+
, index(-1)
31+
{
32+
}
3033

3134
std::tuple<sol::object, sol::object> IndexedIterator::iter_next_lua(sol::this_state state) {
3235
index++;
@@ -42,18 +45,19 @@ std::tuple<sol::object, sol::object> IndexedIterator::iter_next_lua(sol::this_st
4245

4346
bool IndexedIterator::supports_indexed_pairs(const Variant& variant) {
4447
switch (variant.get_type()) {
45-
case godot::Variant::ARRAY:
46-
case godot::Variant::PACKED_BYTE_ARRAY:
47-
case godot::Variant::PACKED_INT32_ARRAY:
48-
case godot::Variant::PACKED_INT64_ARRAY:
49-
case godot::Variant::PACKED_FLOAT32_ARRAY:
50-
case godot::Variant::PACKED_FLOAT64_ARRAY:
51-
case godot::Variant::PACKED_STRING_ARRAY:
52-
case godot::Variant::PACKED_VECTOR2_ARRAY:
53-
case godot::Variant::PACKED_VECTOR3_ARRAY:
54-
case godot::Variant::PACKED_COLOR_ARRAY:
55-
case godot::Variant::VARIANT_MAX:
48+
case Variant::ARRAY:
49+
case Variant::PACKED_BYTE_ARRAY:
50+
case Variant::PACKED_INT32_ARRAY:
51+
case Variant::PACKED_INT64_ARRAY:
52+
case Variant::PACKED_FLOAT32_ARRAY:
53+
case Variant::PACKED_FLOAT64_ARRAY:
54+
case Variant::PACKED_STRING_ARRAY:
55+
case Variant::PACKED_VECTOR2_ARRAY:
56+
case Variant::PACKED_VECTOR3_ARRAY:
57+
case Variant::PACKED_COLOR_ARRAY:
58+
case Variant::PACKED_VECTOR4_ARRAY:
5659
return true;
60+
5761
default:
5862
break;
5963
}

0 commit comments

Comments
 (0)