[core] Drop BucketPlacementParameters

This commit is contained in:
Mikhail Pozdnyakov
2020-03-03 15:25:14 +02:00
parent 24fa599903
commit 44ac1f008a
7 changed files with 15 additions and 23 deletions

View File

@@ -19,7 +19,7 @@ class PatternDependency;
using PatternLayerMap = std::map<std::string, PatternDependency>;
class Placement;
class TransformState;
class BucketPlacementParameters;
class BucketPlacementData;
class RenderTile;
class Bucket {
@@ -64,7 +64,7 @@ public:
return std::make_pair(0u, false);
}
// Places this bucket to the given placement.
virtual void place(Placement&, const BucketPlacementParameters&, std::set<uint32_t>&) {}
virtual void place(Placement&, const BucketPlacementData&, std::set<uint32_t>&) {}
virtual void updateVertices(
const Placement&, bool /*updateOpacities*/, const TransformState&, const RenderTile&, std::set<uint32_t>&) {}

View File

@@ -314,8 +314,8 @@ std::pair<uint32_t, bool> SymbolBucket::registerAtCrossTileIndex(CrossTileSymbol
return std::make_pair(bucketInstanceId, firstTimeAdded);
}
void SymbolBucket::place(Placement& placement, const BucketPlacementParameters& params, std::set<uint32_t>& seenIds) {
placement.placeBucket(*this, params, seenIds);
void SymbolBucket::place(Placement& placement, const BucketPlacementData& data, std::set<uint32_t>& seenIds) {
placement.placeSymbolBucket(data, seenIds);
}
void SymbolBucket::updateVertices(const Placement& placement,

View File

@@ -84,7 +84,7 @@ public:
void upload(gfx::UploadPass&) override;
bool hasData() const override;
std::pair<uint32_t, bool> registerAtCrossTileIndex(CrossTileSymbolLayerIndex&, const RenderTile&) override;
void place(Placement&, const BucketPlacementParameters&, std::set<uint32_t>&) override;
void place(Placement&, const BucketPlacementData&, std::set<uint32_t>&) override;
void updateVertices(
const Placement&, bool updateOpacities, const TransformState&, const RenderTile&, std::set<uint32_t>&) override;
bool hasTextData() const;

View File

@@ -575,6 +575,7 @@ void RenderSymbolLayer::prepare(const LayerPrepareParameters& params) {
addRenderPassesFromTiles();
placementData.clear();
for (const RenderTile& renderTile : *renderTiles) {
auto* bucket = static_cast<SymbolBucket*>(renderTile.getBucket(*baseImpl));
if (bucket && bucket->bucketLeaderID == getID()) {
@@ -586,10 +587,10 @@ void RenderSymbolLayer::prepare(const LayerPrepareParameters& params) {
auto featureIndex = static_cast<const GeometryTile*>(tile)->getFeatureIndex();
if (bucket->sortKeyRanges.empty()) {
placementData.push_back({*bucket, renderTile, featureIndex, nullopt});
placementData.push_back({*bucket, renderTile, featureIndex, baseImpl->source, nullopt});
} else {
for (const auto& sortKeyRange : bucket->sortKeyRanges) {
BucketPlacementData layerData{*bucket, renderTile, featureIndex, sortKeyRange};
BucketPlacementData layerData{*bucket, renderTile, featureIndex, baseImpl->source, sortKeyRange};
auto sortPosition = std::upper_bound(
placementData.cbegin(), placementData.cend(), layerData, [](const auto& lhs, const auto& rhs) {
assert(lhs.sortKeyRange && rhs.sortKeyRange);

View File

@@ -41,6 +41,7 @@ public:
std::reference_wrapper<Bucket> bucket;
std::reference_wrapper<const RenderTile> tile;
std::shared_ptr<FeatureIndex> featureIndex;
std::string sourceId;
optional<SortKeyRange> sortKeyRange;
};

View File

@@ -111,10 +111,9 @@ Placement::Placement() : collisionIndex({}, MapMode::Static), collisionGroups(tr
void Placement::placeLayer(const RenderLayer& layer) {
std::set<uint32_t> seenCrossTileIDs;
for (const auto& item : layer.getPlacementData()) {
Bucket& bucket = item.bucket;
BucketPlacementParameters params{item.tile, layer.baseImpl->source, item.featureIndex, item.sortKeyRange};
bucket.place(*this, params, seenCrossTileIDs);
for (const BucketPlacementData& data : layer.getPlacementData()) {
Bucket& bucket = data.bucket;
bucket.place(*this, data, seenCrossTileIDs);
}
}
@@ -139,10 +138,9 @@ Point<float> calculateVariableLayoutOffset(style::SymbolAnchorType anchor,
}
} // namespace
void Placement::placeBucket(const SymbolBucket& bucket,
const BucketPlacementParameters& params,
std::set<uint32_t>& seenCrossTileIDs) {
void Placement::placeSymbolBucket(const BucketPlacementData& params, std::set<uint32_t>& seenCrossTileIDs) {
assert(updateParameters);
const auto& bucket = static_cast<const SymbolBucket&>(params.bucket.get());
const auto& layout = *bucket.layout;
const RenderTile& renderTile = params.tile;
const auto& state = collisionIndex.getTransformState();

View File

@@ -86,14 +86,6 @@ private:
bool crossSourceCollisions;
};
class BucketPlacementParameters {
public:
std::reference_wrapper<const RenderTile> tile;
std::string sourceId;
std::shared_ptr<FeatureIndex> featureIndex;
optional<SortKeyRange> sortKeyRange;
};
class Placement;
class PlacementController {
@@ -132,7 +124,7 @@ public:
private:
friend SymbolBucket;
void placeBucket(const SymbolBucket&, const BucketPlacementParameters&, std::set<uint32_t>& seenCrossTileIDs);
void placeSymbolBucket(const BucketPlacementData&, std::set<uint32_t>& seenCrossTileIDs);
// Returns `true` if bucket vertices were updated; returns `false` otherwise.
bool updateBucketDynamicVertices(SymbolBucket&, const TransformState&, const RenderTile& tile) const;
void updateBucketOpacities(SymbolBucket&, const TransformState&, std::set<uint32_t>&) const;