summaryrefslogtreecommitdiff
path: root/servers/physics/joints/generic_6dof_joint_sw.cpp
diff options
context:
space:
mode:
authorm4nu3lf <m4nu3lf@gmail.com>2017-09-17 01:48:46 +0100
committerm4nu3lf <m4nu3lf@gmail.com>2017-09-22 20:06:23 +0100
commit0cb8d3ccbf241fb033417643abc304f64b41611d (patch)
treee74dece4ded4d80027abe126497272d14635e014 /servers/physics/joints/generic_6dof_joint_sw.cpp
parentd4452e3a653c9539ea753cb152d82f30b7a9a126 (diff)
Fix wrong index in get_euler_xyz and wrong get_euler in G6DF Joint
Diffstat (limited to 'servers/physics/joints/generic_6dof_joint_sw.cpp')
-rw-r--r--servers/physics/joints/generic_6dof_joint_sw.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics/joints/generic_6dof_joint_sw.cpp b/servers/physics/joints/generic_6dof_joint_sw.cpp
index 551adc7d2e..1e323be36c 100644
--- a/servers/physics/joints/generic_6dof_joint_sw.cpp
+++ b/servers/physics/joints/generic_6dof_joint_sw.cpp
@@ -221,7 +221,7 @@ Generic6DOFJointSW::Generic6DOFJointSW(BodySW *rbA, BodySW *rbB, const Transform
void Generic6DOFJointSW::calculateAngleInfo() {
Basis relative_frame = m_calculatedTransformB.basis.inverse() * m_calculatedTransformA.basis;
- m_calculatedAxisAngleDiff = relative_frame.get_euler();
+ m_calculatedAxisAngleDiff = relative_frame.get_euler_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]) :