diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-11-20 14:41:07 -0600 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-11-20 15:22:41 -0600 |
| commit | 4bda45ce4e8b509eb0da786a6044006942ac259c (patch) | |
| tree | a51eb808016e1710a4bbd537000a493250602944 /PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp | |
| parent | Update README.md (diff) | |
| parent | PhysX 3.4.1, APEX 1.4.1 Release @23131702 (diff) | |
| download | physx-3.4-4bda45ce4e8b509eb0da786a6044006942ac259c.tar.xz physx-3.4-4bda45ce4e8b509eb0da786a6044006942ac259c.zip | |
Merge branch 'master'
Diffstat (limited to 'PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp')
| -rw-r--r-- | PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp b/PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp index 6a82189d..148ff7d7 100644 --- a/PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp +++ b/PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp @@ -66,13 +66,13 @@ namespace Ext Ps::separateSwingTwist(cA2w.q.getConjugate() * cB2w.q, swing, twist); PX_ASSERT(PxAbs(swing.x)<1e-6f); - Cm::ConeLimitHelper coneHelper(data.tanQZLimit, data.tanQYLimit, data.tanQPad); + const PxReal pad = data.limit.isSoft() ? 0.0f : data.tanQPad; + Cm::ConeLimitHelper coneHelper(data.tanQZLimit, data.tanQYLimit, pad); PxVec3 axis; PxReal error; if(coneHelper.getLimit(swing, axis, error)) ch.angularLimit(cA2w.rotate(axis),error,data.limit); - } ch.prepareLockedAxes(cA2w.q, cB2w.q, cA2w.transformInv(cB2w.p), 7, 0); |