From f89ddcc86e1b8a7364c1d91928c19efc60b85c55 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Wed, 18 Aug 2010 01:33:06 +0000 Subject: [PATCH] minor fixes in BulletMultiThreaded: SpuCollisionTaskProcess had a memory leak and warnings in btParallelConstraintSolver --- src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp | 1 - src/BulletMultiThreaded/btParallelConstraintSolver.cpp | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp b/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp index 86eda8697..f606d1363 100644 --- a/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp +++ b/src/BulletMultiThreaded/SpuCollisionTaskProcess.cpp @@ -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*6, 128); } } diff --git a/src/BulletMultiThreaded/btParallelConstraintSolver.cpp b/src/BulletMultiThreaded/btParallelConstraintSolver.cpp index 9f2767c71..1aae42f43 100644 --- a/src/BulletMultiThreaded/btParallelConstraintSolver.cpp +++ b/src/BulletMultiThreaded/btParallelConstraintSolver.cpp @@ -981,14 +981,15 @@ 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) { - int sz = sizeof(PfxSolverBody); +/* int sz = sizeof(PfxSolverBody); int sz2 = sizeof(vmVector3); int sz3 = sizeof(vmMatrix3); int sz4 = sizeof(vmQuat); int sz5 = sizeof(PfxConstraintRow); int sz6 = sizeof(btSolverConstraint); int sz7 = sizeof(TrbState); - +*/ + m_memoryCache->m_mysolverbodies.resize(numRigidBodies); m_memoryCache->m_mystates.resize(numRigidBodies); @@ -1093,8 +1094,8 @@ btScalar btParallelConstraintSolver::solveGroup(btCollisionObject** bodies1,int int numPosPoints=0; for (int p=0;pgetNumContacts();p++) { - btManifoldPoint& pt = m->getContactPoint(p); - float dist = pt.getDistance(); + //btManifoldPoint& pt = m->getContactPoint(p); + //float dist = pt.getDistance(); //if (dist<0.001) numPosPoints++; }