diff options
author | Chris Loer <chris.loer@gmail.com> | 2017-10-24 16:08:56 -0700 |
---|---|---|
committer | Chris Loer <chris.loer@gmail.com> | 2017-10-24 16:08:56 -0700 |
commit | 74701079c297ce390de74ea2e9cfe7f1b2d4ec83 (patch) | |
tree | dd7107a1e744aec6e69305bbdfa485e28d08bd08 /src/mbgl/programs/collision_box_program.hpp | |
parent | 494d5500ca48776903248b1397fe352b4b1f6954 (diff) | |
download | qtlocation-mapboxgl-74701079c297ce390de74ea2e9cfe7f1b2d4ec83.tar.gz |
Starting implementation of debug collision boxes.
- Dynamic buffers not hooked up yet
- Circles not hooked up yet
Diffstat (limited to 'src/mbgl/programs/collision_box_program.hpp')
-rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index ba99e0c087..d4b5ea0e5a 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -11,16 +11,18 @@ namespace mbgl { -namespace uniforms { -MBGL_DEFINE_UNIFORM_SCALAR(float, u_scale); -MBGL_DEFINE_UNIFORM_SCALAR(float, u_maxzoom); -} // namespace uniforms - using CollisionBoxAttributes = gl::Attributes< attributes::a_pos, attributes::a_anchor_pos, - attributes::a_extrude, - attributes::a_data<uint8_t, 2>>; + attributes::a_extrude>; + +struct CollisionBoxOpacityAttributes : gl::Attributes<attributes::a_placed> { + static Vertex vertex(bool placed, bool notUsed) { + return Vertex { + {{ static_cast<uint8_t>(placed), static_cast<uint8_t>(notUsed) }} + }; + } +}; class CollisionBoxProgram : public Program< shaders::collision_box, @@ -28,19 +30,14 @@ class CollisionBoxProgram : public Program< CollisionBoxAttributes, gl::Uniforms< uniforms::u_matrix, - uniforms::u_scale, - uniforms::u_zoom, - uniforms::u_maxzoom, - uniforms::u_collision_y_stretch, - uniforms::u_camera_to_center_distance, - uniforms::u_pitch, - uniforms::u_fadetexture>, + uniforms::u_extrude_scale, + uniforms::u_camera_to_center_distance>, style::Properties<>> { public: using Program::Program; - static LayoutVertex vertex(Point<float> a, Point<float> anchor, Point<float> o, float maxzoom, float placementZoom) { + static LayoutVertex vertex(Point<float> a, Point<float> anchor, Point<float> o) { return LayoutVertex { {{ static_cast<int16_t>(a.x), @@ -53,10 +50,6 @@ public: {{ static_cast<int16_t>(::round(o.x)), static_cast<int16_t>(::round(o.y)) - }}, - {{ - static_cast<uint8_t>(maxzoom * 10), - static_cast<uint8_t>(placementZoom * 10) }} }; } |