From af63b4980d45e40d0cc5302b0f85475be5c1f90e Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 12 May 2015 19:42:05 +0300 Subject: 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. --- src/mbgl/map/tile_parser.hpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/mbgl/map/tile_parser.hpp') 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; - std::unique_ptr collision; bool partialParse; }; -- cgit v1.2.1