diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2017-06-04 23:17:59 +0200 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-06-13 12:21:50 -0700 |
commit | 2c6fcd9f44ff93593a3f21c9f993a1eb4b299bb4 (patch) | |
tree | d13e07bbb2568e6a75f1435dcc39f685a653c40f /src/mbgl/style/layers/fill_extrusion_layer_properties.hpp | |
parent | 2cbc3d3332e32054e9fdc5323fef8e98f5f99a79 (diff) | |
download | qtlocation-mapboxgl-2c6fcd9f44ff93593a3f21c9f993a1eb4b299bb4.tar.gz |
[core] add uniforms to DataDrivenPaintPropertys
Diffstat (limited to 'src/mbgl/style/layers/fill_extrusion_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/fill_extrusion_layer_properties.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp index 1819f98ae6..19be59a2fe 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp @@ -7,6 +7,7 @@ #include <mbgl/style/paint_property.hpp> #include <mbgl/style/properties.hpp> #include <mbgl/programs/attributes.hpp> +#include <mbgl/programs/uniforms.hpp> namespace mbgl { namespace style { @@ -15,7 +16,7 @@ struct FillExtrusionOpacity : PaintProperty<float> { static float defaultValue() { return 1; } }; -struct FillExtrusionColor : DataDrivenPaintProperty<Color, attributes::a_color> { +struct FillExtrusionColor : DataDrivenPaintProperty<Color, attributes::a_color, uniforms::u_color> { static Color defaultValue() { return Color::black(); } }; @@ -31,11 +32,11 @@ struct FillExtrusionPattern : CrossFadedPaintProperty<std::string> { static std::string defaultValue() { return ""; } }; -struct FillExtrusionHeight : DataDrivenPaintProperty<float, attributes::a_height> { +struct FillExtrusionHeight : DataDrivenPaintProperty<float, attributes::a_height, uniforms::u_height> { static float defaultValue() { return 0; } }; -struct FillExtrusionBase : DataDrivenPaintProperty<float, attributes::a_base> { +struct FillExtrusionBase : DataDrivenPaintProperty<float, attributes::a_base, uniforms::u_base> { static float defaultValue() { return 0; } }; |