summaryrefslogtreecommitdiff
path: root/core/math/quaternion.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-11-02 22:37:12 +0100
committerRémi Verschelde <rverschelde@gmail.com>2022-11-02 22:37:12 +0100
commit08d56ac2f10f4c9484e253bcfd3a0ad065514080 (patch)
tree0cca6a53f8689e65c6f60e60fc9b1a4720be2f3e /core/math/quaternion.cpp
parent18380817f2da27bfd79079c5730ae68a1d06ed33 (diff)
parent8556fdd4bc1560f03f70df08282b12464a4cdf04 (diff)
Merge pull request #66747 from aaronfranke/move-euler-order
Move EulerOrder enum to math_defs.h and global scope
Diffstat (limited to 'core/math/quaternion.cpp')
-rw-r--r--core/math/quaternion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/quaternion.cpp b/core/math/quaternion.cpp
index 79a4e62b56..42b61f6dfe 100644
--- a/core/math/quaternion.cpp
+++ b/core/math/quaternion.cpp
@@ -44,7 +44,7 @@ real_t Quaternion::angle_to(const Quaternion &p_to) const {
// This implementation uses XYZ convention (Z is the first rotation).
Vector3 Quaternion::get_euler_xyz() const {
Basis m(*this);
- return m.get_euler(Basis::EULER_ORDER_XYZ);
+ return m.get_euler(EulerOrder::XYZ);
}
// get_euler_yxz returns a vector containing the Euler angles in the format
@@ -56,7 +56,7 @@ Vector3 Quaternion::get_euler_yxz() const {
ERR_FAIL_COND_V_MSG(!is_normalized(), Vector3(0, 0, 0), "The quaternion must be normalized.");
#endif
Basis m(*this);
- return m.get_euler(Basis::EULER_ORDER_YXZ);
+ return m.get_euler(EulerOrder::YXZ);
}
void Quaternion::operator*=(const Quaternion &p_q) {