From 3cc1861221d761b7f0301b9b61de4e1aa18c09f4 Mon Sep 17 00:00:00 2001 From: Sheikh Dawood Abdul Ajees Date: Mon, 20 Nov 2017 11:35:52 -0600 Subject: PhysX 3.4.1, APEX 1.4.1 Release @23131702 --- PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'PhysX_3.4/Source/PhysXExtensions/src/ExtSphericalJointSolverPrep.cpp') 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); -- cgit v1.2.3