diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-19 21:28:59 +0200 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2020-01-22 14:30:26 +0200 |
commit | 4dac2f61c244b6ac3859510e21b2c80c83f25841 (patch) | |
tree | 681db888a5b82dc86cb973de1deee85308a4d519 /src/mbgl/text/placement.cpp | |
parent | e6ddcf9beb8e0aad52d4185dac0c0b1d15205a16 (diff) | |
download | qtlocation-mapboxgl-4dac2f61c244b6ac3859510e21b2c80c83f25841.tar.gz |
[core] Simplify Placement::addLayer()
Diffstat (limited to 'src/mbgl/text/placement.cpp')
-rw-r--r-- | src/mbgl/text/placement.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp index dce1cb40dc..43d9713717 100644 --- a/src/mbgl/text/placement.cpp +++ b/src/mbgl/text/placement.cpp @@ -109,11 +109,11 @@ Placement::Placement(std::shared_ptr<const UpdateParameters> updateParameters_, Placement::Placement() : collisionIndex({}, MapMode::Static), collisionGroups(true) {} -void Placement::placeLayer(const RenderLayer& layer, const mat4& projMatrix) { +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, projMatrix, layer.baseImpl->source, item.featureIndex}; + BucketPlacementParameters params{item.tile, layer.baseImpl->source, item.featureIndex}; bucket.place(*this, params, seenCrossTileIDs); } } @@ -158,8 +158,9 @@ void Placement::placeBucket(const SymbolBucket& bucket, const bool pitchIconWithMap = layout.get<style::IconPitchAlignment>() == style::AlignmentType::Map; mat4 posMatrix; + const auto& projMatrix = state.getProjectionMatrix(); state.matrixFor(posMatrix, renderTile.id); - matrix::multiply(posMatrix, params.projMatrix, posMatrix); + matrix::multiply(posMatrix, projMatrix, posMatrix); mat4 textLabelPlaneMatrix = getLabelPlaneMatrix(posMatrix, pitchTextWithMap, rotateTextWithMap, state, pixelsToTileUnits); |