blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

BGE : Fix Bullet shape margin for triangle mesh static objects

This commit is contained in:
Porteries Tristan 2015-05-12 13:24:47 +02:00
parent 615a7aea55
commit 909d3228b1
Notes: blender-bot 2023-02-14 08:26:30 +01:00 
Referenced by issue #46752, Collision between convex hull and triangle mesh causing slow fps in bge
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
View File

@ -2610,6 +2610,7 @@ btCollisionShape* CcdShapeConstructionInfo::CreateBulletShape(btScalar margin, b
}
btBvhTriangleMeshShape *unscaledShape = new btBvhTriangleMeshShape(m_triangleIndexVertexArray, true, useBvh);
unscaledShape->setMargin(margin);
collisionShape = new btScaledBvhTriangleMeshShape(unscaledShape, btVector3(1.0f, 1.0f, 1.0f));
collisionShape->setMargin(margin);
}

8
source/gameengine/Physics/Bullet/CcdPhysicsController.h
View File

@ -657,8 +657,12 @@ protected:
virtual void CalcXform() {}
virtual void SetMargin(float margin)
{
if (m_collisionShape)
m_collisionShape->setMargin(btScalar(margin));
if (m_collisionShape) {
m_collisionShape->setMargin(margin);
// if the shape use a unscaled shape we have also to set the correct margin in it
if (m_collisionShape->getShapeType() == SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE)
((btScaledBvhTriangleMeshShape *)m_collisionShape)->getChildShape()->setMargin(margin);
}
}
virtual float GetMargin() const
{