summaryrefslogtreecommitdiffstats
path: root/core/math/math_fieldwise.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'core/math/math_fieldwise.cpp')
-rw-r--r--core/math/math_fieldwise.cpp47
1 files changed, 46 insertions, 1 deletions
diff --git a/core/math/math_fieldwise.cpp b/core/math/math_fieldwise.cpp
index 208f89f449..7b30b9a98c 100644
--- a/core/math/math_fieldwise.cpp
+++ b/core/math/math_fieldwise.cpp
@@ -56,6 +56,15 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
return target;
}
+ case Variant::VECTOR2I: {
+ SETUP_TYPE(Vector2i)
+
+ /**/ TRY_TRANSFER_FIELD("x", x)
+ else TRY_TRANSFER_FIELD("y", y)
+
+ return target;
+ }
+
case Variant::RECT2: {
SETUP_TYPE(Rect2)
@@ -67,6 +76,17 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
return target;
}
+ case Variant::RECT2I: {
+ SETUP_TYPE(Rect2i)
+
+ /**/ TRY_TRANSFER_FIELD("x", position.x)
+ else TRY_TRANSFER_FIELD("y", position.y)
+ else TRY_TRANSFER_FIELD("w", size.x)
+ else TRY_TRANSFER_FIELD("h", size.y)
+
+ return target;
+ }
+
case Variant::VECTOR3: {
SETUP_TYPE(Vector3)
@@ -76,6 +96,7 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
return target;
}
+
case Variant::VECTOR3I: {
SETUP_TYPE(Vector3i)
@@ -85,6 +106,7 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
return target;
}
+
case Variant::VECTOR4: {
SETUP_TYPE(Vector4)
@@ -95,6 +117,7 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
return target;
}
+
case Variant::VECTOR4I: {
SETUP_TYPE(Vector4i)
@@ -106,7 +129,6 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
return target;
}
-
case Variant::PLANE: {
SETUP_TYPE(Plane)
@@ -190,6 +212,29 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const
return target;
}
+ case Variant::PROJECTION: {
+ SETUP_TYPE(Projection)
+
+ /**/ TRY_TRANSFER_FIELD("xx", columns[0].x)
+ else TRY_TRANSFER_FIELD("xy", columns[0].y)
+ else TRY_TRANSFER_FIELD("xz", columns[0].z)
+ else TRY_TRANSFER_FIELD("xw", columns[0].w)
+ else TRY_TRANSFER_FIELD("yx", columns[1].x)
+ else TRY_TRANSFER_FIELD("yy", columns[1].y)
+ else TRY_TRANSFER_FIELD("yz", columns[1].z)
+ else TRY_TRANSFER_FIELD("yw", columns[1].w)
+ else TRY_TRANSFER_FIELD("zx", columns[2].x)
+ else TRY_TRANSFER_FIELD("zy", columns[2].y)
+ else TRY_TRANSFER_FIELD("zz", columns[2].z)
+ else TRY_TRANSFER_FIELD("zw", columns[2].w)
+ else TRY_TRANSFER_FIELD("xo", columns[3].x)
+ else TRY_TRANSFER_FIELD("yo", columns[3].y)
+ else TRY_TRANSFER_FIELD("zo", columns[3].z)
+ else TRY_TRANSFER_FIELD("wo", columns[3].w)
+
+ return target;
+ }
+
default: {
ERR_FAIL_V(p_target);
}