PhysX 3.4, APEX 1.4 patch release @22121272

1 files changed, 4 insertions, 7 deletions

diff --git a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactGenBoxConvex.cpp b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactGenBoxConvex.cpp
index 4937f9b8..de5d3b1b 100644
--- a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactGenBoxConvex.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactGenBoxConvex.cpp
@@ -42,7 +42,6 @@ using namespace physx;
 using namespace Gu;
 using namespace Ps::aos;
 
-
 	//Precompute the convex data
 	//     7+------+6			0 = ---
 	//     /|     /|			1 = +--
@@ -566,7 +565,6 @@ namespace Gu
 		}
 	}
 
-
 	bool generateFullContactManifold(PolygonalData& polyData0, PolygonalData& polyData1, SupportLocal* map0, SupportLocal* map1,  PersistentContact* manifoldContacts, PxU32& numContacts,
 		const FloatVArg contactDist, const Vec3VArg normal, const Vec3VArg closestA, const Vec3VArg closestB, const FloatVArg marginA, const FloatVArg marginB, const bool doOverlapTest, 
 		Cm::RenderOutput* renderOutput, const Ps::aos::FloatVArg toleranceScale)
@@ -659,15 +657,14 @@ EdgeTest:
 		}
 		else
 		{
-			const FloatV eps = FLoad(PCM_WITNESS_POINT_EPS);
-			const FloatV lowerEps = FMul(toleranceScale, FLoad(PCM_WITNESS_POINT_ABSOLUTE_EPS));
+			const FloatV eps = FLoad(PCM_WITNESS_POINT_SCALE);
+			const FloatV lowerEps = FMul(toleranceScale, FLoad(PCM_WITNESS_POINT_LOWER_EPS));
 			const FloatV toleranceA = FMax(FMul(marginA, eps), lowerEps);
 			
 			const FloatV toleranceB = FMax(FMul(marginB, eps), lowerEps);
 
-			//use gjk normal to get the faceIndex(status == GJK_CONTACT)
-			const PxU32 faceIndex1 = getWitnessPolygonIndex(polyData1, map1, V3Neg(normal), closestB, toleranceA);
-			const PxU32 faceIndex0 = getWitnessPolygonIndex(polyData0, map0, transform0To1V.rotateInv(normal), transform0To1V.transformInv(closestA), toleranceB);
+			const PxU32 faceIndex1 = getWitnessPolygonIndex(polyData1, map1, V3Neg(normal), closestB, toleranceB);
+			const PxU32 faceIndex0 = getWitnessPolygonIndex(polyData0, map0, transform0To1V.rotateInv(normal), transform0To1V.transformInv(closestA), toleranceA);
 
 			const HullPolygonData& referencePolygon = polyData1.mPolygons[faceIndex1];
 			const HullPolygonData& incidentPolygon = polyData0.mPolygons[faceIndex0];