[core] Remove unused BucketParameter members
This commit is contained in:
@@ -9,42 +9,26 @@
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
class TileID;
|
||||
class GeometryTileLayer;
|
||||
class GeometryTileFeature;
|
||||
class GlyphAtlas;
|
||||
class CollisionTile;
|
||||
class FeatureIndex;
|
||||
|
||||
namespace style {
|
||||
|
||||
class BucketParameters {
|
||||
public:
|
||||
BucketParameters(const OverscaledTileID& tileID_,
|
||||
const std::atomic<bool>& obsolete_,
|
||||
uintptr_t tileUID_,
|
||||
GlyphAtlas& glyphAtlas_,
|
||||
FeatureIndex& featureIndex_,
|
||||
const MapMode mode_)
|
||||
: tileID(tileID_),
|
||||
obsolete(obsolete_),
|
||||
tileUID(tileUID_),
|
||||
glyphAtlas(glyphAtlas_),
|
||||
featureIndex(featureIndex_),
|
||||
mode(mode_) {}
|
||||
const OverscaledTileID& tileID;
|
||||
const std::atomic<bool>& obsolete;
|
||||
FeatureIndex& featureIndex;
|
||||
const MapMode mode;
|
||||
|
||||
bool cancelled() const {
|
||||
return obsolete;
|
||||
}
|
||||
|
||||
void eachFilteredFeature(const Filter&, const GeometryTileLayer&, std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>);
|
||||
|
||||
const OverscaledTileID& tileID;
|
||||
const std::atomic<bool>& obsolete;
|
||||
uintptr_t tileUID;
|
||||
GlyphAtlas& glyphAtlas;
|
||||
FeatureIndex& featureIndex;
|
||||
const MapMode mode;
|
||||
void eachFilteredFeature(const Filter&,
|
||||
const GeometryTileLayer&,
|
||||
std::function<void (const GeometryTileFeature&, std::size_t index, const std::string& layerName)>);
|
||||
};
|
||||
|
||||
} // namespace style
|
||||
|
||||
@@ -209,13 +209,7 @@ void GeometryTileWorker::redoLayout() {
|
||||
std::unordered_set<std::string> parsed;
|
||||
std::unordered_map<std::string, std::unique_ptr<Bucket>> buckets;
|
||||
auto featureIndex = std::make_unique<FeatureIndex>();
|
||||
|
||||
BucketParameters parameters(id,
|
||||
obsolete,
|
||||
reinterpret_cast<uintptr_t>(this),
|
||||
glyphAtlas,
|
||||
*featureIndex,
|
||||
mode);
|
||||
BucketParameters parameters { id, obsolete, *featureIndex, mode };
|
||||
|
||||
for (auto i = layers->rbegin(); i != layers->rend(); i++) {
|
||||
if (obsolete) {
|
||||
|
||||
Reference in New Issue
Block a user