diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-01-07 15:08:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-07 15:08:41 +0100 |
| commit | dab650fcaa3eb37deee5118d678a3763ac78a58a (patch) | |
| tree | 3131df01280f91a61b4721eed132a5b6b21881ba /thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h | |
| parent | a3a537c2cf86ff4bf82385bbd17606654f8013c4 (diff) | |
| parent | 22b7c9dfa80d0f7abca40f061865c2ab3c136a74 (diff) | |
Merge pull request #24740 from OBKF/update-bullet-physics
Update Bullet physics to commit 126b676
Diffstat (limited to 'thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h')
| -rw-r--r-- | thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h index dfd45cc566..d5f6daa993 100644 --- a/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h +++ b/thirdparty/bullet/Bullet3Collision/NarrowPhaseCollision/shared/b3Contact4Data.h @@ -3,26 +3,24 @@ #include "Bullet3Common/shared/b3Float4.h" -typedef struct b3Contact4Data b3Contact4Data_t; +typedef struct b3Contact4Data b3Contact4Data_t; struct b3Contact4Data { - b3Float4 m_worldPosB[4]; -// b3Float4 m_localPosA[4]; -// b3Float4 m_localPosB[4]; - b3Float4 m_worldNormalOnB; // w: m_nPoints - unsigned short m_restituitionCoeffCmp; - unsigned short m_frictionCoeffCmp; + b3Float4 m_worldPosB[4]; + // b3Float4 m_localPosA[4]; + // b3Float4 m_localPosB[4]; + b3Float4 m_worldNormalOnB; // w: m_nPoints + unsigned short m_restituitionCoeffCmp; + unsigned short m_frictionCoeffCmp; int m_batchIdx; - int m_bodyAPtrAndSignBit;//x:m_bodyAPtr, y:m_bodyBPtr + int m_bodyAPtrAndSignBit; //x:m_bodyAPtr, y:m_bodyBPtr int m_bodyBPtrAndSignBit; - int m_childIndexA; - int m_childIndexB; + int m_childIndexA; + int m_childIndexB; int m_unused1; int m_unused2; - - }; inline int b3Contact4Data_getNumPoints(const struct b3Contact4Data* contact) @@ -35,6 +33,4 @@ inline void b3Contact4Data_setNumPoints(struct b3Contact4Data* contact, int numP contact->m_worldNormalOnB.w = (float)numPoints; }; - - -#endif //B3_CONTACT4DATA_H
\ No newline at end of file +#endif //B3_CONTACT4DATA_H
\ No newline at end of file |