diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-04-17 05:33:10 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-04-17 05:33:10 +0400 |
| commit | 971ee74c845e31cec49e428877fbdc6315dda0ed (patch) | |
| tree | 56f4d2bc2ce2cde3f8a0b7d1c4a733a41d78306c /source/gameengine/Physics/Bullet/CcdPhysicsController.h | |
| parent | 176641b2730084ae279e1567af92d5e493c60f03 (diff) | |
added support for 'Ghost' object and collision sensor (preliminary)
Diffstat (limited to 'source/gameengine/Physics/Bullet/CcdPhysicsController.h')
| -rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsController.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.h b/source/gameengine/Physics/Bullet/CcdPhysicsController.h index 04d34fb1200..2c5e01dd4b0 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.h +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.h @@ -34,7 +34,8 @@ struct CcdConstructionInfo m_MotionState(0), m_physicsEnv(0), m_inertiaFactor(1.f), - m_scaling(1.f,1.f,1.f) + m_scaling(1.f,1.f,1.f), + m_collisionFlags(0) { } @@ -46,6 +47,7 @@ struct CcdConstructionInfo SimdScalar m_friction; SimdScalar m_linearDamping; SimdScalar m_angularDamping; + int m_collisionFlags; CollisionShape* m_collisionShape; class PHY_IMotionState* m_MotionState; |