diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-05 13:32:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-05 13:32:08 +0200 |
| commit | 6f7d45d2109246e3888fc2b16136915e6fec89fd (patch) | |
| tree | ce03eee0b483c299863927e7c75390dead4d9540 /servers/physics_3d | |
| parent | 537d8899e9cb97b2ba0b154496dcdd295163c4bd (diff) | |
| parent | 8acd13a456050ded00f0f264ff0aa91a304f6c54 (diff) | |
Merge pull request #45364 from madmiraal/rename-quat
Rename Quat to Quaternion
Diffstat (limited to 'servers/physics_3d')
| -rw-r--r-- | servers/physics_3d/joints/cone_twist_joint_3d_sw.cpp | 2 | ||||
| -rw-r--r-- | servers/physics_3d/joints/hinge_joint_3d_sw.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/servers/physics_3d/joints/cone_twist_joint_3d_sw.cpp b/servers/physics_3d/joints/cone_twist_joint_3d_sw.cpp index 04d1a60dd6..7315e9c709 100644 --- a/servers/physics_3d/joints/cone_twist_joint_3d_sw.cpp +++ b/servers/physics_3d/joints/cone_twist_joint_3d_sw.cpp @@ -211,7 +211,7 @@ bool ConeTwistJoint3DSW::setup(real_t p_timestep) { // Twist limits if (m_twistSpan >= real_t(0.)) { Vector3 b2Axis22 = B->get_transform().basis.xform(this->m_rbBFrame.basis.get_axis(1)); - Quat rotationArc = Quat(b2Axis1, b1Axis1); + Quaternion rotationArc = Quaternion(b2Axis1, b1Axis1); Vector3 TwistRef = rotationArc.xform(b2Axis22); real_t twist = atan2fast(TwistRef.dot(b1Axis3), TwistRef.dot(b1Axis2)); diff --git a/servers/physics_3d/joints/hinge_joint_3d_sw.cpp b/servers/physics_3d/joints/hinge_joint_3d_sw.cpp index 1166930830..b928f18231 100644 --- a/servers/physics_3d/joints/hinge_joint_3d_sw.cpp +++ b/servers/physics_3d/joints/hinge_joint_3d_sw.cpp @@ -126,7 +126,7 @@ HingeJoint3DSW::HingeJoint3DSW(Body3DSW *rbA, Body3DSW *rbB, const Vector3 &pivo rbAxisA1.y, rbAxisA2.y, axisInA.y, rbAxisA1.z, rbAxisA2.z, axisInA.z); - Quat rotationArc = Quat(axisInA, axisInB); + Quaternion rotationArc = Quaternion(axisInA, axisInB); Vector3 rbAxisB1 = rotationArc.xform(rbAxisA1); Vector3 rbAxisB2 = axisInB.cross(rbAxisB1); |