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/GeomUtils/src/pcm/GuPCMContactConvexHeightField.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/GeomUtils/src/pcm/GuPCMContactConvexHeightField.cpp')
| -rw-r--r-- | PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexHeightField.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexHeightField.cpp b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexHeightField.cpp index 979d75be..6901a5c3 100644 --- a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexHeightField.cpp +++ b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactConvexHeightField.cpp @@ -62,20 +62,20 @@ public: PCMConvexVsMeshContactGeneration mGeneration; PCMConvexVsHeightfieldContactGenerationCallback( - const Ps::aos::FloatVArg contactDistance, - const Ps::aos::FloatVArg replaceBreakingThreshold, - const Gu::PolygonalData& polyData, - SupportLocal* polyMap, - const Cm::FastVertex2ShapeScaling& convexScaling, - bool idtConvexScale, - const PsTransformV& convexTransform, - const PsTransformV& heightfieldTransform, - const PxTransform& heightfieldTransform1, - Gu::MultiplePersistentContactManifold& multiManifold, - Gu::ContactBuffer& contactBuffer, - Gu::HeightFieldUtil& hfUtil, - Ps::InlineArray<PxU32,LOCAL_CONTACTS_SIZE>& delayedContacts, - Cm::RenderOutput* renderOutput = NULL + const Ps::aos::FloatVArg contactDistance, + const Ps::aos::FloatVArg replaceBreakingThreshold, + const Gu::PolygonalData& polyData, + SupportLocal* polyMap, + const Cm::FastVertex2ShapeScaling& convexScaling, + bool idtConvexScale, + const PsTransformV& convexTransform, + const PsTransformV& heightfieldTransform, + const PxTransform& heightfieldTransform1, + Gu::MultiplePersistentContactManifold& multiManifold, + Gu::ContactBuffer& contactBuffer, + Gu::HeightFieldUtil& hfUtil, + Ps::InlineArray<PxU32,LOCAL_CONTACTS_SIZE>* delayedContacts, + Cm::RenderOutput* renderOutput = NULL ) : PCMHeightfieldContactGenerationCallback< PCMConvexVsHeightfieldContactGenerationCallback >(hfUtil, heightfieldTransform1), @@ -155,7 +155,7 @@ bool Gu::PCMContactConvexHeightfield( multiManifold, contactBuffer, hfUtil, - delayedContacts, + &delayedContacts, renderOutput ); |