Scarfski/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3.git synced 2026-09-03 00:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2641 from erwincoumans/master

Browse Source 
fix memleak due to custom container, release memory of m_deformableBodySolver in ClothFriction demo
This commit is contained in:
erwincoumans
2020-02-22 11:18:41 -08:00
committed by GitHub
parent 279a5c19d5 dc19da18ee
commit dc11c43666
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
examples/DeformableDemo/ClothFriction.cpp
View File

@@ -29,13 +29,16 @@
class ClothFriction : public CommonRigidBodyBase
{
btAlignedObjectArray<btDeformableLagrangianForce*> m_forces;
btDeformableBodySolver* m_deformableBodySolver;
public:
ClothFriction(struct GUIHelperInterface* helper)
: CommonRigidBodyBase(helper)
: CommonRigidBodyBase(helper),
m_deformableBodySolver(0)
{
}
virtual ~ClothFriction()
{
}
void initPhysics();
@@ -94,14 +97,14 @@ void ClothFriction::initPhysics()
m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
m_broadphase = new btDbvtBroadphase();
btDeformableBodySolver* deformableBodySolver = new btDeformableBodySolver();
m_deformableBodySolver = new btDeformableBodySolver();
///the default constraint solver. For parallel processing you can use a different solver (see Extras/BulletMultiThreaded)
btDeformableMultiBodyConstraintSolver* sol = new btDeformableMultiBodyConstraintSolver();
sol->setDeformableSolver(deformableBodySolver);
sol->setDeformableSolver(m_deformableBodySolver);
m_solver = sol;
m_dynamicsWorld = new btDeformableMultiBodyDynamicsWorld(m_dispatcher, m_broadphase, sol, m_collisionConfiguration, deformableBodySolver);
m_dynamicsWorld = new btDeformableMultiBodyDynamicsWorld(m_dispatcher, m_broadphase, sol, m_collisionConfiguration, m_deformableBodySolver);
btVector3 gravity = btVector3(0, -10, 0);
m_dynamicsWorld->setGravity(gravity);
getDeformableDynamicsWorld()->getWorldInfo().m_gravity = gravity;
@@ -240,6 +243,8 @@ void ClothFriction::exitPhysics()
delete m_solver;
delete m_deformableBodySolver;
delete m_broadphase;
delete m_dispatcher;

12
src/BulletSoftBody/btSoftBody.cpp
View File

@@ -105,7 +105,17 @@ static inline btDbvtNode* buildTreeBottomUp(btAlignedObjectArray<btDbvtNode*>& l
}
}
leafNodes = newLeafNodes;
adj = newAdj;
//this assignment leaks memory, the assignment doesn't do a deep copy, for now a manual copy
//adj = newAdj;
adj.clear();
adj.resize(newAdj.size());
for (int i = 0; i < newAdj.size(); i++)
{
for (int j = 0; j < newAdj[i].size(); j++)
{
adj[i].push_back(newAdj[i][j]);
}
}
N = leafNodes.size();
}
return leafNodes[0];