diff options
| author | Benoit Bolsee <benoit.bolsee@online.be> | 2008-07-20 19:40:03 +0400 |
|---|---|---|
| committer | Benoit Bolsee <benoit.bolsee@online.be> | 2008-07-20 19:40:03 +0400 |
| commit | d725e5f78eae57b3cfd0d32b8404beaef4e11846 (patch) | |
| tree | a2ae780c9952d07def7d687834438cd74dc881fa /source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | |
| parent | 89f2a63ecde5ebebddb493522e88951852ec9cf4 (diff) | |
BGE bug fix (for 2.47): setParent() fix, third part: set mass to 0 when parenting. Allow loc/scale/orientation change on child object with physic controller.
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h index dff17517b85..453749b27b3 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h @@ -183,7 +183,14 @@ protected: void removeCcdPhysicsController(CcdPhysicsController* ctrl); - void updateCcdPhysicsController(CcdPhysicsController* ctrl, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask); + void updateCcdPhysicsController(CcdPhysicsController* ctrl, btScalar newMass, int newCollisionFlags, short int newCollisionGroup, short int newCollisionMask); + + void disableCcdPhysicsController(CcdPhysicsController* ctrl) + { + removeCcdPhysicsController(ctrl); + } + + void enableCcdPhysicsController(CcdPhysicsController* ctrl); btBroadphaseInterface* getBroadphase(); |