mrq/reactphysics3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better optimization to allocate correct amount of memory for potential manifolds and contact points

Browse Source
This commit is contained in:
Daniel Chappuis 2020-09-26 14:55:22 +02:00
parent 71f7980fdf
commit fa722c129d
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/reactphysics3d/systems/CollisionDetectionSystem.h
View File

@ -162,6 +162,12 @@ class CollisionDetectionSystem {
/// Array with the indices of all the contact pairs that have at least one CollisionBody /// Array with the indices of all the contact pairs that have at least one CollisionBody
Array<uint32> mCollisionBodyContactPairsIndices; Array<uint32> mCollisionBodyContactPairsIndices;
/// Number of potential contact manifolds in the previous frame
uint32 mNbPreviousPotentialContactManifolds;
/// Number of potential contact points in the previous frame
uint32 mNbPreviousPotentialContactPoints;
#ifdef IS_RP3D_PROFILING_ENABLED #ifdef IS_RP3D_PROFILING_ENABLED
/// Pointer to the profiler /// Pointer to the profiler

10
src/systems/CollisionDetectionSystem.cpp
View File

@ -67,7 +67,8 @@ CollisionDetectionSystem::CollisionDetectionSystem(PhysicsWorld* world, Collider
mContactManifolds1(mMemoryManager.getPoolAllocator()), mContactManifolds2(mMemoryManager.getPoolAllocator()), mContactManifolds1(mMemoryManager.getPoolAllocator()), mContactManifolds2(mMemoryManager.getPoolAllocator()),
mPreviousContactManifolds(&mContactManifolds1), mCurrentContactManifolds(&mContactManifolds2), mPreviousContactManifolds(&mContactManifolds1), mCurrentContactManifolds(&mContactManifolds2),
mContactPoints1(mMemoryManager.getPoolAllocator()), mContactPoints2(mMemoryManager.getPoolAllocator()), mContactPoints1(mMemoryManager.getPoolAllocator()), mContactPoints2(mMemoryManager.getPoolAllocator()),
mPreviousContactPoints(&mContactPoints1), mCurrentContactPoints(&mContactPoints2), mCollisionBodyContactPairsIndices(mMemoryManager.getSingleFrameAllocator()) { mPreviousContactPoints(&mContactPoints1), mCurrentContactPoints(&mContactPoints2), mCollisionBodyContactPairsIndices(mMemoryManager.getSingleFrameAllocator()),
mNbPreviousPotentialContactManifolds(0), mNbPreviousPotentialContactPoints(0) {
#ifdef IS_RP3D_PROFILING_ENABLED #ifdef IS_RP3D_PROFILING_ENABLED
@ -595,8 +596,8 @@ void CollisionDetectionSystem::computeNarrowPhase() {
// Swap the previous and current contacts arrays // Swap the previous and current contacts arrays
swapPreviousAndCurrentContacts(); swapPreviousAndCurrentContacts();
mPotentialContactManifolds.reserve(mPreviousContactManifolds->size()); mPotentialContactManifolds.reserve(mNbPreviousPotentialContactManifolds);
mPotentialContactPoints.reserve(mPreviousContactPoints->size()); mPotentialContactPoints.reserve(mNbPreviousPotentialContactPoints);
// Test the narrow-phase collision detection on the batches to be tested // Test the narrow-phase collision detection on the batches to be tested
testNarrowPhaseCollision(mNarrowPhaseInput, true, allocator); testNarrowPhaseCollision(mNarrowPhaseInput, true, allocator);
@ -879,6 +880,9 @@ void CollisionDetectionSystem::createContacts() {
mPreviousContactManifolds->clear(); mPreviousContactManifolds->clear();
mPreviousContactPairs->clear(); mPreviousContactPairs->clear();
mNbPreviousPotentialContactManifolds = mPotentialContactManifolds.capacity();
mNbPreviousPotentialContactPoints = mPotentialContactPoints.capacity();
// Reset the potential contacts // Reset the potential contacts
mPotentialContactPoints.clear(true); mPotentialContactPoints.clear(true);
mPotentialContactManifolds.clear(true); mPotentialContactManifolds.clear(true);