diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-05 08:35:26 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-05 08:35:26 +0200 |
commit | 3a2b0ab73d4cfbed769d46517f1f4832a975a979 (patch) | |
tree | d62a72796aaa2a80e0a70b19d7bafac4d610a2b0 /core/math/math_fieldwise.cpp | |
parent | 132a0e3242a54cd0750769b8f057ae8e0fd58232 (diff) | |
parent | 2cea42cc7faf12ad56b12c113bbb70521264c8e8 (diff) | |
download | redot-engine-3a2b0ab73d4cfbed769d46517f1f4832a975a979.tar.gz |
Merge pull request #66898 from aaronfranke/proj-mat-columns
Rename Projection `matrix` to `columns`
Diffstat (limited to 'core/math/math_fieldwise.cpp')
-rw-r--r-- | core/math/math_fieldwise.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/core/math/math_fieldwise.cpp b/core/math/math_fieldwise.cpp index 726a2aeb97..7b30b9a98c 100644 --- a/core/math/math_fieldwise.cpp +++ b/core/math/math_fieldwise.cpp @@ -215,22 +215,22 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const case Variant::PROJECTION: { SETUP_TYPE(Projection) - /**/ TRY_TRANSFER_FIELD("xx", matrix[0].x) - else TRY_TRANSFER_FIELD("xy", matrix[0].y) - else TRY_TRANSFER_FIELD("xz", matrix[0].z) - else TRY_TRANSFER_FIELD("xw", matrix[0].w) - else TRY_TRANSFER_FIELD("yx", matrix[1].x) - else TRY_TRANSFER_FIELD("yy", matrix[1].y) - else TRY_TRANSFER_FIELD("yz", matrix[1].z) - else TRY_TRANSFER_FIELD("yw", matrix[1].w) - else TRY_TRANSFER_FIELD("zx", matrix[2].x) - else TRY_TRANSFER_FIELD("zy", matrix[2].y) - else TRY_TRANSFER_FIELD("zz", matrix[2].z) - else TRY_TRANSFER_FIELD("zw", matrix[2].w) - else TRY_TRANSFER_FIELD("xo", matrix[3].x) - else TRY_TRANSFER_FIELD("yo", matrix[3].y) - else TRY_TRANSFER_FIELD("zo", matrix[3].z) - else TRY_TRANSFER_FIELD("wo", matrix[3].w) + /**/ 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; } |