diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-09-04 15:38:14 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-09-04 15:38:14 -0700 |
commit | c14ae3c477617d284d50daff668ab5716ff9a771 (patch) | |
tree | c31407d589a67725849663d176d82c25f4b082b6 /include | |
parent | 4694aa40ada7d33732806f7fbb50b9abb2c412da (diff) | |
download | qtlocation-mapboxgl-c14ae3c477617d284d50daff668ab5716ff9a771.tar.gz |
Fix text/icon-translate-anchor
These are style properties, not render properties.
Diffstat (limited to 'include')
-rw-r--r-- | include/mbgl/renderer/painter.hpp | 2 | ||||
-rw-r--r-- | include/mbgl/style/style_bucket.hpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp index 534323dd5d..52536e0a75 100644 --- a/include/mbgl/renderer/painter.hpp +++ b/include/mbgl/renderer/painter.hpp @@ -120,7 +120,7 @@ public: bool needsAnimation() const; private: void setupShaders(); - mat4 translatedMatrix(const mat4& matrix, const std::array<float, 2> &translation, const Tile::ID &id, TranslateAnchorType anchor = TranslateAnchorType::Map); + mat4 translatedMatrix(const mat4& matrix, const std::array<float, 2> &translation, const Tile::ID &id, TranslateAnchorType anchor); void prepareTile(const Tile& tile); diff --git a/include/mbgl/style/style_bucket.hpp b/include/mbgl/style/style_bucket.hpp index 67c3142059..c2cde52aa5 100644 --- a/include/mbgl/style/style_bucket.hpp +++ b/include/mbgl/style/style_bucket.hpp @@ -53,7 +53,6 @@ public: float padding = 2.0f; bool keep_upright = false; vec2<float> offset = {0, 0}; - TranslateAnchorType translate_anchor = TranslateAnchorType::Map; } icon; struct { @@ -74,7 +73,6 @@ public: bool keep_upright = true; TextTransformType transform = TextTransformType::None; vec2<float> offset = {0, 0}; - TranslateAnchorType translate_anchor = TranslateAnchorType::Map; bool allow_overlap = false; bool ignore_placement = false; bool optional = false; |