diff options
| author | AndreaCatania <info@andreacatania.com> | 2017-11-07 15:22:09 +0100 |
|---|---|---|
| committer | AndreaCatania <info@andreacatania.com> | 2017-11-07 15:22:09 +0100 |
| commit | 10f879bf883ed364a9b0eafe40aba03c59b6fbfb (patch) | |
| tree | 12965784f364d986bcc226565c4e96d7405fb62c /modules/bullet/rigid_body_bullet.h | |
| parent | 9a78efc7c270211e49fd7b2f071b61c706febffc (diff) | |
| download | redot-engine-10f879bf883ed364a9b0eafe40aba03c59b6fbfb.tar.gz | |
Rewritten kinematic system
Diffstat (limited to 'modules/bullet/rigid_body_bullet.h')
| -rw-r--r-- | modules/bullet/rigid_body_bullet.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h index 0cf3f9f605..ab3c3e58b2 100644 --- a/modules/bullet/rigid_body_bullet.h +++ b/modules/bullet/rigid_body_bullet.h @@ -162,17 +162,15 @@ public: }; struct KinematicUtilities { - RigidBodyBullet *m_owner; - btScalar m_margin; - btManifoldArray m_manifoldArray; ///keep track of the contact manifolds - class btPairCachingGhostObject *m_ghostObject; - Vector<KinematicShape> m_shapes; + RigidBodyBullet *owner; + btScalar safe_margin; + Vector<KinematicShape> shapes; KinematicUtilities(RigidBodyBullet *p_owner); ~KinematicUtilities(); + void setSafeMargin(btScalar p_margin); /// Used to set the default shape to ghost - void resetDefShape(); void copyAllOwnerShapes(); private: |