From 52dae55c0c65f42caffa9d803be27be44ac4b8a3 Mon Sep 17 00:00:00 2001 From: Sheikh Dawood Abdul Ajees Date: Mon, 12 Feb 2018 15:31:42 -0600 Subject: PhysX 3.4, APEX 1.4 patch release @23576764 --- PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp') diff --git a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp index 2bacfb87..0f79d83b 100644 --- a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp +++ b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp @@ -61,24 +61,26 @@ public: PCMConvexVsMeshContactGenerationCallback( const Ps::aos::FloatVArg contactDistance, const Ps::aos::FloatVArg replaceBreakingThreshold, - const PsTransformV& convexTransform, + const PsTransformV& convexTransform, const PsTransformV& meshTransform, MultiplePersistentContactManifold& multiManifold, ContactBuffer& contactBuffer, const PolygonalData& polyData, SupportLocal* polyMap, - Ps::InlineArray* delayedContacts, + Ps::InlineArray* delayedContacts, const Cm::FastVertex2ShapeScaling& convexScaling, bool idtConvexScale, const Cm::FastVertex2ShapeScaling& meshScaling, const PxU8* extraTriData, bool idtMeshScale, + bool silhouetteEdgesAreActive, const BoxPadded& box, Cm::RenderOutput* renderOutput = NULL ) : PCMMeshContactGenerationCallback(meshScaling, extraTriData, idtMeshScale), - mGeneration(contactDistance, replaceBreakingThreshold, convexTransform, meshTransform, multiManifold, contactBuffer, polyData, polyMap, delayedContacts, convexScaling, idtConvexScale, renderOutput), + mGeneration(contactDistance, replaceBreakingThreshold, convexTransform, meshTransform, multiManifold, contactBuffer, polyData, polyMap, + delayedContacts, convexScaling, idtConvexScale, silhouetteEdgesAreActive, renderOutput), mBox(box) { } @@ -143,7 +145,7 @@ bool Gu::PCMContactConvexMesh(const PolygonalData& polyData, SupportLocal* polyM const PxU8* PX_RESTRICT extraData = meshData->getExtraTrigData(); PCMConvexVsMeshContactGenerationCallback blockCallback( contactDist, replaceBreakingThreshold, convexTransform, meshTransform, multiManifold, contactBuffer, - polyData, polyMap, &delayedContacts, convexScaling, idtConvexScale, meshScaling, extraData, idtMeshScale, + polyData, polyMap, &delayedContacts, convexScaling, idtConvexScale, meshScaling, extraData, idtMeshScale, true, hullOBB, renderOutput); Midphase::intersectOBB(meshData, hullOBB, blockCallback, true); -- cgit v1.2.3