From 6622a07ad88c7ca2eb34db66cc46f416f7b5286f Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 29 Oct 2014 14:35:58 -0400 Subject: simplify - remove before/afterParse and create Parser on stack in worker thread --- include/mbgl/map/tile_data.hpp | 2 -- include/mbgl/map/vector_tile_data.hpp | 6 ------ 2 files changed, 8 deletions(-) (limited to 'include') diff --git a/include/mbgl/map/tile_data.hpp b/include/mbgl/map/tile_data.hpp index b83f0316e0..70297c7f34 100644 --- a/include/mbgl/map/tile_data.hpp +++ b/include/mbgl/map/tile_data.hpp @@ -53,9 +53,7 @@ public: } // Override this in the child class. - virtual void beforeParse(); virtual void parse() = 0; - virtual void afterParse(); virtual void render(Painter &painter, util::ptr layer_desc, const mat4 &matrix) = 0; virtual bool hasData(StyleLayer const& layer_desc) const = 0; diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp index 1fbacab3da..9f611fd69c 100644 --- a/include/mbgl/map/vector_tile_data.hpp +++ b/include/mbgl/map/vector_tile_data.hpp @@ -28,10 +28,7 @@ class VectorTileData : public TileData { public: VectorTileData(Tile::ID id, Map &map, const util::ptr &source); ~VectorTileData(); - - virtual void beforeParse(); virtual void parse(); - virtual void afterParse(); virtual void render(Painter &painter, util::ptr layer_desc, const mat4 &matrix); virtual bool hasData(StyleLayer const& layer_desc) const; @@ -49,9 +46,6 @@ protected: // Holds the buckets of this tile. // They contain the location offsets in the buffers stored above std::unordered_map> buckets; - - std::unique_ptr parser; - public: const float depth; }; -- cgit v1.2.1