diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-02 22:37:12 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-02 22:37:12 +0100 |
| commit | 08d56ac2f10f4c9484e253bcfd3a0ad065514080 (patch) | |
| tree | 0cca6a53f8689e65c6f60e60fc9b1a4720be2f3e /servers | |
| parent | 18380817f2da27bfd79079c5730ae68a1d06ed33 (diff) | |
| parent | 8556fdd4bc1560f03f70df08282b12464a4cdf04 (diff) | |
Merge pull request #66747 from aaronfranke/move-euler-order
Move EulerOrder enum to math_defs.h and global scope
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics_3d/joints/godot_generic_6dof_joint_3d.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics_3d/joints/godot_generic_6dof_joint_3d.cpp b/servers/physics_3d/joints/godot_generic_6dof_joint_3d.cpp index e0fa940104..dfe2bfa4d3 100644 --- a/servers/physics_3d/joints/godot_generic_6dof_joint_3d.cpp +++ b/servers/physics_3d/joints/godot_generic_6dof_joint_3d.cpp @@ -232,7 +232,7 @@ GodotGeneric6DOFJoint3D::GodotGeneric6DOFJoint3D(GodotBody3D *rbA, GodotBody3D * void GodotGeneric6DOFJoint3D::calculateAngleInfo() { Basis relative_frame = m_calculatedTransformB.basis.inverse() * m_calculatedTransformA.basis; - m_calculatedAxisAngleDiff = relative_frame.get_euler(Basis::EULER_ORDER_XYZ); + m_calculatedAxisAngleDiff = relative_frame.get_euler(EulerOrder::XYZ); // in euler angle mode we do not actually constrain the angular velocity // along the axes axis[0] and axis[2] (although we do use axis[1]) : |