diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-12-01 04:04:27 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-12-01 04:04:27 +0300 |
| commit | 4941107f927c3717a113b82463193caae0022d8c (patch) | |
| tree | 2f4de94b1bb53233e54f49a732a0f4d90df14bf8 /source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | |
| parent | 51ce503cb24de6fa928555359acce77beed8995e (diff) | |
- enabled compound collision objects, requires 'clear parent inverse'
- fixed some issues with kinematic objects, introduced during Bullet 2.x upgrade
Diffstat (limited to 'source/gameengine/Ketsji/KX_ConvertPhysicsObject.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index a976a6b13b1..684e052323d 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -57,7 +57,8 @@ typedef enum { KX_BOUNDCYLINDER, KX_BOUNDCONE, KX_BOUNDMESH, - KX_BOUNDPOLYTOPE + KX_BOUNDPOLYTOPE, + KX_BOUND_DYN_MESH } KX_BoundBoxClass; struct KX_BoxBounds @@ -86,6 +87,8 @@ struct KX_ObjectProperties bool m_concave; bool m_isdeformable; bool m_disableSleeping; + bool m_hasCompoundChildren; + bool m_isCompoundChild; KX_BoundBoxClass m_boundclass; union { KX_BoxBounds box; |