summaryrefslogtreecommitdiff
path: root/src/mbgl/programs
diff options
context:
space:
mode:
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r--src/mbgl/programs/attributes.hpp1
-rw-r--r--src/mbgl/programs/collision_box_program.cpp2
-rw-r--r--src/mbgl/programs/collision_box_program.hpp11
3 files changed, 12 insertions, 2 deletions
diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp
index 42079bfd57..6106eedb53 100644
--- a/src/mbgl/programs/attributes.hpp
+++ b/src/mbgl/programs/attributes.hpp
@@ -20,6 +20,7 @@ MBGL_DEFINE_ATTRIBUTE(uint8_t, 1, a_fade_opacity);
MBGL_DEFINE_ATTRIBUTE(uint8_t, 2, a_placed);
MBGL_DEFINE_ATTRIBUTE(uint16_t, 3, a_size);
MBGL_DEFINE_ATTRIBUTE(float, 1, a_offset);
+MBGL_DEFINE_ATTRIBUTE(float, 2, a_shift);
template <typename T, std::size_t N>
struct a_data {
diff --git a/src/mbgl/programs/collision_box_program.cpp b/src/mbgl/programs/collision_box_program.cpp
index 869f4be61f..584013640e 100644
--- a/src/mbgl/programs/collision_box_program.cpp
+++ b/src/mbgl/programs/collision_box_program.cpp
@@ -2,6 +2,6 @@
namespace mbgl {
-static_assert(sizeof(CollisionBoxProgram::LayoutVertex) == 16, "expected CollisionBoxVertex size");
+static_assert(sizeof(CollisionBoxProgram::LayoutVertex) == 24, "expected CollisionBoxVertex size");
} // namespace mbgl
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp
index 794921271c..9872636f65 100644
--- a/src/mbgl/programs/collision_box_program.hpp
+++ b/src/mbgl/programs/collision_box_program.hpp
@@ -15,7 +15,8 @@ namespace mbgl {
using CollisionBoxLayoutAttributes = TypeList<
attributes::a_pos,
attributes::a_anchor_pos,
- attributes::a_extrude>;
+ attributes::a_extrude,
+ attributes::a_shift>;
using CollisionBoxDynamicAttributes = TypeList<attributes::a_placed>;
@@ -45,6 +46,10 @@ public:
{{
static_cast<int16_t>(::round(o.x)),
static_cast<int16_t>(::round(o.y))
+ }},
+ {{
+ 0.0f,
+ 0.0f
}}
};
}
@@ -132,6 +137,10 @@ public:
{{
static_cast<int16_t>(::round(o.x)),
static_cast<int16_t>(::round(o.y))
+ }},
+ {{
+ 0.0f,
+ 0.0f
}}
};
}