diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-19 16:16:51 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-22 12:23:39 +0300 |
commit | 3184cb29db069e990dab1ea4e784aad0aaa1048b (patch) | |
tree | 61b0471d4c138671483be829a1d8eb5a286479e5 /src/mbgl/renderer/buckets/symbol_bucket.cpp | |
parent | d48ec2769678985d2108f0731ff4b65ce586d3fb (diff) | |
download | qtlocation-mapboxgl-3184cb29db069e990dab1ea4e784aad0aaa1048b.tar.gz |
[core] sizeof(SymbolBucket) 2312 -> 2296
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.cpp')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index 2ad5318d19..cc26f1b26b 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -25,10 +25,16 @@ SymbolBucket::SymbolBucket(style::SymbolLayoutProperties::PossiblyEvaluated layo const std::vector<SymbolInstance>&& symbolInstances_, float tilePixelRatio_) : layout(std::move(layout_)), + bucketLeaderID(std::move(bucketName_)), sdfIcons(sdfIcons_), iconsNeedLinear(iconsNeedLinear_ || iconSize.isDataDriven() || !iconSize.isZoomConstant()), sortFeaturesByY(sortFeaturesByY_), - bucketLeaderID(std::move(bucketName_)), + staticUploaded(false), + placementChangesUploaded(false), + dynamicUploaded(false), + sortUploaded(false), + justReloaded(false), + hasVariablePlacement(false), symbolInstances(std::move(symbolInstances_)), textSizeBinder(SymbolSizeBinder::create(zoom, textSize, TextSize::defaultValue())), iconSizeBinder(SymbolSizeBinder::create(zoom, iconSize, IconSize::defaultValue())), @@ -170,8 +176,9 @@ void SymbolBucket::sortFeatures(const float angle) { if (!sortFeaturesByY) { return; } + assert (angle != std::numeric_limits<float>::max()); - if (sortedAngle && *sortedAngle == angle) { + if (sortedAngle == angle) { return; } |