mewin/godot-cpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #997 from asmaloney/fix-shadow-eulerorder

Browse Source 
Fix a shadowed enum (EulerOrder)
This commit is contained in:
Rémi Verschelde
2023-01-18 18:36:21 +01:00
committed by GitHub
parent 0dfe0d0166 dbd43ac107
commit cf3d995e8c
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/variant/quaternion.cpp
View File

@@ -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) {