diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-03-14 10:25:53 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-03-29 16:18:41 +0200 |
commit | 2292623bc62b2012f5901ff3aba57f0569da62b5 (patch) | |
tree | 470b01500ba835f2849d71f07e81414a93dc466a /src/mbgl/programs/collision_box_program.hpp | |
parent | cb64dbe0d63bafd3fda7488be9d8253b480b2ce5 (diff) | |
download | qtlocation-mapboxgl-2292623bc62b2012f5901ff3aba57f0569da62b5.tar.gz |
[core] Introduce variable text placement for point labels - Placement part
Diffstat (limited to 'src/mbgl/programs/collision_box_program.hpp')
-rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index 0fa7ea4b4f..677704b154 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -13,10 +13,9 @@ namespace mbgl { using CollisionBoxLayoutAttributes = TypeList< attributes::pos, attributes::anchor_pos, - attributes::extrude, - attributes::shift>; + attributes::extrude>; -using CollisionBoxDynamicAttributes = TypeList<attributes::placed>; +using CollisionBoxDynamicAttributes = TypeList<attributes::placed, attributes::shift>; class CollisionBoxProgram : public Program< CollisionBoxProgram, @@ -45,17 +44,14 @@ public: {{ static_cast<int16_t>(::round(o.x)), static_cast<int16_t>(::round(o.y)) - }}, - {{ - 0.0f, - 0.0f }} }; } - static gfx::Vertex<CollisionBoxDynamicAttributes> dynamicVertex(bool placed, bool notUsed) { + static gfx::Vertex<CollisionBoxDynamicAttributes> dynamicVertex(bool placed, bool notUsed, Point<float> shift) { return { - {{ static_cast<uint8_t>(placed), static_cast<uint8_t>(notUsed) }} + {{ static_cast<uint8_t>(placed), static_cast<uint8_t>(notUsed) }}, + {{ shift.x, shift.y }} }; } @@ -139,10 +135,6 @@ public: {{ static_cast<int16_t>(::round(o.x)), static_cast<int16_t>(::round(o.y)) - }}, - {{ - 0.0f, - 0.0f }} }; } |