diff options
Diffstat (limited to 'include/mbgl/text/collision.hpp')
| -rw-r--r-- | include/mbgl/text/collision.hpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/include/mbgl/text/collision.hpp b/include/mbgl/text/collision.hpp index 8911b3b4c6..87ebdb279e 100644 --- a/include/mbgl/text/collision.hpp +++ b/include/mbgl/text/collision.hpp @@ -11,20 +11,17 @@ public: Collision(float zoom, float tileExtent, float tileSize, float placementDepth = 1); ~Collision(); - PlacementProperty place(const GlyphBoxes &boxes, const CollisionAnchor &anchor, - float minPlacementScale, float maxPlacementScale, float padding, - bool horizontal, bool allowOverlap, bool ignorePlacement); - float getPlacementScale(const GlyphBoxes &glyphs, float minPlacementScale, - float maxPlacementScale, float pad); - PlacementRange getPlacementRange(const GlyphBoxes &glyphs, - float placementScale, bool horizontal); - void insert(const GlyphBoxes &glyphs, const CollisionAnchor &anchor, - float placementScale, const PlacementRange &placementRange, - bool horizontal, float padding); + float getPlacementScale(const GlyphBoxes &glyphs, float minPlacementScale); + PlacementRange getPlacementRange(const GlyphBoxes &glyphs, float placementScale, + bool horizontal); + void insert(const GlyphBoxes &glyphs, const CollisionAnchor &anchor, float placementScale, + const PlacementRange &placementRange, bool horizontal); private: void *hTree; void *cTree; + +public: const float tilePixelRatio; const float zoom; const float maxPlacementScale; |