diff options
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 7b81752a94..9f1da81a1a 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::a_pos, attributes::a_anchor_pos, - attributes::a_extrude, - attributes::a_shift>; + attributes::a_extrude>; -using CollisionBoxDynamicAttributes = TypeList<attributes::a_placed>; +using CollisionBoxDynamicAttributes = TypeList<attributes::a_placed, attributes::a_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 }} }; } |