diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-11 13:55:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 13:55:44 +0200 |
| commit | c499f1475f1c37c6d83985320a9e98a3d2711a2b (patch) | |
| tree | 8ceaa6bc1d5deb40b7c5fc998041ecd63ad122d9 /thirdparty/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h | |
| parent | f0bacf360dbb6ce3781356438b2fa7067250d27c (diff) | |
| parent | 99acec63f175fecd7172c927263ed3787cb082d6 (diff) | |
Merge pull request #29418 from AndreaCatania/upbul
Updated Bullet version to the actual bullet master commit
Diffstat (limited to 'thirdparty/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h')
| -rw-r--r-- | thirdparty/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h index 54888c6757..8f78c234b4 100644 --- a/thirdparty/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h +++ b/thirdparty/bullet/BulletCollision/Gimpact/btGImpactBvhStructs.h @@ -28,28 +28,7 @@ subject to the following restrictions: #include "btBoxCollision.h" #include "btTriangleShapeEx.h" - -//! Overlapping pair -struct GIM_PAIR -{ - int m_index1; - int m_index2; - GIM_PAIR() - { - } - - GIM_PAIR(const GIM_PAIR& p) - { - m_index1 = p.m_index1; - m_index2 = p.m_index2; - } - - GIM_PAIR(int index1, int index2) - { - m_index1 = index1; - m_index2 = index2; - } -}; +#include "gim_pair.h" //for GIM_PAIR ///GIM_BVH_DATA is an internal GIMPACT collision structure to contain axis aligned bounding box struct GIM_BVH_DATA |