fix many warnings

remove btMultiSapBroadphase.*
make collisionFilterGroup/collisionFilterMark int (instead of short int)
This commit is contained in:
Erwin Coumans
2017-01-15 22:26:11 -08:00
parent e3df00d5f1
commit c0c4c8ba3f
146 changed files with 830 additions and 1431 deletions

View File

@@ -118,10 +118,10 @@ public:
:NN3DWalkersTimeWarpBase(helper),
m_Time(0),
m_SpeedupTimestamp(0),
m_motorStrength(0.5f),
m_targetFrequency(3),
m_targetAccumulator(0),
m_evaluationsQty(0),
m_targetFrequency(3),
m_motorStrength(0.5f),
m_evaluationsQty(0),
m_nextReaped(0),
m_timeSeriesCanvas(0)
{
@@ -729,9 +729,9 @@ bool NN3DWalkersExample::detectCollisions()
btManifoldPoint& pt = contactManifold->getContactPoint(j);
if (pt.getDistance()<0.f)
{
const btVector3& ptA = pt.getPositionWorldOnA();
const btVector3& ptB = pt.getPositionWorldOnB();
const btVector3& normalOnB = pt.m_normalWorldOnB;
//const btVector3& ptA = pt.getPositionWorldOnA();
//const btVector3& ptB = pt.getPositionWorldOnB();
//const btVector3& normalOnB = pt.m_normalWorldOnB;
if(!DRAW_INTERPENETRATIONS){
return collisionDetected;