diff options
Diffstat (limited to 'extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp')
-rw-r--r-- | extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp index 8b423204bec..19c4632820c 100644 --- a/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp +++ b/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp @@ -31,7 +31,7 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci) MassProps mp(ci.m_mass, ci.m_localInertiaTensor); - m_body = new RigidBody(mp,0,0); + m_body = new RigidBody(mp,0,0,ci.m_friction,ci.m_restitution); m_broadphaseHandle = ci.m_broadphaseHandle; @@ -44,12 +44,10 @@ CcdPhysicsController::CcdPhysicsController (const CcdConstructionInfo& ci) m_body->setMassProps(ci.m_mass, ci.m_localInertiaTensor); m_body->setGravity( ci.m_gravity); - m_friction = ci.m_friction; - m_restitution = ci.m_restitution; - + m_body->setDamping(ci.m_linearDamping, ci.m_angularDamping); - + m_body->setCenterOfMassTransform( trans ); #ifdef WIN32 |