diff options
author | reduz <reduzio@gmail.com> | 2022-06-25 11:23:24 +0200 |
---|---|---|
committer | reduz <reduzio@gmail.com> | 2022-06-27 13:45:35 +0200 |
commit | 7acf69747921553ba968b0a602f25c44031fc8b4 (patch) | |
tree | 1647a17a99167b1d2a4bd4e41a70bbc9f9c21439 /core/math/basis.cpp | |
parent | c4f0062f15408988e743d65cb98dbb7347c29cf3 (diff) | |
download | redot-engine-7acf69747921553ba968b0a602f25c44031fc8b4.tar.gz |
Fix VECTOR/LOCAL transitions in Node3D
Fixes #62225, supersedes #62227
Diffstat (limited to 'core/math/basis.cpp')
-rw-r--r-- | core/math/basis.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/math/basis.cpp b/core/math/basis.cpp index 65353d8118..ce5e9aa9b3 100644 --- a/core/math/basis.cpp +++ b/core/math/basis.cpp @@ -365,12 +365,12 @@ Basis Basis::rotated_local(const Vector3 &p_axis, real_t p_angle) const { return (*this) * Basis(p_axis, p_angle); } -Basis Basis::rotated(const Vector3 &p_euler) const { - return Basis(p_euler) * (*this); +Basis Basis::rotated(const Vector3 &p_euler, EulerOrder p_order) const { + return Basis::from_euler(p_euler, p_order) * (*this); } -void Basis::rotate(const Vector3 &p_euler) { - *this = rotated(p_euler); +void Basis::rotate(const Vector3 &p_euler, EulerOrder p_order) { + *this = rotated(p_euler, p_order); } Basis Basis::rotated(const Quaternion &p_quaternion) const { @@ -935,9 +935,9 @@ void Basis::set_axis_angle_scale(const Vector3 &p_axis, real_t p_angle, const Ve rotate(p_axis, p_angle); } -void Basis::set_euler_scale(const Vector3 &p_euler, const Vector3 &p_scale) { +void Basis::set_euler_scale(const Vector3 &p_euler, const Vector3 &p_scale, EulerOrder p_order) { _set_diagonal(p_scale); - rotate(p_euler); + rotate(p_euler, p_order); } void Basis::set_quaternion_scale(const Quaternion &p_quaternion, const Vector3 &p_scale) { |