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

[core] Avoid unneeded update of symbol dynamic vertex buffer

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-06-03 15:33:22 +03:00
parent 1fa8e763d9
commit a44b7f1e5d
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -257,10 +257,13 @@ void SymbolBucket::updateVertices(Placement& placement, bool updateOpacities, co
if (updateOpacities) {
placement.updateBucketOpacities(*this, seenIds);
placementChangesUploaded = false;
uploaded = false;
}
if (placement.updateBucketDynamicVertices(*this, tile)) {
dynamicUploaded = false;
uploaded = false;
}
placement.updateBucketDynamicVertices(*this, tile);
dynamicUploaded = false;
uploaded = false;
}
} // namespace mbgl

12
src/mbgl/text/placement.cpp
View File

@@ -402,17 +402,20 @@ Point<float> calculateVariableRenderShift(style::SymbolAnchorType anchor, float
}
} // namespace
void Placement::updateBucketDynamicVertices(SymbolBucket& bucket, const RenderTile& tile) {
bool Placement::updateBucketDynamicVertices(SymbolBucket& bucket, const RenderTile& tile) {
using namespace style;
const auto& layout = bucket.layout;
const bool alongLine = layout.get<SymbolPlacement>() != SymbolPlacementType::Point;
bool result = false;
if (alongLine) {
if (bucket.hasIconData() && layout.get<IconRotationAlignment>() == AlignmentType::Map) {
if (bucket.hasIconData() && layout.get<IconRotationAlignment>() == AlignmentType::Map) {
const bool pitchWithMap = layout.get<style::IconPitchAlignment>() == style::AlignmentType::Map;
const bool keepUpright = layout.get<style::IconKeepUpright>();
reprojectLineLabels(bucket.icon.dynamicVertices, bucket.icon.placedSymbols,
tile.matrix, pitchWithMap, true /*rotateWithMap*/, keepUpright,
tile, *bucket.iconSizeBinder, state);
result = true;
}
if (bucket.hasTextData() && layout.get<TextRotationAlignment>() == AlignmentType::Map) {
@@ -421,6 +424,7 @@ void Placement::updateBucketDynamicVertices(SymbolBucket& bucket, const RenderTi
reprojectLineLabels(bucket.text.dynamicVertices, bucket.text.placedSymbols,
tile.matrix, pitchWithMap, true /*rotateWithMap*/, keepUpright,
tile, *bucket.textSizeBinder, state);
result = true;
}
} else if (!layout.get<TextVariableAnchor>().empty() && bucket.hasTextData()) {
bucket.text.dynamicVertices.clear();
@@ -488,7 +492,11 @@ void Placement::updateBucketDynamicVertices(SymbolBucket& bucket, const RenderTi
}
}
}
result = true;
}
return result;
}
void Placement::updateBucketOpacities(SymbolBucket& bucket, std::set<uint32_t>& seenCrossTileIDs) {

4
src/mbgl/text/placement.hpp
View File

@@ -118,8 +118,8 @@ private:
SymbolBucket&,
const BucketPlacementParameters&,
std::set<uint32_t>& seenCrossTileIDs);
void updateBucketDynamicVertices(SymbolBucket& bucket, const RenderTile& tile);
// Returns `true` if bucket vertices were updated; returns `false` otherwise.
bool updateBucketDynamicVertices(SymbolBucket& bucket, const RenderTile& tile);
void updateBucketOpacities(SymbolBucket&, std::set<uint32_t>&);
void markUsedJustification(SymbolBucket&, style::TextVariableAnchorType, SymbolInstance&);