diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-11-20 11:35:52 -0600 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-11-20 11:35:52 -0600 |
| commit | 3cc1861221d761b7f0301b9b61de4e1aa18c09f4 (patch) | |
| tree | a51eb808016e1710a4bbd537000a493250602944 /PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp | |
| parent | PhysX 3.4.1, APEX 1.4.1 Release @22845541 (diff) | |
| download | physx-3.4-3cc1861221d761b7f0301b9b61de4e1aa18c09f4.tar.xz physx-3.4-3cc1861221d761b7f0301b9b61de4e1aa18c09f4.zip | |
PhysX 3.4.1, APEX 1.4.1 Release @23131702
Diffstat (limited to 'PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp')
| -rw-r--r-- | PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp index ea12eb4e..2bacfb87 100644 --- a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp +++ b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexMesh.cpp @@ -59,22 +59,22 @@ public: const BoxPadded& mBox; PCMConvexVsMeshContactGenerationCallback( - const Ps::aos::FloatVArg contactDistance, - const Ps::aos::FloatVArg replaceBreakingThreshold, - const PsTransformV& convexTransform, - const PsTransformV& meshTransform, - MultiplePersistentContactManifold& multiManifold, - ContactBuffer& contactBuffer, - const PolygonalData& polyData, - SupportLocal* polyMap, - Ps::InlineArray<PxU32,LOCAL_CONTACTS_SIZE>& delayedContacts, - const Cm::FastVertex2ShapeScaling& convexScaling, - bool idtConvexScale, - const Cm::FastVertex2ShapeScaling& meshScaling, - const PxU8* extraTriData, - bool idtMeshScale, - const BoxPadded& box, - Cm::RenderOutput* renderOutput = NULL + const Ps::aos::FloatVArg contactDistance, + const Ps::aos::FloatVArg replaceBreakingThreshold, + const PsTransformV& convexTransform, + const PsTransformV& meshTransform, + MultiplePersistentContactManifold& multiManifold, + ContactBuffer& contactBuffer, + const PolygonalData& polyData, + SupportLocal* polyMap, + Ps::InlineArray<PxU32,LOCAL_CONTACTS_SIZE>* delayedContacts, + const Cm::FastVertex2ShapeScaling& convexScaling, + bool idtConvexScale, + const Cm::FastVertex2ShapeScaling& meshScaling, + const PxU8* extraTriData, + bool idtMeshScale, + const BoxPadded& box, + Cm::RenderOutput* renderOutput = NULL ) : PCMMeshContactGenerationCallback<PCMConvexVsMeshContactGenerationCallback>(meshScaling, extraTriData, idtMeshScale), @@ -143,7 +143,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, hullOBB, renderOutput); Midphase::intersectOBB(meshData, hullOBB, blockCallback, true); |