diff options
Diffstat (limited to 'src/mbgl/style')
-rw-r--r-- | src/mbgl/style/layers/fill_extrusion_layer_properties.hpp | 11 | ||||
-rw-r--r-- | src/mbgl/style/layers/fill_layer_properties.hpp | 11 | ||||
-rw-r--r-- | src/mbgl/style/layers/line_layer_properties.hpp | 11 | ||||
-rw-r--r-- | src/mbgl/style/paint_property.hpp | 6 |
4 files changed, 33 insertions, 6 deletions
diff --git a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp index 60a2340b0d..1f17f1ff32 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_extrusion_layer_properties.hpp @@ -32,7 +32,16 @@ struct FillExtrusionOpacity : PaintProperty<float> { static float defaultValue() { return 1; } }; -struct FillExtrusionPattern : CrossFadedDataDrivenPaintProperty<expression::Image, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { +struct FillExtrusionPattern : CrossFadedDataDrivenPaintProperty< + expression::Image, + attributes::pattern_to, + uniforms::pattern_to, + attributes::pattern_from, + uniforms::pattern_from, + attributes::pixel_ratio_to, + uniforms::pixel_ratio_to, + attributes::pixel_ratio_from, + uniforms::pixel_ratio_from> { static expression::Image defaultValue() { return {}; } }; diff --git a/src/mbgl/style/layers/fill_layer_properties.hpp b/src/mbgl/style/layers/fill_layer_properties.hpp index 7867fe8f0c..3890615275 100644 --- a/src/mbgl/style/layers/fill_layer_properties.hpp +++ b/src/mbgl/style/layers/fill_layer_properties.hpp @@ -37,7 +37,16 @@ struct FillOutlineColor : DataDrivenPaintProperty<Color, attributes::outline_col static Color defaultValue() { return {}; } }; -struct FillPattern : CrossFadedDataDrivenPaintProperty<expression::Image, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { +struct FillPattern : CrossFadedDataDrivenPaintProperty< + expression::Image, + attributes::pattern_to, + uniforms::pattern_to, + attributes::pattern_from, + uniforms::pattern_from, + attributes::pixel_ratio_to, + uniforms::pixel_ratio_to, + attributes::pixel_ratio_from, + uniforms::pixel_ratio_from> { static expression::Image defaultValue() { return {}; } }; diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index b2bd4aa401..2725e55158 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -73,7 +73,16 @@ struct LineOpacity : DataDrivenPaintProperty<float, attributes::opacity, uniform static float defaultValue() { return 1; } }; -struct LinePattern : CrossFadedDataDrivenPaintProperty<expression::Image, attributes::pattern_to, uniforms::pattern_to, attributes::pattern_from, uniforms::pattern_from> { +struct LinePattern : CrossFadedDataDrivenPaintProperty< + expression::Image, + attributes::pattern_to, + uniforms::pattern_to, + attributes::pattern_from, + uniforms::pattern_from, + attributes::pixel_ratio_to, + uniforms::pixel_ratio_to, + attributes::pixel_ratio_from, + uniforms::pixel_ratio_from> { static expression::Image defaultValue() { return {}; } }; diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp index 7d398748f2..76a62f3946 100644 --- a/src/mbgl/style/paint_property.hpp +++ b/src/mbgl/style/paint_property.hpp @@ -41,7 +41,7 @@ public: using UniformList = TypeList<U>; }; -template <class T, class A1, class U1, class A2, class U2> +template <class T, class A1, class U1, class A2, class U2, class A3, class U3, class A4, class U4> class CrossFadedDataDrivenPaintProperty { public: using TransitionableType = Transitionable<PropertyValue<T>>; @@ -53,9 +53,9 @@ public: static constexpr bool IsOverridable = false; using Attribute = A1; - using AttributeList = TypeList<A1, A2>; + using AttributeList = TypeList<A1, A2, A3, A4>; using Uniform = U1; - using UniformList = TypeList<U1, U2>; + using UniformList = TypeList<U1, U2, U3, U4>; }; template <class T> |