summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnsis Brammanis <ansis@mapbox.com>2017-12-20 13:36:58 -0500
committerAnsis Brammanis <ansis@mapbox.com>2018-01-08 12:08:16 -0500
commit290db046b31eb236b06c588091bd49a22ab6e63a (patch)
treeb21d8155b0a61173e835d4573003aeaac67e0cdf
parent8e8a372e92f0a64b249327d101b02fe245921567 (diff)
downloadqtlocation-mapboxgl-290db046b31eb236b06c588091bd49a22ab6e63a.tar.gz
apply -allow-overlap properties instantly
Instead of waiting for the next Placement.
-rw-r--r--src/mbgl/text/placement.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index b27d8f5baf..84e53f74eb 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -228,10 +228,15 @@ void Placement::updateBucketOpacities(SymbolBucket& bucket, std::set<uint32_t>&
if (bucket.hasCollisionBoxData()) bucket.collisionBox.dynamicVertices.clear();
if (bucket.hasCollisionCircleData()) bucket.collisionCircle.dynamicVertices.clear();
+ JointOpacityState defaultOpacityState(
+ bucket.layout.get<style::TextAllowOverlap>(),
+ bucket.layout.get<style::IconAllowOverlap>(),
+ true);
+
for (SymbolInstance& symbolInstance : bucket.symbolInstances) {
auto opacityState = seenCrossTileIDs.count(symbolInstance.crossTileID) == 0 ?
getOpacity(symbolInstance.crossTileID) :
- JointOpacityState(false, false, false);
+ defaultOpacityState;
seenCrossTileIDs.insert(symbolInstance.crossTileID);