diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-04-01 14:26:35 -0700 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-04-01 16:11:48 -0700 |
| commit | fd526ae68ec193574fb69ca22df59134d3ec13ca (patch) | |
| tree | daaa7a5d0f2aeabec8465eac562bdf7733b0c587 /src/mbgl/text/collision_tile.hpp | |
| parent | dda1b770daa2c009abdaaa48d40917abc1571ca3 (diff) | |
| download | qtlocation-mapboxgl-fd526ae68ec193574fb69ca22df59134d3ec13ca.tar.gz | |
port the remained of CollisionTile
Diffstat (limited to 'src/mbgl/text/collision_tile.hpp')
| -rw-r--r-- | src/mbgl/text/collision_tile.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp index 9c209d9e23..b9f8446b15 100644 --- a/src/mbgl/text/collision_tile.hpp +++ b/src/mbgl/text/collision_tile.hpp @@ -38,7 +38,7 @@ class CollisionTile { zoom(_zoom), tilePixelRatio(tileExtent / tileSize) {} void reset(const float angle, const float pitch); - void placeFeature(CollisionFeature &feature); + float placeFeature(CollisionFeature &feature); void insertFeature(CollisionFeature &feature, const float minPlacementScale); const float zoom; @@ -47,8 +47,10 @@ class CollisionTile { private: + Box getTreeBox(const Anchor &anchor, const CollisionBox &box); + Tree tree; - std::array<float, 4> matrix; + std::array<float, 4> rotationMatrix; float yStretch; }; |