diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-10 11:13:18 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-04-17 17:21:41 +0300 |
commit | a0c83808c0de3129f0737cfed9f311e062b54b16 (patch) | |
tree | 2366526b7c67d7fe5ed4d3b71087d95c54edd629 | |
parent | 7a7192516ffa9b4ed5b94b60961a4dc74fcf6e64 (diff) |
[core] Add `FadingTiles` layer type property
-rw-r--r-- | include/mbgl/style/layer.hpp | 6 | ||||
-rw-r--r-- | src/mbgl/style/layers/background_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/circle_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/custom_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/fill_extrusion_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/fill_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/heatmap_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/hillshade_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/layer.cpp.ejs | 4 | ||||
-rw-r--r-- | src/mbgl/style/layers/line_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/raster_layer.cpp | 3 | ||||
-rw-r--r-- | src/mbgl/style/layers/symbol_layer.cpp | 3 |
12 files changed, 29 insertions, 11 deletions
diff --git a/include/mbgl/style/layer.hpp b/include/mbgl/style/layer.hpp index c52618203..ab98d978a 100644 --- a/include/mbgl/style/layer.hpp +++ b/include/mbgl/style/layer.hpp @@ -49,6 +49,12 @@ struct LayerTypeInfo { * requires clipping. Contains \c Clipping::NotRequired otherwise. */ const enum class Clipping { Required, NotRequired } clipping; + + /** + * @brief contains \c FadingTiles::Required if the corresponding layer type + * requires rendering on fading tiles. Contains \c FadingTiles::NotRequired otherwise. + */ + const enum class FadingTiles { Required, NotRequired } fadingTiles; }; /** diff --git a/src/mbgl/style/layers/background_layer.cpp b/src/mbgl/style/layers/background_layer.cpp index 8d2b1b144..530c3ce6b 100644 --- a/src/mbgl/style/layers/background_layer.cpp +++ b/src/mbgl/style/layers/background_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* BackgroundLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::NotRequired, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/circle_layer.cpp b/src/mbgl/style/layers/circle_layer.cpp index f2e3649c5..2759549e1 100644 --- a/src/mbgl/style/layers/circle_layer.cpp +++ b/src/mbgl/style/layers/circle_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* CircleLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/custom_layer.cpp b/src/mbgl/style/layers/custom_layer.cpp index 90c65193d..ba818d953 100644 --- a/src/mbgl/style/layers/custom_layer.cpp +++ b/src/mbgl/style/layers/custom_layer.cpp @@ -13,7 +13,8 @@ namespace { LayerTypeInfo::Source::NotRequired, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired }; + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::NotRequired }; } // namespace CustomLayer::CustomLayer(const std::string& layerID, diff --git a/src/mbgl/style/layers/fill_extrusion_layer.cpp b/src/mbgl/style/layers/fill_extrusion_layer.cpp index 913f8e312..89796f098 100644 --- a/src/mbgl/style/layers/fill_extrusion_layer.cpp +++ b/src/mbgl/style/layers/fill_extrusion_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* FillExtrusionLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::Required, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::NotRequired + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/fill_layer.cpp b/src/mbgl/style/layers/fill_layer.cpp index afcb2cae3..0511e0682 100644 --- a/src/mbgl/style/layers/fill_layer.cpp +++ b/src/mbgl/style/layers/fill_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* FillLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::Required + LayerTypeInfo::Clipping::Required, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/heatmap_layer.cpp b/src/mbgl/style/layers/heatmap_layer.cpp index 9e0fe9355..7d23d86f1 100644 --- a/src/mbgl/style/layers/heatmap_layer.cpp +++ b/src/mbgl/style/layers/heatmap_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* HeatmapLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::Required, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/hillshade_layer.cpp b/src/mbgl/style/layers/hillshade_layer.cpp index ac26e331f..dacd639f5 100644 --- a/src/mbgl/style/layers/hillshade_layer.cpp +++ b/src/mbgl/style/layers/hillshade_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* HillshadeLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::Required, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/layer.cpp.ejs b/src/mbgl/style/layers/layer.cpp.ejs index 107c3cb52..dac4529d3 100644 --- a/src/mbgl/style/layers/layer.cpp.ejs +++ b/src/mbgl/style/layers/layer.cpp.ejs @@ -25,7 +25,8 @@ let layerCapabilities = {}; let defaults = { caps: { 'Source': 'NotRequired', 'Pass3D': 'NotRequired', 'Layout': 'NotRequired', - 'Clipping': 'NotRequired' + 'Clipping': 'NotRequired', + 'FadingTiles': 'NotRequired' }, require: function(cap) { let copy = Object.assign({}, this); @@ -55,6 +56,7 @@ layerCapabilities['hillshade'] = defaults.require('Source') .finalize(); layerCapabilities['symbol'] = defaults.require('Source') .require('Layout') + .require('FadingTiles') .finalize(); layerCapabilities['circle'] = defaults.require('Source').finalize(); layerCapabilities['line'] = layerCapabilities['fill']; diff --git a/src/mbgl/style/layers/line_layer.cpp b/src/mbgl/style/layers/line_layer.cpp index d52a55260..d50ae2709 100644 --- a/src/mbgl/style/layers/line_layer.cpp +++ b/src/mbgl/style/layers/line_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* LineLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::Required + LayerTypeInfo::Clipping::Required, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/raster_layer.cpp b/src/mbgl/style/layers/raster_layer.cpp index dc7dd4a74..784b720c6 100644 --- a/src/mbgl/style/layers/raster_layer.cpp +++ b/src/mbgl/style/layers/raster_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* RasterLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::NotRequired, - LayerTypeInfo::Clipping::NotRequired + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::NotRequired }; return &typeInfo; } diff --git a/src/mbgl/style/layers/symbol_layer.cpp b/src/mbgl/style/layers/symbol_layer.cpp index 0284ba0d3..0567c224b 100644 --- a/src/mbgl/style/layers/symbol_layer.cpp +++ b/src/mbgl/style/layers/symbol_layer.cpp @@ -23,7 +23,8 @@ const LayerTypeInfo* SymbolLayer::Impl::staticTypeInfo() noexcept { LayerTypeInfo::Source::Required, LayerTypeInfo::Pass3D::NotRequired, LayerTypeInfo::Layout::Required, - LayerTypeInfo::Clipping::NotRequired + LayerTypeInfo::Clipping::NotRequired, + LayerTypeInfo::FadingTiles::Required }; return &typeInfo; } |