bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T37040: Removing vehicles in BGE causes a crash

Browse Source 
The vehicle constraint is now properly removed if bge.constraints.removeConstraint()
is used or the object is deleted. This also fixes a memory leak with the
vehicle wrapper.
This commit is contained in:
Mitchell Stokes 2013-11-18 09:30:46 -08:00
parent 2d4bfc5e60
commit c73f82b6f0
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
View File

@ -83,6 +83,11 @@ public:
{ {
} }
~WrapperVehicle()
{
delete m_vehicle;
}
btRaycastVehicle* GetVehicle() btRaycastVehicle* GetVehicle()
{ {
return m_vehicle; return m_vehicle;
@ -440,6 +445,19 @@ bool CcdPhysicsEnvironment::RemoveCcdPhysicsController(CcdPhysicsController* ctr
//delete con; //might be kept by python KX_ConstraintWrapper //delete con; //might be kept by python KX_ConstraintWrapper
} }
m_dynamicsWorld->removeRigidBody(ctrl->GetRigidBody()); m_dynamicsWorld->removeRigidBody(ctrl->GetRigidBody());
// Handle potential vehicle constraints
int numVehicles = m_wrapperVehicles.size();
int vehicle_constraint = 0;
for (int i=0;i<numVehicles;i++)
{
WrapperVehicle* wrapperVehicle = m_wrapperVehicles[i];
if (wrapperVehicle->GetChassis() == ctrl)
vehicle_constraint = wrapperVehicle->GetVehicle()->getUserConstraintId();
}
if (vehicle_constraint > 0)
RemoveConstraint(vehicle_constraint);
} else } else
{ {
//if a softbody //if a softbody
@ -984,6 +1002,14 @@ void CcdPhysicsEnvironment::RemoveConstraint(int constraintId)
break; break;
} }
} }
WrapperVehicle *vehicle;
if ((vehicle = (WrapperVehicle*)GetVehicleConstraint(constraintId)))
{
m_dynamicsWorld->removeVehicle(vehicle->GetVehicle());
m_wrapperVehicles.erase(std::remove(m_wrapperVehicles.begin(), m_wrapperVehicles.end(), vehicle));
delete vehicle;
}
} }