[core] Remove clipping option from RenderTile and style::Layer
This commit is contained in:
@@ -44,12 +44,6 @@ struct LayerTypeInfo {
|
||||
*/
|
||||
const enum class Layout { Required, NotRequired } layout;
|
||||
|
||||
/**
|
||||
* @brief contains \c Clipping::Required if the corresponding layer type
|
||||
* 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.
|
||||
|
||||
@@ -26,7 +26,6 @@ public:
|
||||
mat4 matrix;
|
||||
mat4 nearClippedMatrix;
|
||||
bool used = false;
|
||||
bool needsClipping = false;
|
||||
|
||||
mat4 translatedMatrix(const std::array<float, 2>& translate,
|
||||
style::TranslateAnchorType anchor,
|
||||
|
||||
@@ -255,7 +255,6 @@ void TilePyramid::update(const std::vector<Immutable<style::LayerProperties>>& l
|
||||
: static_cast<bool>(tile.getBucket(*layerProperties->baseImpl));
|
||||
if (layerRenderableInTile) {
|
||||
renderTile.used = true;
|
||||
renderTile.needsClipping = (renderTile.needsClipping || typeInfo->clipping == LayerTypeInfo::Clipping::Required);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* BackgroundLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::NotRequired,
|
||||
LayerTypeInfo::Pass3D::NotRequired,
|
||||
LayerTypeInfo::Layout::NotRequired,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* CircleLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::NotRequired,
|
||||
LayerTypeInfo::Layout::NotRequired,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -13,7 +13,6 @@ namespace {
|
||||
LayerTypeInfo::Source::NotRequired,
|
||||
LayerTypeInfo::Pass3D::NotRequired,
|
||||
LayerTypeInfo::Layout::NotRequired,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::NotRequired };
|
||||
} // namespace
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* FillExtrusionLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::Required,
|
||||
LayerTypeInfo::Layout::Required,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* FillLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::NotRequired,
|
||||
LayerTypeInfo::Layout::Required,
|
||||
LayerTypeInfo::Clipping::Required,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* HeatmapLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::Required,
|
||||
LayerTypeInfo::Layout::NotRequired,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* HillshadeLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::Required,
|
||||
LayerTypeInfo::Layout::NotRequired,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -25,7 +25,6 @@ let layerCapabilities = {};
|
||||
let defaults = { caps: { 'Source': 'NotRequired',
|
||||
'Pass3D': 'NotRequired',
|
||||
'Layout': 'NotRequired',
|
||||
'Clipping': 'NotRequired',
|
||||
'FadingTiles': 'NotRequired'
|
||||
},
|
||||
require: function(cap) {
|
||||
@@ -45,7 +44,6 @@ let defaults = { caps: { 'Source': 'NotRequired',
|
||||
layerCapabilities['background'] = defaults.finalize();
|
||||
layerCapabilities['fill'] = defaults.require('Source')
|
||||
.require('Layout')
|
||||
.require('Clipping')
|
||||
.finalize();
|
||||
layerCapabilities['fill-extrusion'] = defaults.require('Source')
|
||||
.require('Pass3D')
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* LineLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::NotRequired,
|
||||
LayerTypeInfo::Layout::Required,
|
||||
LayerTypeInfo::Clipping::Required,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* RasterLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::NotRequired,
|
||||
LayerTypeInfo::Layout::NotRequired,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::NotRequired
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
@@ -23,7 +23,6 @@ const LayerTypeInfo* SymbolLayer::Impl::staticTypeInfo() noexcept {
|
||||
LayerTypeInfo::Source::Required,
|
||||
LayerTypeInfo::Pass3D::NotRequired,
|
||||
LayerTypeInfo::Layout::Required,
|
||||
LayerTypeInfo::Clipping::NotRequired,
|
||||
LayerTypeInfo::FadingTiles::Required
|
||||
};
|
||||
return &typeInfo;
|
||||
|
||||
Reference in New Issue
Block a user