Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused variables, fix #5161 #5241

Merged
merged 1 commit into from
Jan 11, 2025
Merged

Remove unused variables, fix #5161 #5241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions lib/bullet/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,6 @@ void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool(btDispatcher* dispatcher)
}
}


extern int gOverlappingPairs;
//#include <stdio.h>

template <typename BP_FP_INT_TYPE>
Expand Down Expand Up @@ -696,7 +694,6 @@ void btAxisSweep3Internal<BP_FP_INT_TYPE>::calculateOverlappingPairs(btDispatche
pair.m_pProxy0 = 0;
pair.m_pProxy1 = 0;
m_invalidPair++;
//gOverlappingPairs--;
}

}
Expand Down
2 changes: 0 additions & 2 deletions lib/bullet/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ subject to the following restrictions:
/// btSapBroadphaseArray m_sapBroadphases;

/// btOverlappingPairCache* m_overlappingPairs;
extern int gOverlappingPairs;

/*
class btMultiSapSortedOverlappingPairCache : public btSortedOverlappingPairCache
Expand Down Expand Up @@ -429,7 +428,6 @@ void btMultiSapBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher
pair.m_pProxy0 = 0;
pair.m_pProxy1 = 0;
m_invalidPair++;
gOverlappingPairs--;
}

}
Expand Down
15 changes: 0 additions & 15 deletions lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ subject to the following restrictions:

#include <stdio.h>

//int gOverlappingPairs = 0;

//int gRemovePairs =0;
//int gAddedPairs =0;
//int gFindPairs =0;



Expand Down Expand Up @@ -135,7 +130,6 @@ void btHashedOverlappingPairCache::removeOverlappingPairsContainingProxy(btBroad

btBroadphasePair* btHashedOverlappingPairCache::findPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1)
{
//gFindPairs++;
if(proxy0->m_uniqueId>proxy1->m_uniqueId)
btSwap(proxy0,proxy1);
int proxyId1 = proxy0->getUid();
Expand Down Expand Up @@ -272,7 +266,6 @@ btBroadphasePair* btHashedOverlappingPairCache::internalAddPair(btBroadphaseProx

void* btHashedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* proxy0, btBroadphaseProxy* proxy1,btDispatcher* dispatcher)
{
//gRemovePairs++;
if(proxy0->m_uniqueId>proxy1->m_uniqueId)
btSwap(proxy0,proxy1);
int proxyId1 = proxy0->getUid();
Expand Down Expand Up @@ -387,8 +380,6 @@ void btHashedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback*
if (callback->processOverlap(*pair))
{
removeOverlappingPair(pair->m_pProxy0,pair->m_pProxy1,dispatcher);

//gOverlappingPairs--;
} else
{
i++;
Expand Down Expand Up @@ -436,7 +427,6 @@ void* btSortedOverlappingPairCache::removeOverlappingPair(btBroadphaseProxy* pro
int findIndex = m_overlappingPairArray.findLinearSearch(findPair);
if (findIndex < m_overlappingPairArray.size())
{
//gOverlappingPairs--;
btBroadphasePair& pair = m_overlappingPairArray[findIndex];
void* userData = pair.m_internalInfo1;
cleanOverlappingPair(pair,dispatcher);
Expand Down Expand Up @@ -470,9 +460,6 @@ btBroadphasePair* btSortedOverlappingPairCache::addOverlappingPair(btBroadphaseP
void* mem = &m_overlappingPairArray.expandNonInitializing();
btBroadphasePair* pair = new (mem) btBroadphasePair(*proxy0,*proxy1);

//gOverlappingPairs++;
//gAddedPairs++;

if (m_ghostPairCallback)
m_ghostPairCallback->addOverlappingPair(proxy0, proxy1);
return pair;
Expand Down Expand Up @@ -527,7 +514,6 @@ void btSortedOverlappingPairCache::processAllOverlappingPairs(btOverlapCallback*
pair->m_pProxy1 = 0;
m_overlappingPairArray.swap(i,m_overlappingPairArray.size()-1);
m_overlappingPairArray.pop_back();
//gOverlappingPairs--;
} else
{
i++;
Expand Down Expand Up @@ -560,7 +546,6 @@ void btSortedOverlappingPairCache::cleanOverlappingPair(btBroadphasePair& pair,b
pair.m_algorithm->~btCollisionAlgorithm();
dispatcher->freeCollisionAlgorithm(pair.m_algorithm);
pair.m_algorithm=0;
//gRemovePairs--;
}
}
}
Expand Down
5 changes: 0 additions & 5 deletions lib/bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ struct btOverlapFilterCallback



extern int gRemovePairs;
extern int gAddedPairs;
extern int gFindPairs;

const int BT_NULL_PAIR=0xffffffff;

Expand Down Expand Up @@ -121,8 +118,6 @@ class btHashedOverlappingPairCache : public btOverlappingPairCache
// no new pair is created and the old one is returned.
virtual btBroadphasePair* addOverlappingPair(btBroadphaseProxy* proxy0,btBroadphaseProxy* proxy1)
{
//gAddedPairs++;

if (!needsBroadphaseCollision(proxy0,proxy1))
return 0;

Expand Down
3 changes: 0 additions & 3 deletions lib/bullet/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ subject to the following restrictions:

#include <new>

extern int gOverlappingPairs;

void btSimpleBroadphase::validate()
{
for (int i=0;i<m_numHandles;i++)
Expand Down Expand Up @@ -315,7 +313,6 @@ void btSimpleBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
pair.m_pProxy0 = 0;
pair.m_pProxy1 = 0;
m_invalidPair++;
gOverlappingPairs--;
}

}
Expand Down
Loading