Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor fixes in BulletMultiThreaded: SpuCollisionTaskProcess had a memory leak and warnings in btParallelConstraintSolver

Browse Source
This commit is contained in:
erwin.coumans
2010-08-18 01:33:06 +00:00
parent 844a54a409
commit f89ddcc86e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp
View File

@@ -44,7 +44,6 @@ void SpuCollisionTaskProcess::setNumTasks(int maxNumTasks)
} }
m_workUnitTaskBuffers = (unsigned char *)btAlignedAlloc(MIDPHASE_WORKUNIT_TASK_SIZE*m_maxNumOutstandingTasks, 128); m_workUnitTaskBuffers = (unsigned char *)btAlignedAlloc(MIDPHASE_WORKUNIT_TASK_SIZE*m_maxNumOutstandingTasks, 128);
m_workUnitTaskBuffers = (unsigned char *)btAlignedAlloc(MIDPHASE_WORKUNIT_TASK_SIZE*6, 128);
} }
} }

7
src/BulletMultiThreaded/btParallelConstraintSolver.cpp
View File

@@ -981,13 +981,14 @@ btParallelConstraintSolver::~btParallelConstraintSolver()
btScalar btParallelConstraintSolver::solveGroup(btCollisionObject** bodies1,int numRigidBodies,btPersistentManifold** manifoldPtr,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc,btDispatcher* dispatcher) btScalar btParallelConstraintSolver::solveGroup(btCollisionObject** bodies1,int numRigidBodies,btPersistentManifold** manifoldPtr,int numManifolds,btTypedConstraint** constraints,int numConstraints,const btContactSolverInfo& infoGlobal, btIDebugDraw* debugDrawer, btStackAlloc* stackAlloc,btDispatcher* dispatcher)
{ {
int sz = sizeof(PfxSolverBody); /* int sz = sizeof(PfxSolverBody);
int sz2 = sizeof(vmVector3); int sz2 = sizeof(vmVector3);
int sz3 = sizeof(vmMatrix3); int sz3 = sizeof(vmMatrix3);
int sz4 = sizeof(vmQuat); int sz4 = sizeof(vmQuat);
int sz5 = sizeof(PfxConstraintRow); int sz5 = sizeof(PfxConstraintRow);
int sz6 = sizeof(btSolverConstraint); int sz6 = sizeof(btSolverConstraint);
int sz7 = sizeof(TrbState); int sz7 = sizeof(TrbState);
*/
m_memoryCache->m_mysolverbodies.resize(numRigidBodies); m_memoryCache->m_mysolverbodies.resize(numRigidBodies);
@@ -1093,8 +1094,8 @@ btScalar btParallelConstraintSolver::solveGroup(btCollisionObject** bodies1,int
int numPosPoints=0; int numPosPoints=0;
for (int p=0;p<m->getNumContacts();p++) for (int p=0;p<m->getNumContacts();p++)
{ {
btManifoldPoint& pt = m->getContactPoint(p); //btManifoldPoint& pt = m->getContactPoint(p);
float dist = pt.getDistance(); //float dist = pt.getDistance();
//if (dist<0.001) //if (dist<0.001)
numPosPoints++; numPosPoints++;
} }