tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Remove Bucket::supportsLayer

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-05-16 14:57:04 +03:00
parent f2ad89c463
commit 18ddced9b6
17 changed files with 1 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mbgl/renderer/bucket.hpp
View File

@@ -46,11 +46,7 @@ public:
bool needsUpload() const {
return hasData() && !uploaded;
}
// Returns true if this bucket fits the given layer; returns false otherwise.
// Implementations of this class check at least that this bucket has
// the same layer type with the given layer, but extra checks are also
// possible.
virtual bool supportsLayer(const style::Layer::Impl&) const = 0;
// The following methods are implemented by buckets that require cross-tile indexing and placement.
// Returns a pair, the first element of which is a bucket cross-tile id

4
src/mbgl/renderer/buckets/circle_bucket.cpp
View File

@@ -39,10 +39,6 @@ bool CircleBucket::hasData() const {
return !segments.empty();
}
bool CircleBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::CircleLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
void CircleBucket::addFeature(const GeometryTileFeature& feature,
const GeometryCollection& geometry,
const ImagePositions&,

1
src/mbgl/renderer/buckets/circle_bucket.hpp
View File

@@ -28,7 +28,6 @@ public:
void upload(gfx::UploadPass&) override;
float getQueryRadius(const RenderLayer&) const override;
bool supportsLayer(const style::Layer::Impl&) const override;
gfx::VertexVector<CircleLayoutVertex> vertices;
gfx::IndexVector<gfx::Triangles> triangles;

4
src/mbgl/renderer/buckets/fill_bucket.cpp
View File

@@ -137,10 +137,6 @@ bool FillBucket::hasData() const {
return !triangleSegments.empty() || !lineSegments.empty();
}
bool FillBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::FillLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
float FillBucket::getQueryRadius(const RenderLayer& layer) const {
const auto& evaluated = getEvaluated<FillLayerProperties>(layer.evaluatedProperties);
const std::array<float, 2>& translate = evaluated.get<FillTranslate>();

1
src/mbgl/renderer/buckets/fill_bucket.hpp
View File

@@ -36,7 +36,6 @@ public:
void upload(gfx::UploadPass&) override;
float getQueryRadius(const RenderLayer&) const override;
bool supportsLayer(const style::Layer::Impl&) const override;
gfx::VertexVector<FillLayoutVertex> vertices;
gfx::IndexVector<gfx::Lines> lines;

4
src/mbgl/renderer/buckets/fill_extrusion_bucket.cpp
View File

@@ -180,10 +180,6 @@ bool FillExtrusionBucket::hasData() const {
return !triangleSegments.empty();
}
bool FillExtrusionBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::FillExtrusionLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
float FillExtrusionBucket::getQueryRadius(const RenderLayer& layer) const {
const auto& evaluated = getEvaluated<FillExtrusionLayerProperties>(layer.evaluatedProperties);
const std::array<float, 2>& translate = evaluated.get<FillExtrusionTranslate>();

2
src/mbgl/renderer/buckets/fill_extrusion_bucket.hpp
View File

@@ -31,8 +31,6 @@ public:
bool hasData() const override;
bool supportsLayer(const style::Layer::Impl&) const override;
void upload(gfx::UploadPass&) override;
float getQueryRadius(const RenderLayer&) const override;

4
src/mbgl/renderer/buckets/heatmap_bucket.cpp
View File

@@ -39,10 +39,6 @@ bool HeatmapBucket::hasData() const {
return !segments.empty();
}
bool HeatmapBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::HeatmapLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
void HeatmapBucket::addFeature(const GeometryTileFeature& feature,
const GeometryCollection& geometry,
const ImagePositions&,

1
src/mbgl/renderer/buckets/heatmap_bucket.hpp
View File

@@ -27,7 +27,6 @@ public:
void upload(gfx::UploadPass&) override;
float getQueryRadius(const RenderLayer&) const override;
bool supportsLayer(const style::Layer::Impl&) const override;
gfx::VertexVector<HeatmapLayoutVertex> vertices;
gfx::IndexVector<gfx::Triangles> triangles;

4
src/mbgl/renderer/buckets/hillshade_bucket.cpp
View File

@@ -114,9 +114,5 @@ bool HillshadeBucket::hasData() const {
return demdata.getImage()->valid();
}
bool HillshadeBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::HillshadeLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
} // namespace mbgl

1
src/mbgl/renderer/buckets/hillshade_bucket.hpp
View File

@@ -24,7 +24,6 @@ public:
void upload(gfx::UploadPass&) override;
bool hasData() const override;
bool supportsLayer(const style::Layer::Impl&) const override;
void clear();
void setMask(TileMask&&);

4
src/mbgl/renderer/buckets/line_bucket.cpp
View File

@@ -523,10 +523,6 @@ bool LineBucket::hasData() const {
return !segments.empty();
}
bool LineBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::LineLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
template <class Property>
static float get(const LinePaintProperties::PossiblyEvaluated& evaluated, const std::string& id, const std::map<std::string, LineProgram::Binders>& paintPropertyBinders) {
auto it = paintPropertyBinders.find(id);

1
src/mbgl/renderer/buckets/line_bucket.hpp
View File

@@ -36,7 +36,6 @@ public:
void upload(gfx::UploadPass&) override;
float getQueryRadius(const RenderLayer&) const override;
bool supportsLayer(const style::Layer::Impl&) const override;
PossiblyEvaluatedLayoutProperties layout;

4
src/mbgl/renderer/buckets/raster_bucket.cpp
View File

@@ -112,9 +112,5 @@ bool RasterBucket::hasData() const {
return !!image;
}
bool RasterBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::RasterLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
} // namespace mbgl

1
src/mbgl/renderer/buckets/raster_bucket.hpp
View File

@@ -20,7 +20,6 @@ public:
void upload(gfx::UploadPass&) override;
bool hasData() const override;
bool supportsLayer(const style::Layer::Impl&) const override;
void clear();
void setImage(std::shared_ptr<PremultipliedImage>);

4
src/mbgl/renderer/buckets/symbol_bucket.cpp
View File

@@ -133,10 +133,6 @@ bool SymbolBucket::hasData() const {
return hasTextData() || hasIconData() || hasCollisionBoxData();
}
bool SymbolBucket::supportsLayer(const style::Layer::Impl& impl) const {
return style::SymbolLayer::Impl::staticTypeInfo() == impl.getTypeInfo();
}
bool SymbolBucket::hasTextData() const {
return !text.segments.empty();
}

1
src/mbgl/renderer/buckets/symbol_bucket.hpp
View File

@@ -58,7 +58,6 @@ public:
void upload(gfx::UploadPass&) override;
bool hasData() const override;
bool supportsLayer(const style::Layer::Impl&) const override;
std::pair<uint32_t, bool> registerAtCrossTileIndex(CrossTileSymbolLayerIndex&, const OverscaledTileID&, uint32_t& maxCrossTileID) override;
bool hasTextData() const;
bool hasIconData() const;