diff options
Diffstat (limited to 'core/helper/math_fieldwise.cpp')
| -rw-r--r-- | core/helper/math_fieldwise.cpp | 90 |
1 files changed, 27 insertions, 63 deletions
diff --git a/core/helper/math_fieldwise.cpp b/core/helper/math_fieldwise.cpp index 72c9c46b7..dea9bf224 100644 --- a/core/helper/math_fieldwise.cpp +++ b/core/helper/math_fieldwise.cpp @@ -31,12 +31,17 @@ #include "core/helper/math_fieldwise.h" -#define SETUP_TYPE(m_type) m_type source=p_source; m_type target=p_target; -#define TRY_TRANSFER_FIELD(m_name,m_member) if (p_field==m_name) { target.m_member=source.m_member; } +#define SETUP_TYPE(m_type) \ + m_type source = p_source; \ + m_type target = p_target; +#define TRY_TRANSFER_FIELD(m_name, m_member) \ + if (p_field == m_name) { \ + target.m_member = source.m_member; \ + } -Variant fieldwise_assign(const Variant& p_target, const Variant& p_source, const String& p_field) { +Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const String &p_field) { - ERR_FAIL_COND_V(p_target.get_type()!=p_source.get_type(),p_target); + ERR_FAIL_COND_V(p_target.get_type() != p_source.get_type(), p_target); switch (p_source.get_type()) { @@ -44,122 +49,81 @@ Variant fieldwise_assign(const Variant& p_target, const Variant& p_source, const SETUP_TYPE(Vector2) - /**/ TRY_TRANSFER_FIELD("x",x) - else TRY_TRANSFER_FIELD("y",y) + /**/ TRY_TRANSFER_FIELD("x", x) else TRY_TRANSFER_FIELD("y", y) - return target; + return target; } case Variant::RECT2: { SETUP_TYPE(Rect2) - /**/ TRY_TRANSFER_FIELD("x",pos.x) - else TRY_TRANSFER_FIELD("y",pos.y) - else TRY_TRANSFER_FIELD("w",size.x) - else TRY_TRANSFER_FIELD("h",size.y) + /**/ TRY_TRANSFER_FIELD("x", pos.x) else TRY_TRANSFER_FIELD("y", pos.y) else TRY_TRANSFER_FIELD("w", size.x) else TRY_TRANSFER_FIELD("h", size.y) - return target; + return target; } case Variant::VECTOR3: { SETUP_TYPE(Vector3) - /**/ TRY_TRANSFER_FIELD("x",x) - else TRY_TRANSFER_FIELD("y",y) - else TRY_TRANSFER_FIELD("z",z) + /**/ TRY_TRANSFER_FIELD("x", x) else TRY_TRANSFER_FIELD("y", y) else TRY_TRANSFER_FIELD("z", z) - return target; + return target; } case Variant::PLANE: { SETUP_TYPE(Plane) - /**/ TRY_TRANSFER_FIELD("x",normal.x) - else TRY_TRANSFER_FIELD("y",normal.y) - else TRY_TRANSFER_FIELD("z",normal.z) - else TRY_TRANSFER_FIELD("d",d) + /**/ TRY_TRANSFER_FIELD("x", normal.x) else TRY_TRANSFER_FIELD("y", normal.y) else TRY_TRANSFER_FIELD("z", normal.z) else TRY_TRANSFER_FIELD("d", d) - return target; + return target; } case Variant::QUAT: { SETUP_TYPE(Quat) - /**/ TRY_TRANSFER_FIELD("x",x) - else TRY_TRANSFER_FIELD("y",y) - else TRY_TRANSFER_FIELD("z",z) - else TRY_TRANSFER_FIELD("w",w) + /**/ TRY_TRANSFER_FIELD("x", x) else TRY_TRANSFER_FIELD("y", y) else TRY_TRANSFER_FIELD("z", z) else TRY_TRANSFER_FIELD("w", w) - return target; + return target; } case Variant::_AABB: { SETUP_TYPE(AABB) - /**/ TRY_TRANSFER_FIELD("px",pos.x) - else TRY_TRANSFER_FIELD("py",pos.y) - else TRY_TRANSFER_FIELD("pz",pos.z) - else TRY_TRANSFER_FIELD("sx",size.x) - else TRY_TRANSFER_FIELD("sy",size.y) - else TRY_TRANSFER_FIELD("sz",size.z) + /**/ TRY_TRANSFER_FIELD("px", pos.x) else TRY_TRANSFER_FIELD("py", pos.y) else TRY_TRANSFER_FIELD("pz", pos.z) else TRY_TRANSFER_FIELD("sx", size.x) else TRY_TRANSFER_FIELD("sy", size.y) else TRY_TRANSFER_FIELD("sz", size.z) - return target; + return target; } case Variant::MATRIX32: { SETUP_TYPE(Matrix32) - /**/ TRY_TRANSFER_FIELD("xx",elements[0][0]) - else TRY_TRANSFER_FIELD("xy",elements[0][1]) - else TRY_TRANSFER_FIELD("yx",elements[1][0]) - else TRY_TRANSFER_FIELD("yy",elements[1][1]) - else TRY_TRANSFER_FIELD("ox",elements[2][0]) - else TRY_TRANSFER_FIELD("oy",elements[2][1]) + /**/ TRY_TRANSFER_FIELD("xx", elements[0][0]) else TRY_TRANSFER_FIELD("xy", elements[0][1]) else TRY_TRANSFER_FIELD("yx", elements[1][0]) else TRY_TRANSFER_FIELD("yy", elements[1][1]) else TRY_TRANSFER_FIELD("ox", elements[2][0]) else TRY_TRANSFER_FIELD("oy", elements[2][1]) - return target; + return target; } case Variant::MATRIX3: { SETUP_TYPE(Matrix3) - /**/ TRY_TRANSFER_FIELD("xx",elements[0][0]) - else TRY_TRANSFER_FIELD("xy",elements[0][1]) - else TRY_TRANSFER_FIELD("xz",elements[0][2]) - else TRY_TRANSFER_FIELD("yx",elements[1][0]) - else TRY_TRANSFER_FIELD("yy",elements[1][1]) - else TRY_TRANSFER_FIELD("yz",elements[1][2]) - else TRY_TRANSFER_FIELD("zx",elements[2][0]) - else TRY_TRANSFER_FIELD("zy",elements[2][1]) - else TRY_TRANSFER_FIELD("zz",elements[2][2]) + /**/ TRY_TRANSFER_FIELD("xx", elements[0][0]) else TRY_TRANSFER_FIELD("xy", elements[0][1]) else TRY_TRANSFER_FIELD("xz", elements[0][2]) else TRY_TRANSFER_FIELD("yx", elements[1][0]) else TRY_TRANSFER_FIELD("yy", elements[1][1]) else TRY_TRANSFER_FIELD("yz", elements[1][2]) else TRY_TRANSFER_FIELD("zx", elements[2][0]) else TRY_TRANSFER_FIELD("zy", elements[2][1]) else TRY_TRANSFER_FIELD("zz", elements[2][2]) - return target; + return target; } case Variant::TRANSFORM: { SETUP_TYPE(Transform) - /**/ TRY_TRANSFER_FIELD("xx",basis.elements[0][0]) - else TRY_TRANSFER_FIELD("xy",basis.elements[0][1]) - else TRY_TRANSFER_FIELD("xz",basis.elements[0][2]) - else TRY_TRANSFER_FIELD("yx",basis.elements[1][0]) - else TRY_TRANSFER_FIELD("yy",basis.elements[1][1]) - else TRY_TRANSFER_FIELD("yz",basis.elements[1][2]) - else TRY_TRANSFER_FIELD("zx",basis.elements[2][0]) - else TRY_TRANSFER_FIELD("zy",basis.elements[2][1]) - else TRY_TRANSFER_FIELD("zz",basis.elements[2][2]) - else TRY_TRANSFER_FIELD("xo",origin.x) - else TRY_TRANSFER_FIELD("yo",origin.y) - else TRY_TRANSFER_FIELD("zo",origin.z) + /**/ TRY_TRANSFER_FIELD("xx", basis.elements[0][0]) else TRY_TRANSFER_FIELD("xy", basis.elements[0][1]) else TRY_TRANSFER_FIELD("xz", basis.elements[0][2]) else TRY_TRANSFER_FIELD("yx", basis.elements[1][0]) else TRY_TRANSFER_FIELD("yy", basis.elements[1][1]) else TRY_TRANSFER_FIELD("yz", basis.elements[1][2]) else TRY_TRANSFER_FIELD("zx", basis.elements[2][0]) else TRY_TRANSFER_FIELD("zy", basis.elements[2][1]) else TRY_TRANSFER_FIELD("zz", basis.elements[2][2]) else TRY_TRANSFER_FIELD("xo", origin.x) else TRY_TRANSFER_FIELD("yo", origin.y) else TRY_TRANSFER_FIELD("zo", origin.z) - return target; + return target; } default: { |