diff options
author | Ansis Brammanis <brammanis@gmail.com> | 2015-08-20 13:18:48 -0400 |
---|---|---|
committer | Ansis Brammanis <brammanis@gmail.com> | 2015-08-24 18:41:51 -0400 |
commit | 99c5976498f09ca2dffd46dd6e26d2a26b9efc13 (patch) | |
tree | 67fd7bd887bffec695dfb7bd80b00e5b827b0e30 /src/mbgl/text/quads.hpp | |
parent | 19c256e34916d123b758c42befc2c13dc0f5c3fa (diff) | |
download | qtlocation-mapboxgl-99c5976498f09ca2dffd46dd6e26d2a26b9efc13.tar.gz |
port minor collision code cleanup, fix #1705
https://github.com/mapbox/mapbox-gl-js/pull/1261
Diffstat (limited to 'src/mbgl/text/quads.hpp')
-rw-r--r-- | src/mbgl/text/quads.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/text/quads.hpp b/src/mbgl/text/quads.hpp index b47cc718b6..97fdb6a1fc 100644 --- a/src/mbgl/text/quads.hpp +++ b/src/mbgl/text/quads.hpp @@ -11,7 +11,7 @@ namespace mbgl { struct SymbolQuad { explicit SymbolQuad(const vec2<float> &tl_, const vec2<float> &tr_, const vec2<float> &bl_, const vec2<float> &br_, - const Rect<uint16_t> &tex_, float angle_, const vec2<float> &anchor_, + const Rect<uint16_t> &tex_, float angle_, const vec2<float> &anchorPoint_, float minScale_, float maxScale_) : tl(tl_), tr(tr_), @@ -19,14 +19,14 @@ namespace mbgl { br(br_), tex(tex_), angle(angle_), - anchor(anchor_), + anchorPoint(anchorPoint_), minScale(minScale_), maxScale(maxScale_) {} vec2<float> tl, tr, bl, br; Rect<uint16_t> tex; float angle; - vec2<float> anchor; + vec2<float> anchorPoint; float minScale, maxScale; }; |