PhysX 3.4, APEX 1.4 patch release @22017166

4 files changed, 4 insertions, 38 deletions

diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsContext.h b/PhysX_3.4/Source/LowLevel/software/include/PxsContext.h
index e021b6cb..ed9da75e 100644
--- a/PhysX_3.4/Source/LowLevel/software/include/PxsContext.h
+++ b/PhysX_3.4/Source/LowLevel/software/include/PxsContext.h
@@ -97,38 +97,6 @@ enum PxsTouchEventCount
 };
 
 
-
-class PxsCMUpdateTask : public Cm::Task
-{
-public:
-
-	static const PxU32 BATCH_SIZE = 128;
-
-	PxsCMUpdateTask(PxsContext* context, PxReal dt, PxsContactManager** cmArray, PxsContactManagerOutput* cmOutputs, Gu::Cache* caches, PxU32 cmCount,
-		PxContactModifyCallback* callback):	
-			mCmArray(cmArray), mCmOutputs(cmOutputs), mCaches(caches), mCmCount(cmCount), mDt(dt), mContext(context), mCallback(callback)
-	{
-	}
-
-	virtual void release();
-
-	/*PX_FORCE_INLINE void insert(PxsContactManager* cm)
-	{
-		PX_ASSERT(mCmCount < BATCH_SIZE);
-		mCmArray[mCmCount++]=cm;
-	}*/
-
-protected:	
-	//PxsContactManager*	mCmArray[BATCH_SIZE];
-	PxsContactManager**	mCmArray;
-	PxsContactManagerOutput* mCmOutputs;
-	Gu::Cache* mCaches;
-	PxU32				mCmCount;
-	PxReal				mDt;		//we could probably retrieve from context to save space?
-	PxsContext*			mContext;
-	PxContactModifyCallback* mCallback;
-};
-
 class PxsContext : public Ps::UserAllocated, public PxcNpContext
 {
 												PX_NOCOPY(PxsContext)
diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsNphaseImplementationContext.h b/PhysX_3.4/Source/LowLevel/software/include/PxsNphaseImplementationContext.h
index f39da465..2b36cc23 100644
--- a/PhysX_3.4/Source/LowLevel/software/include/PxsNphaseImplementationContext.h
+++ b/PhysX_3.4/Source/LowLevel/software/include/PxsNphaseImplementationContext.h
@@ -73,6 +73,7 @@ public:
 										mModifyCallback(NULL), mIslandSim(islandSim) {}
 	virtual void				destroy();
 	virtual void				updateContactManager(PxReal dt, bool hasBoundsArrayChanged, bool hasContactDistanceChanged, PxBaseTask* continuation, PxBaseTask* firstPassContinuation);
+	virtual void				postBroadPhaseUpdateContactManager() {}
 	virtual void				secondPassUpdateContactManager(PxReal dt, PxBaseTask* continuation);
 
 	virtual void				registerContactManager(PxsContactManager* cm, PxI32 touching, PxU32 numPatches);
diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxsSimpleIslandManager.h b/PhysX_3.4/Source/LowLevel/software/include/PxsSimpleIslandManager.h
index 8f193f22..69c16906 100644
--- a/PhysX_3.4/Source/LowLevel/software/include/PxsSimpleIslandManager.h
+++ b/PhysX_3.4/Source/LowLevel/software/include/PxsSimpleIslandManager.h
@@ -52,9 +52,7 @@ class ThirdPassTask : public Cm::Task
 
 public:
 
-	ThirdPassTask(SimpleIslandManager& islandManager, IslandSim& islandSim) : mIslandManager(islandManager), mIslandSim(islandSim)
-	{
-	}
+	ThirdPassTask(PxU64 contextID, SimpleIslandManager& islandManager, IslandSim& islandSim);
 
 	virtual void runInternal();
 
@@ -73,9 +71,7 @@ class PostThirdPassTask : public Cm::Task
 
 public:
 
-	PostThirdPassTask(SimpleIslandManager& islandManager) : mIslandManager(islandManager)
-	{
-	}
+	PostThirdPassTask(PxU64 contextID, SimpleIslandManager& islandManager);
 
 	virtual void runInternal();
 
diff --git a/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h b/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h
index f68e3ec1..20abe843 100644
--- a/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h
+++ b/PhysX_3.4/Source/LowLevel/software/include/PxvNphaseImplementationContext.h
@@ -137,6 +137,7 @@ public:
 	virtual ~PxvNphaseImplementationContext() {}
 	virtual void						destroy() = 0;
 	virtual void						updateContactManager(PxReal dt, bool hasBoundsArrayChanged, bool hasContactDistanceChanged, PxBaseTask* continuation, PxBaseTask* firstPassContinuation) = 0;
+	virtual void						postBroadPhaseUpdateContactManager() = 0;
 	virtual void						secondPassUpdateContactManager(PxReal dt, PxBaseTask* continuation) = 0;
 	virtual void						fetchUpdateContactManager() = 0;