summaryrefslogtreecommitdiff
path: root/src/mbgl/programs
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-12-08 12:09:21 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-12-09 09:35:21 -0800
commit3b2a4216a2e3929a557dbddd0d239758641c285f (patch)
treefc30966e6d1253e040b6092f1c53eb2fd22632e7 /src/mbgl/programs
parent4a2f53e6e51b4759cacd89790db99783bf211343 (diff)
downloadqtlocation-mapboxgl-3b2a4216a2e3929a557dbddd0d239758641c285f.tar.gz
[core] Implement circle-stroke properties
Also includes stubs for fill-extrusion layer, because most of the code was auto-generated.
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r--src/mbgl/programs/circle_program.hpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp
index 6b713bb41c..c9aea1d137 100644
--- a/src/mbgl/programs/circle_program.hpp
+++ b/src/mbgl/programs/circle_program.hpp
@@ -10,6 +10,9 @@ namespace mbgl {
namespace uniforms {
MBGL_DEFINE_UNIFORM_SCALAR(float, u_radius);
+MBGL_DEFINE_UNIFORM_SCALAR(Color, u_stroke_color);
+MBGL_DEFINE_UNIFORM_SCALAR(float, u_stroke_width);
+MBGL_DEFINE_UNIFORM_SCALAR(float, u_stroke_opacity);
MBGL_DEFINE_UNIFORM_SCALAR(bool, u_scale_with_map);
} // namespace uniforms
@@ -26,6 +29,9 @@ class CircleProgram : public Program<
uniforms::u_color,
uniforms::u_radius,
uniforms::u_blur,
+ uniforms::u_stroke_color,
+ uniforms::u_stroke_width,
+ uniforms::u_stroke_opacity,
uniforms::u_scale_with_map,
uniforms::u_extrude_scale>>
{