PhysX 3.4.1, APEX 1.4.1 Release @23131702

1 files changed, 16 insertions, 13 deletions

diff --git a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactCapsuleMesh.cpp b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactCapsuleMesh.cpp
index e19063ca..0d5dc68a 100644
--- a/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactCapsuleMesh.cpp
+++ b/PhysX_3.4/Source/GeomUtils/src/pcm/GuPCMContactCapsuleMesh.cpp
@@ -59,20 +59,22 @@ public:
 	PCMCapsuleVsMeshContactGeneration		mGeneration;
 
 	PCMCapsuleVsMeshContactGenerationCallback(
-		const CapsuleV&				capsule,
-		const Ps::aos::FloatVArg	contactDist,
-		const Ps::aos::FloatVArg	replaceBreakingThreshold,
-		const PsTransformV&			sphereTransform,
-		const PsTransformV&			meshTransform,
-		MultiplePersistentContactManifold& multiManifold,
-		ContactBuffer&				contactBuffer,
-		const PxU8*					extraTriData,
-		const Cm::FastVertex2ShapeScaling& meshScaling,
-		bool						idtMeshScale,
-		Cm::RenderOutput*			renderOutput = NULL
+		const CapsuleV&									capsule,
+		const Ps::aos::FloatVArg						contactDist,
+		const Ps::aos::FloatVArg						replaceBreakingThreshold,
+		const PsTransformV&								sphereTransform,
+		const PsTransformV&								meshTransform,
+		MultiplePersistentContactManifold&				multiManifold,
+		ContactBuffer&									contactBuffer,
+		const PxU8*										extraTriData,
+		const Cm::FastVertex2ShapeScaling&				meshScaling,
+		bool											idtMeshScale,
+		Ps::InlineArray<PxU32, LOCAL_CONTACTS_SIZE>*	deferredContacts,
+		Cm::RenderOutput*								renderOutput = NULL
 	) :
 		PCMMeshContactGenerationCallback<PCMCapsuleVsMeshContactGenerationCallback>(meshScaling, extraTriData, idtMeshScale),
-		mGeneration(capsule, contactDist, replaceBreakingThreshold, sphereTransform, meshTransform, multiManifold, contactBuffer, renderOutput)
+		mGeneration(capsule, contactDist, replaceBreakingThreshold, sphereTransform, meshTransform, multiManifold, contactBuffer, 
+			deferredContacts, renderOutput)
 	{
 	}
 
@@ -150,6 +152,7 @@ bool Gu::pcmContactCapsuleMesh(GU_CONTACT_METHOD_ARGS)
 			extraData,
 			meshScaling,
 			idtMeshScale,
+			NULL,
 			renderOutput);
 
 		//bound the capsule in shape space by an OBB:
@@ -163,7 +166,7 @@ bool Gu::pcmContactCapsuleMesh(GU_CONTACT_METHOD_ARGS)
 		Midphase::intersectOBB(meshData, queryBox, callback, true);
 
 		callback.flushCache();
-
+	
 		callback.mGeneration.processContacts(GU_CAPSULE_MANIFOLD_CACHE_SIZE, false);
 	}
 	else