diff options
| author | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
|---|---|---|
| committer | Sheikh Dawood Abdul Ajees <[email protected]> | 2017-04-25 16:02:08 -0500 |
| commit | d11708e398c2f6377d9eac2b1f7248c62faab569 (patch) | |
| tree | 5778e794690c046ab4b0205d8f764960a5af168b /PhysX_3.4/Source/LowLevelAABB/include | |
| parent | PhysX 3.4, APEX 1.4 patch release @21821222 (diff) | |
| download | physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.tar.xz physx-3.4-d11708e398c2f6377d9eac2b1f7248c62faab569.zip | |
PhysX 3.4, APEX 1.4 patch release @22017166
Diffstat (limited to 'PhysX_3.4/Source/LowLevelAABB/include')
3 files changed, 13 insertions, 4 deletions
diff --git a/PhysX_3.4/Source/LowLevelAABB/include/BpAABBManagerTasks.h b/PhysX_3.4/Source/LowLevelAABB/include/BpAABBManagerTasks.h index 7269b821..829b9ef1 100644 --- a/PhysX_3.4/Source/LowLevelAABB/include/BpAABBManagerTasks.h +++ b/PhysX_3.4/Source/LowLevelAABB/include/BpAABBManagerTasks.h @@ -44,7 +44,8 @@ namespace Bp class AggregateBoundsComputationTask : public Cm::Task, public shdfnd::UserAllocated { public: - AggregateBoundsComputationTask() : + AggregateBoundsComputationTask(PxU64 contextId) : + Cm::Task (contextId), mManager (NULL), mStart (0), mNbToGo (0), @@ -74,7 +75,8 @@ namespace Bp class FinalizeUpdateTask : public Cm::Task, public shdfnd::UserAllocated { public: - FinalizeUpdateTask() : + FinalizeUpdateTask(PxU64 contextId) : + Cm::Task (contextId), mManager (NULL), mNumCpuTasks (0), mScratchAllocator (NULL), diff --git a/PhysX_3.4/Source/LowLevelAABB/include/BpBroadPhase.h b/PhysX_3.4/Source/LowLevelAABB/include/BpBroadPhase.h index 2227d744..f30b41d0 100644 --- a/PhysX_3.4/Source/LowLevelAABB/include/BpBroadPhase.h +++ b/PhysX_3.4/Source/LowLevelAABB/include/BpBroadPhase.h @@ -268,6 +268,11 @@ public: virtual void update(const PxU32 numCpuTasks, PxcScratchAllocator* scratchAllocator, const BroadPhaseUpdateData& updateData, physx::PxBaseTask* continuation, physx::PxBaseTask* nPhaseUnlockTask) = 0; + /** + \brief Fetch the results of any asynchronous broad phase work. + */ + virtual void fetchBroadPhaseResults(physx::PxBaseTask* nPhaseUnlockTask) = 0; + /* \brief Return the number of created aabb overlap pairs computed in the execution of update() that has just completed. */ diff --git a/PhysX_3.4/Source/LowLevelAABB/include/BpSimpleAABBManager.h b/PhysX_3.4/Source/LowLevelAABB/include/BpSimpleAABBManager.h index db8b5c79..f3e02835 100644 --- a/PhysX_3.4/Source/LowLevelAABB/include/BpSimpleAABBManager.h +++ b/PhysX_3.4/Source/LowLevelAABB/include/BpSimpleAABBManager.h @@ -404,11 +404,13 @@ namespace Bp PX_FORCE_INLINE void* getUserData(const BoundsIndex index) const { if (index < mVolumeData.size()) return mVolumeData[index].getUserData(); return NULL; } PX_FORCE_INLINE PxU64 getContextId() const { return mContextID; } + void postBroadPhase(PxBaseTask*, PxBaseTask* narrowPhaseUnlockTask); + private: void reserveShapeSpace(PxU32 nbShapes); - void postBroadPhase(PxBaseTask*); + - Cm::DelegateTask<SimpleAABBManager, &SimpleAABBManager::postBroadPhase> mPostBroadPhase; + //Cm::DelegateTask<SimpleAABBManager, &SimpleAABBManager::postBroadPhase> mPostBroadPhase; FinalizeUpdateTask mFinalizeUpdateTask; |