diff options
Diffstat (limited to 'thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h')
-rw-r--r-- | thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h | 44 |
1 files changed, 21 insertions, 23 deletions
diff --git a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h index 39bf27de3e..4ff9ebae81 100644 --- a/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h +++ b/thirdparty/bullet/Bullet3Collision/BroadPhaseCollision/b3OverlappingPair.h @@ -23,20 +23,20 @@ subject to the following restrictions: typedef b3Int4 b3BroadphasePair; -inline b3Int4 b3MakeBroadphasePair(int xx,int yy) +inline b3Int4 b3MakeBroadphasePair(int xx, int yy) { b3Int4 pair; if (xx < yy) - { - pair.x = xx; - pair.y = yy; - } - else - { + { + pair.x = xx; + pair.y = yy; + } + else + { pair.x = yy; - pair.y = xx; - } + pair.y = xx; + } pair.z = B3_NEW_PAIR_MARKER; pair.w = B3_NEW_PAIR_MARKER; return pair; @@ -51,22 +51,20 @@ inline b3Int4 b3MakeBroadphasePair(int xx,int yy) class b3BroadphasePairSortPredicate { - public: - - bool operator() ( const b3BroadphasePair& a, const b3BroadphasePair& b ) const - { - const int uidA0 = a.x; - const int uidB0 = b.x; - const int uidA1 = a.y; - const int uidB1 = b.y; - return uidA0 > uidB0 || (uidA0 == uidB0 && uidA1 > uidB1); - } +public: + bool operator()(const b3BroadphasePair& a, const b3BroadphasePair& b) const + { + const int uidA0 = a.x; + const int uidB0 = b.x; + const int uidA1 = a.y; + const int uidB1 = b.y; + return uidA0 > uidB0 || (uidA0 == uidB0 && uidA1 > uidB1); + } }; -B3_FORCE_INLINE bool operator==(const b3BroadphasePair& a, const b3BroadphasePair& b) +B3_FORCE_INLINE bool operator==(const b3BroadphasePair& a, const b3BroadphasePair& b) { - return (a.x == b.x ) && (a.y == b.y ); + return (a.x == b.x) && (a.y == b.y); } -#endif //B3_OVERLAPPING_PAIR_H - +#endif //B3_OVERLAPPING_PAIR_H |