summaryrefslogtreecommitdiffstats
path: root/src/variant/quaternion.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2023-01-18 18:36:21 +0100
committerGitHub <noreply@github.com>2023-01-18 18:36:21 +0100
commitcf3d995e8cb477a09dcbcf59c1cc8410b4b071fe (patch)
treeb50d74112a8f01a3a219c1cce3d5345c939ad632 /src/variant/quaternion.cpp
parent0dfe0d01669d3f281ec02e136676079016c0424c (diff)
parentdbd43ac107ba5fc931aacf94294f247ba2c724af (diff)
downloadredot-cpp-cf3d995e8cb477a09dcbcf59c1cc8410b4b071fe.tar.gz
Merge pull request #997 from asmaloney/fix-shadow-eulerorder
Fix a shadowed enum (EulerOrder)
Diffstat (limited to 'src/variant/quaternion.cpp')
-rw-r--r--src/variant/quaternion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/variant/quaternion.cpp b/src/variant/quaternion.cpp
index 0376dd8..9d4d838 100644
--- a/src/variant/quaternion.cpp
+++ b/src/variant/quaternion.cpp
@@ -46,7 +46,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(EULER_ORDER_XYZ);
}
// get_euler_yxz returns a vector containing the Euler angles in the format
@@ -58,7 +58,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(EULER_ORDER_YXZ);
}
void Quaternion::operator*=(const Quaternion &p_q) {