summaryrefslogtreecommitdiff
path: root/src/mbgl/text/collision_index.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/text/collision_index.hpp')
-rw-r--r--src/mbgl/text/collision_index.hpp34
1 files changed, 19 insertions, 15 deletions
diff --git a/src/mbgl/text/collision_index.hpp b/src/mbgl/text/collision_index.hpp
index d22d962069..1fccdf4930 100644
--- a/src/mbgl/text/collision_index.hpp
+++ b/src/mbgl/text/collision_index.hpp
@@ -29,20 +29,20 @@ public:
IntersectStatus intersectsTileEdges(const CollisionBox&,
Point<float> shift,
const mat4& posMatrix,
- const float textPixelRatio,
+ float textPixelRatio,
const CollisionBoundaries& tileEdges) const;
std::pair<bool, bool> placeFeature(
const CollisionFeature& feature,
Point<float> shift,
const mat4& posMatrix,
const mat4& labelPlaneMatrix,
- const float textPixelRatio,
+ float textPixelRatio,
const PlacedSymbol& symbol,
- const float scale,
- const float fontSize,
- const bool allowOverlap,
- const bool pitchWithMap,
- const bool collisionDebug,
+ float scale,
+ float fontSize,
+ bool allowOverlap,
+ bool pitchWithMap,
+ bool collisionDebug,
const optional<CollisionBoundaries>& avoidEdges,
const optional<std::function<bool(const IndexedSubfeature&)>>& collisionGroupPredicate,
std::vector<ProjectedCollisionBox>& /*out*/);
@@ -67,19 +67,23 @@ private:
const CollisionFeature& feature,
const mat4& posMatrix,
const mat4& labelPlaneMatrix,
- const float textPixelRatio,
+ float textPixelRatio,
const PlacedSymbol& symbol,
- const float scale,
- const float fontSize,
- const bool allowOverlap,
- const bool pitchWithMap,
- const bool collisionDebug,
+ float scale,
+ float fontSize,
+ bool allowOverlap,
+ bool pitchWithMap,
+ bool collisionDebug,
const optional<CollisionBoundaries>& avoidEdges,
const optional<std::function<bool(const IndexedSubfeature&)>>& collisionGroupPredicate,
std::vector<ProjectedCollisionBox>& /*out*/);
- float approximateTileDistance(const TileDistance& tileDistance, const float lastSegmentAngle, const float pixelsToTileUnits, const float cameraToAnchorDistance, const bool pitchWithMap);
-
+ float approximateTileDistance(const TileDistance& tileDistance,
+ float lastSegmentAngle,
+ float pixelsToTileUnits,
+ float cameraToAnchorDistance,
+ bool pitchWithMap);
+
std::pair<float,float> projectAnchor(const mat4& posMatrix, const Point<float>& point) const;
std::pair<Point<float>,float> projectAndGetPerspectiveRatio(const mat4& posMatrix, const Point<float>& point) const;
Point<float> projectPoint(const mat4& posMatrix, const Point<float>& point) const;