diff options
| author | Sheikh Dawood <[email protected]> | 2018-05-25 09:54:38 -0500 |
|---|---|---|
| committer | Sheikh Dawood <[email protected]> | 2018-05-25 09:54:38 -0500 |
| commit | b99b3783cd7e3fb1bb0a07dc472b2fc000c4cdc1 (patch) | |
| tree | de67d7adc7cc66d44c3e0a399d94d1db6bcebd0c /PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.h | |
| parent | PhysX 3.4, APEX 1.4 patch release @23933511 (diff) | |
| download | physx-3.4-b99b3783cd7e3fb1bb0a07dc472b2fc000c4cdc1.tar.xz physx-3.4-b99b3783cd7e3fb1bb0a07dc472b2fc000c4cdc1.zip | |
PhysX 3.4, APEX 1.4 patch release @24214033v3.4.2
Diffstat (limited to 'PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.h')
| -rw-r--r-- | PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.h b/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.h index 465599cc..eb302c2e 100644 --- a/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.h +++ b/PhysX_3.4/Source/LowLevelAABB/src/BpBroadPhaseMBP.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -33,7 +33,6 @@ #include "CmPhysXCommon.h" #include "BpBroadPhase.h" #include "BpBroadPhaseMBPCommon.h" -#include "PsUserAllocated.h" #include "BpMBPTasks.h" class MBP; @@ -69,7 +68,7 @@ namespace Bp // BroadPhase virtual PxBroadPhaseType::Enum getType() const { return PxBroadPhaseType::eMBP; } - virtual void destroy(); + virtual void destroy() { delete this; } virtual void update(const PxU32 numCpuTasks, PxcScratchAllocator* scratchAllocator, const BroadPhaseUpdateData& updateData, physx::PxBaseTask* continuation, physx::PxBaseTask* narrowPhaseUnblockTask); virtual void fetchBroadPhaseResults(physx::PxBaseTask*) {} @@ -88,9 +87,7 @@ namespace Bp #endif virtual BroadPhasePair* getBroadPhasePairs() const {return NULL;} //KS - TODO - implement this!!! - virtual void deletePairs(){} //KS - TODO - implement this!!! - //~BroadPhase MBPUpdateWorkTask mMBPUpdateWorkTask; @@ -103,8 +100,10 @@ namespace Bp Ps::Array<BroadPhasePair> mCreated; Ps::Array<BroadPhasePair> mDeleted; - const BpHandle* mGroups; // ### why are those 'handles'? - + const Bp::FilterGroup::Enum*mGroups; +#ifdef BP_FILTERING_USES_TYPE_IN_GROUP + const bool* mLUT; +#endif void setUpdateData(const BroadPhaseUpdateData& updateData); void addObjects(const BroadPhaseUpdateData& updateData); void removeObjects(const BroadPhaseUpdateData& updateData); |