diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-25 12:38:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 12:38:58 +0200 |
| commit | 2f221e5fd507b176590bda52d08e499629ce7761 (patch) | |
| tree | c24961857c5e7ccacc3291d22c1e4dabcee3c12b /servers/physics_3d/joints | |
| parent | a0f7f42b842462646281f5c4c9a8db070e034adc (diff) | |
| parent | 3564c16cb851e2c5ae9f75d928e2f501ce5e3d6a (diff) | |
Merge pull request #50250 from luzpaz/typos
Fix various typos
Diffstat (limited to 'servers/physics_3d/joints')
| -rw-r--r-- | servers/physics_3d/joints/generic_6dof_joint_3d_sw.h | 4 | ||||
| -rw-r--r-- | servers/physics_3d/joints/slider_joint_3d_sw.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h b/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h index d46437e782..d0f3dbbd35 100644 --- a/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h +++ b/servers/physics_3d/joints/generic_6dof_joint_3d_sw.h @@ -322,12 +322,12 @@ public: m_angularLimits[2].m_hiLimit = angularUpper.z; } - //! Retrieves the angular limit informacion + //! Retrieves the angular limit information. G6DOFRotationalLimitMotor3DSW *getRotationalLimitMotor(int index) { return &m_angularLimits[index]; } - //! Retrieves the limit informacion + //! Retrieves the limit information. G6DOFTranslationalLimitMotor3DSW *getTranslationalLimitMotor() { return &m_linearLimits; } diff --git a/servers/physics_3d/joints/slider_joint_3d_sw.cpp b/servers/physics_3d/joints/slider_joint_3d_sw.cpp index db9bdb2986..1895fe1e2e 100644 --- a/servers/physics_3d/joints/slider_joint_3d_sw.cpp +++ b/servers/physics_3d/joints/slider_joint_3d_sw.cpp @@ -200,7 +200,7 @@ void SliderJoint3DSW::solve(real_t p_step) { real_t softness = (i) ? m_softnessOrthoLin : (m_solveLinLim ? m_softnessLimLin : m_softnessDirLin); real_t restitution = (i) ? m_restitutionOrthoLin : (m_solveLinLim ? m_restitutionLimLin : m_restitutionDirLin); real_t damping = (i) ? m_dampingOrthoLin : (m_solveLinLim ? m_dampingLimLin : m_dampingDirLin); - // calcutate and apply impulse + // Calculate and apply impulse. real_t normalImpulse = softness * (restitution * depth / p_step - damping * rel_vel) * m_jacLinDiagABInv[i]; Vector3 impulse_vector = normal * normalImpulse; if (dynamic_A) { |