summaryrefslogtreecommitdiff
path: root/src/mbgl/text/collision_tile.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/text/collision_tile.hpp')
-rw-r--r--src/mbgl/text/collision_tile.hpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp
index aed9b59f32..3fd1b0a4c8 100644
--- a/src/mbgl/text/collision_tile.hpp
+++ b/src/mbgl/text/collision_tile.hpp
@@ -35,22 +35,18 @@ namespace mbgl {
class CollisionTile {
public:
- inline explicit CollisionTile(float _zoom, float tileExtent, float tileSize, float angle_, bool debug_) :
- zoom(_zoom), tilePixelRatio(tileExtent / tileSize), debug(debug_) { reset(angle_, 0); }
+ explicit CollisionTile(float angle_, float pitch_, bool debug_);
- void reset(const float angle, const float pitch);
float placeFeature(const CollisionFeature &feature);
void insertFeature(CollisionFeature &feature, const float minPlacementScale);
- void setDebug(bool debug_) { debug = debug_; }
bool getDebug() { return debug; }
- const float zoom;
- const float tilePixelRatio;
- float angle = 0;
+ const float angle = 0;
const float minScale = 0.5f;
const float maxScale = 2.0f;
+ float yStretch;
private:
@@ -58,7 +54,6 @@ class CollisionTile {
Tree tree;
std::array<float, 4> rotationMatrix;
- float yStretch;
bool debug;
};