Merge pull request #1532 from mapbox/1465-text_collision

Calculate text collision correctly
This commit is contained in:
Konstantin Käfer
2015-05-13 10:38:43 +02:00
committed by Justin R. Miller
parent 1ae3b1d122
commit ac1dcecef6
11 changed files with 83 additions and 42 deletions

View File

@@ -16,6 +16,7 @@
namespace mbgl {
class Bucket;
class Collision;
class Painter;
class SourceInfo;
class StyleLayer;
@@ -45,6 +46,14 @@ public:
void setBucket(StyleLayer const &layer_desc, std::unique_ptr<Bucket> bucket);
void setState(const State& state) override;
inline Collision* getCollision() const {
return collision.get();
}
const float depth;
protected:
// Holds the actual geometries in this tile.
FillVertexBuffer fillVertexBuffer;
@@ -69,8 +78,7 @@ private:
std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
mutable std::mutex bucketsMutex;
public:
const float depth;
std::unique_ptr<Collision> collision;
};
}