diff options
| author | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-05-12 14:24:47 +0300 |
|---|---|---|
| committer | Porteries Tristan <republicthunderbolt9@gmail.com> | 2015-05-12 14:38:46 +0300 |
| commit | 909d3228b1d0254888d0c97d269e9ab2e315dba9 (patch) | |
| tree | 5e430bb24b09ce84bf1952437d2e2b3a2bde3bce /source/gameengine/Physics | |
| parent | 615a7aea5534e0730fa8bf0690d5e30a478aa1fe (diff) | |
BGE : Fix Bullet shape margin for triangle mesh static objects
Diffstat (limited to 'source/gameengine/Physics')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.h | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index efa90657efc..ed23a454c92 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -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); } diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index 625713d16e1..b1d38763fbb 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -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 { |