Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

separate spinning friction (torsional friction around contact normal) from

Browse Source 
rolling friction (orthogonal to contact normal)
This commit is contained in:
Erwin Coumans
2016-09-16 00:04:33 +01:00
parent 4d6a95017e
commit 1d88cf71e4
11 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/BulletCollision/CollisionDispatch/btManifoldResult.h
View File

@@ -146,7 +146,8 @@ public:
static btScalar calculateCombinedRestitution(const btCollisionObject* body0,const btCollisionObject* body1);
static btScalar calculateCombinedFriction(const btCollisionObject* body0,const btCollisionObject* body1);
static btScalar calculateCombinedRollingFriction(const btCollisionObject* body0,const btCollisionObject* body1);
static btScalar calculateCombinedContactDamping(const btCollisionObject* body0,const btCollisionObject* body1);
static btScalar calculateCombinedSpinningFriction(const btCollisionObject* body0,const btCollisionObject* body1);
static btScalar calculateCombinedContactDamping(const btCollisionObject* body0,const btCollisionObject* body1);
static btScalar calculateCombinedContactStiffness(const btCollisionObject* body0,const btCollisionObject* body1);
};