diff options
| author | Anand Thakker <anandthakker@users.noreply.github.com> | 2017-04-06 15:29:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 15:29:59 -0400 |
| commit | 693c9f3641b3189b4cd439049904c95a516ae609 (patch) | |
| tree | 8341a16f57ff184a2fe9e085c490e8762eb206ce /src/mbgl/style/layers/symbol_layer_impl.cpp | |
| parent | f9cc044357d60dd5cf15ba951384529f88802089 (diff) | |
| download | qtlocation-mapboxgl-693c9f3641b3189b4cd439049904c95a516ae609.tar.gz | |
[core] Add DDS support for {text,icon}-size (#8593)
* Update gl-js and generate style code
* Factor out packUint8Pair() helper function
* Draft implementation of DDS for {text,icon}-size
Ports https://github.com/mapbox/mapbox-gl-js/pull/4455
* Fix text-size/composite-function-line-placement test
* Refactor to PaintPropertyBinders-like strategy
* Dedupe gl::Program construction
* Use exponential function base for interpolation
* Dedupe coveringZoomStops method
* Fixup tests
* Fix CI errors (hidden within #if block)
Diffstat (limited to 'src/mbgl/style/layers/symbol_layer_impl.cpp')
| -rw-r--r-- | src/mbgl/style/layers/symbol_layer_impl.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mbgl/style/layers/symbol_layer_impl.cpp b/src/mbgl/style/layers/symbol_layer_impl.cpp index c637770c04..109d1c43e7 100644 --- a/src/mbgl/style/layers/symbol_layer_impl.cpp +++ b/src/mbgl/style/layers/symbol_layer_impl.cpp @@ -13,10 +13,6 @@ void SymbolLayer::Impl::cascade(const CascadeParameters& parameters) { bool SymbolLayer::Impl::evaluate(const PropertyEvaluationParameters& parameters) { paint.evaluate(parameters); - // text-size and icon-size are layout properties but they also need to be evaluated as paint properties: - iconSize = layout.evaluate<IconSize>(parameters); - textSize = layout.evaluate<TextSize>(parameters); - auto hasIconOpacity = paint.evaluated.get<IconColor>().constantOr(Color::black()).a > 0 || paint.evaluated.get<IconHaloColor>().constantOr(Color::black()).a > 0; auto hasTextOpacity = paint.evaluated.get<TextColor>().constantOr(Color::black()).a > 0 || |