diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-03 20:47:46 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-08-05 16:13:26 +0300 |
commit | c763c262c87a4ae76489e856cc58392c853372a1 (patch) | |
tree | 29ee76bc6df36d59236be9e0984c24238583c64d /src/mbgl/renderer/buckets | |
parent | 65d2f7ed6afe17c6fbc8155cb116aae7de16db9a (diff) | |
download | qtlocation-mapboxgl-c763c262c87a4ae76489e856cc58392c853372a1.tar.gz |
[core] Remove ProjectedCollisionBox from CollisionBox
- Minus 20 bytes from CollisionBox size.
- Fix constness at Placement::placeBucket
Diffstat (limited to 'src/mbgl/renderer/buckets')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index 83efb232c2..2a9f5df9c0 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -227,8 +227,8 @@ void SymbolBucket::sortFeatures(const float angle) { } } -std::vector<std::reference_wrapper<SymbolInstance>> SymbolBucket::getSortedSymbols(const float angle) { - std::vector<std::reference_wrapper<SymbolInstance>> result(symbolInstances.begin(), symbolInstances.end()); +std::vector<std::reference_wrapper<const SymbolInstance>> SymbolBucket::getSortedSymbols(const float angle) const { + std::vector<std::reference_wrapper<const SymbolInstance>> result(symbolInstances.begin(), symbolInstances.end()); const float sin = std::sin(angle); const float cos = std::cos(angle); diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index c22a168a0c..a94073f7d0 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -70,7 +70,7 @@ public: void sortFeatures(const float angle); // The result contains references to the `symbolInstances` items, sorted by viewport Y. - std::vector<std::reference_wrapper<SymbolInstance>> getSortedSymbols(const float angle); + std::vector<std::reference_wrapper<const SymbolInstance>> getSortedSymbols(const float angle) const; Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> layout; const std::string bucketLeaderID; @@ -84,7 +84,8 @@ public: bool placementChangesUploaded : 1; bool dynamicUploaded : 1; bool sortUploaded : 1; - bool justReloaded : 1; + // Set and used by placement. + mutable bool justReloaded : 1; bool hasVariablePlacement : 1; std::vector<SymbolInstance> symbolInstances; @@ -113,8 +114,7 @@ public: std::unique_ptr<SymbolSizeBinder> iconSizeBinder; - struct IconBuffer : public Buffer { - } icon; + Buffer icon; struct CollisionBuffer { gfx::VertexVector<gfx::Vertex<CollisionBoxLayoutAttributes>> vertices; |