format

mapbox · Dec 6, 2019 · 08c2da0 · 08c2da0
1 parent a7593b0
commit 08c2da0
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp
@@ -27,18 +27,25 @@ static const float viewportPaddingDefault = 100;
 static const float viewportPaddingForStaticTiles = 1024;
 
 CollisionIndex::CollisionIndex(const TransformState& transformState_, const MapMode& mapMode)
-    : transformState(transformState_)
-    , viewportPadding(mapMode == MapMode::Tile ? viewportPaddingForStaticTiles : viewportPaddingDefault)
-    , collisionGrid(transformState.getSize().width + 2 * viewportPadding, transformState.getSize().height + 2 * viewportPadding, 25)
-    , ignoredGrid(transformState.getSize().width + 2 * viewportPadding, transformState.getSize().height + 2 * viewportPadding, 25)
-    , screenRightBoundary(transformState.getSize().width + viewportPadding)
-    , screenBottomBoundary(transformState.getSize().height + viewportPadding)
-    , gridRightBoundary(transformState.getSize().width + 2 * viewportPadding)
-    , gridBottomBoundary(transformState.getSize().height + 2 * viewportPadding)
-    , pitchFactor(std::cos(transformState.getPitch()) * transformState.getCameraToCenterDistance())
-{}
-
-float CollisionIndex::approximateTileDistance(const TileDistance& tileDistance, const float lastSegmentAngle, const float pixelsToTileUnits, const float cameraToAnchorDistance, const bool pitchWithMap) {
+    : transformState(transformState_),
+      viewportPadding(mapMode == MapMode::Tile ? viewportPaddingForStaticTiles : viewportPaddingDefault),
+      collisionGrid(transformState.getSize().width + 2 * viewportPadding,
+                    transformState.getSize().height + 2 * viewportPadding,
+                    25),
+      ignoredGrid(transformState.getSize().width + 2 * viewportPadding,
+                  transformState.getSize().height + 2 * viewportPadding,
+                  25),
+      screenRightBoundary(transformState.getSize().width + viewportPadding),
+      screenBottomBoundary(transformState.getSize().height + viewportPadding),
+      gridRightBoundary(transformState.getSize().width + 2 * viewportPadding),
+      gridBottomBoundary(transformState.getSize().height + 2 * viewportPadding),
+      pitchFactor(std::cos(transformState.getPitch()) * transformState.getCameraToCenterDistance()) {}
+
+float CollisionIndex::approximateTileDistance(const TileDistance& tileDistance,
+                                              const float lastSegmentAngle,
+                                              const float pixelsToTileUnits,
+                                              const float cameraToAnchorDistance,
+                                              const bool pitchWithMap) {
     // This is a quick and dirty solution for chosing which collision circles to use (since collision circles are
     // laid out in tile units). Ideally, I think we should generate collision circles on the fly in viewport coordinates
     // at the time we do collision detection.