diff options
| author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2015-05-12 19:42:05 +0300 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-05-13 09:58:29 +0200 |
| commit | af63b4980d45e40d0cc5302b0f85475be5c1f90e (patch) | |
| tree | 890469c410b16807d42cbafa7ec8243031501282 /src/mbgl/map/tile_parser.hpp | |
| parent | 41d619771e4e0c77c3112f13febeacff9003209e (diff) | |
| download | qtlocation-mapboxgl-af63b4980d45e40d0cc5302b0f85475be5c1f90e.tar.gz | |
Move the Collision object from TileParser to VectorTileData
We keep the Collision object alive longer because we need it
for the SymbolBuckets yet to be created in case more data
resources arrive. When the tile is no longer needed or if it
is completely parsed or obsolete (i.e. in a immutable state)
we throw the Collision object away.
Diffstat (limited to 'src/mbgl/map/tile_parser.hpp')
| -rw-r--r-- | src/mbgl/map/tile_parser.hpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mbgl/map/tile_parser.hpp b/src/mbgl/map/tile_parser.hpp index 18184e27a3..67150bcd4d 100644 --- a/src/mbgl/map/tile_parser.hpp +++ b/src/mbgl/map/tile_parser.hpp @@ -29,7 +29,6 @@ class StyleLayoutRaster; class StyleLayoutLine; class StyleLayoutSymbol; class VectorTileData; -class Collision; class TileParser : private util::noncopyable { public: @@ -69,7 +68,6 @@ private: SpriteAtlas& spriteAtlas; util::ptr<Sprite> sprite; - std::unique_ptr<Collision> collision; bool partialParse; }; |