diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 13:23:58 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-14 16:54:55 +0200 |
| commit | 0be6d925dc3c6413bce7a3ccb49631b8e4a6e67a (patch) | |
| tree | a27e497da7104dd0a64f98a04fa3067668735e91 /servers/physics_2d/broad_phase_2d_hash_grid.h | |
| parent | 710b34b70227becdc652b4ae027fe0ac47409642 (diff) | |
Style: clang-format: Disable KeepEmptyLinesAtTheStartOfBlocks
Which means that reduz' beloved style which we all became used to
will now be changed automatically to remove the first empty line.
This makes us lean closer to 1TBS (the one true brace style) instead
of hybridating it with some Allman-inspired spacing.
There's still the case of braces around single-statement blocks that
needs to be addressed (but clang-format can't help with that, but
clang-tidy may if we agree about it).
Part of #33027.
Diffstat (limited to 'servers/physics_2d/broad_phase_2d_hash_grid.h')
| -rw-r--r-- | servers/physics_2d/broad_phase_2d_hash_grid.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.h b/servers/physics_2d/broad_phase_2d_hash_grid.h index dc29d0c619..de1ada0932 100644 --- a/servers/physics_2d/broad_phase_2d_hash_grid.h +++ b/servers/physics_2d/broad_phase_2d_hash_grid.h @@ -35,9 +35,7 @@ #include "core/map.h" class BroadPhase2DHashGrid : public BroadPhase2DSW { - struct PairData { - bool colliding; int rc; void *ud; @@ -49,7 +47,6 @@ class BroadPhase2DHashGrid : public BroadPhase2DSW { }; struct Element { - ID self; CollisionObject2DSW *owner; bool _static; @@ -60,7 +57,6 @@ class BroadPhase2DHashGrid : public BroadPhase2DSW { }; struct RC { - int ref; _FORCE_INLINE_ int inc() { @@ -85,7 +81,6 @@ class BroadPhase2DHashGrid : public BroadPhase2DSW { uint64_t pass; struct PairKey { - union { struct { ID a; @@ -126,7 +121,6 @@ class BroadPhase2DHashGrid : public BroadPhase2DSW { _FORCE_INLINE_ void _cull(const Point2i p_cell, const Rect2 &p_aabb, const Point2 &p_from, const Point2 &p_to, CollisionObject2DSW **p_results, int p_max_results, int *p_result_indices, int &index); struct PosKey { - union { struct { int32_t x; @@ -153,7 +147,6 @@ class BroadPhase2DHashGrid : public BroadPhase2DSW { }; struct PosBin { - PosKey key; Map<Element *, RC> object_set; Map<Element *, RC> static_object_set; |